From 2468276145cdfe1ca911b52f765e026e77661a09 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@gmail.com>
Date: Fri, 10 Jun 2022 16:12:24 -0400
Subject: [PATCH] ci: release=8 for JDK 9+ (#478)

* ci: release=8 for JDK 9+

* ci: removing "dependencies (8)"
---
 .github/sync-repo-settings.yaml                |  1 -
 .github/workflows/downstream-dependencies.yaml |  4 +---
 pom.xml                                        | 13 ++++++++++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 7547b27e..ca2e4cf1 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -29,7 +29,6 @@ branchProtectionRules:
   requiresStrictStatusChecks: false
   # List of required status check contexts that must pass for commits to be accepted to matching branches.
   requiredStatusCheckContexts:
-    - "dependencies (8)"
     - "dependencies (11)"
     - "lint"
     - "clirr"
diff --git a/.github/workflows/downstream-dependencies.yaml b/.github/workflows/downstream-dependencies.yaml
index 22dc3123..5911098d 100644
--- a/.github/workflows/downstream-dependencies.yaml
+++ b/.github/workflows/downstream-dependencies.yaml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11]
+        java: [11]
         repo:
         - java-bigquery
         - java-bigqueryconnection
@@ -27,5 +27,3 @@ jobs:
     - run: sudo apt-get update -y
     - run: sudo apt-get install libxml2-utils
     - run: .kokoro/client-library-check.sh ${{matrix.repo}} dependencies
-      if: ${{matrix.java != '8' }}
-      # Always successful for Java 8, which we'll remove soon
diff --git a/pom.xml b/pom.xml
index c11f452b..b43ab556 100644
--- a/pom.xml
+++ b/pom.xml
@@ -833,6 +833,17 @@
         </plugins>
       </build>
     </profile>
-
+    <profile>
+      <!-- JDK 9+ has the "release" option to ensure the generated bytecode is
+        compatible with Java 8. Maven-compiler-plugin's "<target>1.8</target>" is
+        not sufficient. -->
+      <id>compiler-release-8</id>
+      <activation>
+        <jdk>[9,]</jdk>
+      </activation>
+      <properties>
+        <maven.compiler.release>8</maven.compiler.release>
+      </properties>
+    </profile>
   </profiles>
 </project>