Upgrade Server Modules to Java 11

Make Java 11 the baseline for the server modules going forward
Netflix · Jan 27, 2022 · 1a7e791 · 1a7e791
1 parent cc42ee8
commit 1a7e791
Show file tree

Hide file tree

Showing 10 changed files with 105 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,15 +1,15 @@
 dist: xenial
 addons:
-  postgresql: '9.6'
+  postgresql: "9.6"
 language: java
 jdk:
-- openjdk8
+- openjdk11
 services:
 - mysql
 - postgresql
 - docker
 git:
-  depth: false
+  depth: 100
 install: "./travis/installViaTravis.sh"
 before_script:
 - cat "$TRAVIS_BUILD_DIR/travis/config/mysql/my.cnf" | sudo tee -a /etc/mysql/my.cnf
@@ -30,6 +30,9 @@ cache:
   - genie-ui/.gradle/nodejs
   - genie-ui/.gradle/npm
   timeout: 1000
+after_success:
+  # https://github.com/kt3k/coveralls-gradle-plugin/issues/85#issuecomment-475958699
+  - curl -F 'json_file=@build/coveralls/report.json' 'https://coveralls.io/api/v1/jobs'
 env:
   global:
   - secure: a5QmXCWR7wwEf/poWSj3PDAb6VICKqTTw3qbNjQwSvCzaCYtZZmxLbruQQlKOyR6W4j2VMrp2Ip5xrBjlCrOTvkFymPY3L+EwbPxsXbO4uhzs43BNFLhDon/Duv3TRhnedkqP0s8hN1ylxCbcID0UUPXQGrhnu8mb5QlDUx2mr8=

diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,5 @@
 import com.github.spotbugs.snom.SpotBugsTask
+import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
 import org.springframework.boot.gradle.plugin.SpringBootPlugin
 
 buildscript {
@@ -46,10 +47,15 @@ allprojects {
 
 idea {
     project {
-        jdkName = "1.8"
-        languageLevel = "8"
+        jdkName = "11"
+        languageLevel = new IdeaLanguageLevel(JavaVersion.VERSION_1_8)
         vcs = "Git"
     }
+    module {
+        languageLevel = new IdeaLanguageLevel(JavaVersion.VERSION_1_8)
+        downloadJavadoc true
+        downloadSources true
+    }
 }
 
 configure((Set<Project>) ext.javaProjects) {
@@ -329,6 +335,9 @@ task codeCoverageReport(type: JacocoReport, group: "Coverage reports") {
 coveralls {
     sourceDirs = project.javaProjects.sourceSets.main.allSource.srcDirs.flatten()
     jacocoReportPath = (String) "${project.buildDir}/reports/jacoco/report.xml"
+    // https://github.com/kt3k/coveralls-gradle-plugin/issues/85#issuecomment-475958699
+    saveAsFile = true
+    sendToCoveralls = false
 }
 
 tasks.coveralls {
@@ -489,9 +498,3 @@ gradleEnterprise {
         termsOfServiceAgree = "yes"
     }
 }
-
-task printOsDetector {
-    doLast {
-        println "${osdetector.os}"
-    }
-}
diff --git a/genie-agent/build.gradle b/genie-agent/build.gradle
@@ -69,15 +69,6 @@ dependencies {
 
 def genieVersion = project.version.toString()
 
-compileJava {
-    if (JavaVersion.current().isJava9Compatible() && project.targetCompatibility != JavaVersion.VERSION_1_8) {
-        options.compilerArgs += [
-                "--add-exports",
-                "jdk.unsupported/sun.misc=ALL-UNNAMED"
-        ]
-    }
-}
-
 jar {
     manifest {
         attributes("Implementation-Version": genieVersion)
@@ -93,7 +84,7 @@ javadoc {
 processResources {
     filesMatching("**/*.txt") {
         filter ReplaceTokens, tokens: [
-                "genie.version": genieVersion
+            "genie.version": genieVersion
         ]
     }
 }
diff --git a/genie-app/build.gradle b/genie-app/build.gradle
@@ -1,9 +1,23 @@
+import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
+
 apply plugin: "org.springframework.boot"
 
+idea {
+    module {
+        languageLevel = new IdeaLanguageLevel(JavaVersion.VERSION_11)
+    }
+}
+
 configurations {
     genieAgent
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
 dependencies {
     /*******************************
      * Implementation Dependencies
@@ -47,7 +61,7 @@ bootJar {
 }
 
 springBoot {
-    mainClassName = "com.netflix.genie.GenieApp"
+    getMainClass().set("com.netflix.genie.GenieApp")
     buildInfo()
 }
 

diff --git a/genie-app/src/main/docker/Dockerfile b/genie-app/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-from openjdk:8-jre
+from openjdk:11-jre-slim
 MAINTAINER NetflixOSS <netflixoss@netflix.com>
 EXPOSE 8080
 VOLUME /tmp

diff --git a/genie-docs/build.gradle b/genie-docs/build.gradle
@@ -12,12 +12,12 @@ asciidoctor {
 
 asciidoctorj {
     attributes(
-            [
-                    "revnumber"         : genieVersion,
-                    "docinfo1"          : "",
-                    "isSnapshot"        : isSnapshot,
-                    "springBootVersion" : "${spring_boot_version}",
-                    "springCloudVersion": "${spring_cloud_version}"
-            ]
+        [
+            "revnumber"         : genieVersion,
+            "docinfo1"          : "",
+            "isSnapshot"        : isSnapshot,
+            "springBootVersion" : "${spring_boot_version}",
+            "springCloudVersion": "${spring_cloud_version}"
+        ]
     )
 }
diff --git a/genie-swagger/build.gradle b/genie-swagger/build.gradle
@@ -1,5 +1,19 @@
+import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
+
 apply plugin: "java-library"
 
+idea {
+    module {
+        languageLevel = new IdeaLanguageLevel(JavaVersion.VERSION_11)
+    }
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
 dependencies {
     /*******************************
      * API Dependencies
@@ -34,8 +48,8 @@ dependencies {
 jar {
     manifest {
         attributes(
-                "Implementation-Title": project.name,
-                "Implementation-Version": project.version,
+            "Implementation-Title": project.name,
+            "Implementation-Version": project.version,
         )
     }
 }
diff --git a/genie-test-web/build.gradle b/genie-test-web/build.gradle
@@ -1,7 +1,20 @@
 import org.apache.tools.ant.filters.ReplaceTokens
+import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
 
 apply plugin: "java-library"
 
+idea {
+    module {
+        languageLevel = new IdeaLanguageLevel(JavaVersion.VERSION_11)
+    }
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
 dependencies {
     /*******************************
      * API Dependencies
@@ -33,7 +46,7 @@ dependencies {
 processResources {
     filesMatching("**/*.yml") {
         filter ReplaceTokens, tokens: [
-                "genie.version": project.version.toString()
+            "genie.version": project.version.toString()
         ]
     }
 }
diff --git a/genie-ui/build.gradle b/genie-ui/build.gradle
@@ -1,6 +1,20 @@
+import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
+
 apply plugin: "java-library"
 apply plugin: "nebula.node"
 
+idea {
+    module {
+        languageLevel = new IdeaLanguageLevel(JavaVersion.VERSION_11)
+    }
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
 dependencies {
     /*******************************
      * API Dependencies
@@ -70,8 +84,8 @@ jar {
 
     manifest {
         attributes(
-                "Implementation-Title": project.name,
-                "Implementation-Version": project.version,
+            "Implementation-Title": project.name,
+            "Implementation-Version": project.version,
         )
     }
 }
diff --git a/genie-web/build.gradle b/genie-web/build.gradle
@@ -1,8 +1,21 @@
 import org.apache.tools.ant.filters.ReplaceTokens
+import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
 
 apply plugin: "java-library"
 apply plugin: "org.asciidoctor.jvm.convert"
 
+idea {
+    module {
+        languageLevel = new IdeaLanguageLevel(JavaVersion.VERSION_11)
+    }
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
+}
+
 project.parent.tasks.collectDocumentation.dependsOn project.tasks.asciidoctor
 
 ext {
@@ -122,7 +135,7 @@ dependencies {
     testImplementation("org.dbunit:dbunit")
     testImplementation("org.springframework.boot:spring-boot-starter-jetty")
     integTestImplementation("com.github.ppodgorsek:spring-test-dbunit-core")
-    integTestImplementation("org.apache.curator:curator-test:2.13.0")
+    integTestImplementation("org.apache.curator:curator-test:5.1.0")
     integTestImplementation("org.springframework.cloud:spring-cloud-contract-wiremock")
     integTestImplementation("org.springframework.restdocs:spring-restdocs-core")
     integTestImplementation("org.springframework.restdocs:spring-restdocs-restassured")
@@ -169,7 +182,7 @@ asciidoctor {
         logging.removeStandardErrorListener(listener)
         capturedOutput.join('').with { output ->
             if (output =~ /include file not found:/) {
-                throw new RuntimeException("Include file(s) not found.\n" + output)
+                throw new RuntimeException((String) ("Include file(s) not found.\n" + output))
             }
         }
     }
@@ -182,8 +195,8 @@ asciidoctorj {
 jar {
     manifest {
         attributes(
-                "Implementation-Title": project.name,
-                "Implementation-Version": project.version,
+            "Implementation-Title": project.name,
+            "Implementation-Version": project.version,
         )
     }
 }
@@ -200,7 +213,7 @@ tasks.withType(Pmd) {
 processResources {
     filesMatching("**/*.yml") {
         filter ReplaceTokens, tokens: [
-                "genie.version": project.version.toString()
+            "genie.version": project.version.toString()
         ]
     }
 }