add jdk19 to CI (#1001)

Updates the actions to add JDKs from newest to oldest so that JAVA_HOME at the end will be the older version. That version should be used by gradle. Remove special case checks for guice dependencies based on the java version. They do not work with gradle toolchains and artifacts were published with the new guice already. Will stick with that for now unless it creates problems. This first happened in 1.3.6 which was released in early August 2022. No issues have been reported thus far.
Netflix · Oct 19, 2022 · c8f2028 · c8f2028
1 parent e663269
commit c8f2028
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 29 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -11,26 +11,26 @@ jobs:
           fetch-depth: 0
       - name: Gradle wrapper validation
         uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 8
+      - name: Set up JDK 19
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 19
           distribution: 'zulu'
           cache: 'gradle'
-      - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
+      - run: echo "JDK19=$JAVA_HOME" >> $GITHUB_ENV
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
-      - name: Set up JDK 18
+      - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
-          java-version: 18
+          java-version: 8
           distribution: 'zulu'
           cache: 'gradle'
-      - run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
+      - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
       - name: Build
         run: ./gradlew build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,27 +14,27 @@ jobs:
       - uses: actions/checkout@v3
       - name: Gradle wrapper validation
         uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 8
+      - name: Set up JDK 19
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 19
           distribution: 'zulu'
           cache: 'gradle'
-      - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
+      - run: echo "JDK19=$JAVA_HOME" >> $GITHUB_ENV
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
-      - name: Set up JDK 18
+      - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
-          java-version: 18
+          java-version: 8
           distribution: 'zulu'
           cache: 'gradle'
-      - run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
+      - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
       - name: Build candidate
         if: contains(github.ref, '-rc.')
         run: ./gradlew --info --stacktrace -Prelease.useLastTag=true candidate

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -16,27 +16,27 @@ jobs:
           fetch-depth: 0
       - name: Gradle wrapper validation
         uses: gradle/wrapper-validation-action@v1
-      - name: Set up JDK 8
+      - name: Set up JDK 19
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 19
           distribution: 'zulu'
           cache: 'gradle'
-      - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
+      - run: echo "JDK19=$JAVA_HOME" >> $GITHUB_ENV
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'zulu'
           cache: 'gradle'
       - run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV
-      - name: Set up JDK 18
+      - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
-          java-version: 18
+          java-version: 8
           distribution: 'zulu'
           cache: 'gradle'
-      - run: echo "JDK18=$JAVA_HOME" >> $GITHUB_ENV
+      - run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
       - name: Build
         run: ./gradlew build snapshot
         env:

diff --git a/spectator-ext-ipcservlet/build.gradle b/spectator-ext-ipcservlet/build.gradle
@@ -5,11 +5,7 @@ dependencies {
   compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
   testImplementation 'org.eclipse.jetty:jetty-servlet:9.4.11.v20180605'
   testImplementation 'org.eclipse.jetty:jetty-webapp:9.4.11.v20180605'
-  if (JavaVersion.current().isJava11Compatible()) {
-    testImplementation 'com.google.inject.extensions:guice-servlet'
-  } else {
-    testImplementation 'com.google.inject.extensions:guice-servlet:4.1.0'
-  }
+  testImplementation 'com.google.inject.extensions:guice-servlet'
 }
 
 jar {

diff --git a/spectator-nflx-plugin/build.gradle b/spectator-nflx-plugin/build.gradle
@@ -4,12 +4,7 @@ dependencies {
   api project(':spectator-ext-jvm')
   api project(':spectator-reg-atlas')
   implementation 'javax.inject:javax.inject'
-  if (JavaVersion.current().isJava11Compatible()) {
-    implementation "com.google.inject:guice"
-  } else {
-    implementation "com.google.inject:guice:4.1.0"
-    implementation "com.google.inject.extensions:guice-multibindings:4.1.0"
-  }
+  implementation "com.google.inject:guice"
   implementation "com.netflix.archaius:archaius2-core"
   implementation 'com.netflix.iep:iep-nflxenv'
   implementation "com.netflix.servo:servo-core"