From b4d2bf5a42f73ef2a626f1e7ba15976abb9b4110 Mon Sep 17 00:00:00 2001
From: Robbie Gemmell <robbie.gemmell@gmail.com>
Date: Wed, 10 Jun 2020 13:08:13 +0100
Subject: [PATCH] Build test module with Java 8. Fixes #9904. Reverts CI config
 changes in fa72e07ab371d1cd8c48e70aa35c5ffda73ee5bb and
 4618401be05bd8e04229de3d7ff2cfdc2f71db64

---
 .github/workflows/ci-actions.yml                      | 5 ++---
 .github/workflows/native-cron-build.yml               | 2 +-
 integration-tests/google-cloud-functions-http/pom.xml | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index 16457c989a4a2..37e3520271830 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -103,13 +103,12 @@ jobs:
         java :
           - { name: Java8,
               java-version: 8,
-              maven_args: "-pl !integration-tests/vault-app,!integration-tests/vault-agroal,!integration-tests/vault,!integration-tests/google-cloud-functions-http"
+              maven_args: "-pl !integration-tests/vault-app,!integration-tests/vault-agroal,!integration-tests/vault"
           }
           - {
             name: "Java 8 - 242",
             java-version: 8,
-            release: "jdk8u242-b08",
-            maven_args: "-pl !integration-tests/google-cloud-functions-http"
+            release: "jdk8u242-b08"
           }
           - {
             name: Java 11,
diff --git a/.github/workflows/native-cron-build.yml b/.github/workflows/native-cron-build.yml
index bf8d000349612..cab42550135bf 100644
--- a/.github/workflows/native-cron-build.yml
+++ b/.github/workflows/native-cron-build.yml
@@ -54,7 +54,7 @@ jobs:
         run: mvn -B install -DskipTests -DskipITs -Dformat.skip
 
       - name: Run integration tests in native
-        run: mvn -B --settings .github/mvn-settings.xml verify -f integration-tests/pom.xml --fail-at-end -Dno-format -Ddocker -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.1.0-java${{ matrix.java }} -Dtest-postgresql -Dtest-elasticsearch -Dtest-mysql -Dtest-db2 -Dtest-amazon-services -Dtest-vault -Dtest-neo4j -Dtest-keycloak -Dtest-kafka -Dtest-mssql -Dtest-mariadb -Dmariadb.url="jdbc:mariadb://localhost:3308/hibernate_orm_test" -pl '!io.quarkus:quarkus-integration-test-google-cloud-functions-http'
+        run: mvn -B --settings .github/mvn-settings.xml verify -f integration-tests/pom.xml --fail-at-end -Dno-format -Ddocker -Dnative -Dquarkus.native.container-build=true -Dquarkus.native.builder-image=quay.io/quarkus/ubi-quarkus-native-image:20.1.0-java${{ matrix.java }} -Dtest-postgresql -Dtest-elasticsearch -Dtest-mysql -Dtest-db2 -Dtest-amazon-services -Dtest-vault -Dtest-neo4j -Dtest-keycloak -Dtest-kafka -Dtest-mssql -Dtest-mariadb -Dmariadb.url="jdbc:mariadb://localhost:3308/hibernate_orm_test"
 
       - name: Report
         if: always()
diff --git a/integration-tests/google-cloud-functions-http/pom.xml b/integration-tests/google-cloud-functions-http/pom.xml
index 391918e1c8c96..aab8678b5bcd5 100644
--- a/integration-tests/google-cloud-functions-http/pom.xml
+++ b/integration-tests/google-cloud-functions-http/pom.xml
@@ -10,8 +10,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
-        <maven.compiler.target>11</maven.compiler.target>
-        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
 
     <artifactId>quarkus-integration-test-google-cloud-functions-http</artifactId>
@@ -118,4 +118,4 @@
         </profile>
 
     </profiles>
-</project>
\ No newline at end of file
+</project>