[!466] - Feature/583 java 17 upgrade

Matteo Seclì · agilelab-tmnd1991 · commit 972920fdaa4d · 2025-02-12T12:21:02.000Z
# New features and improvements

Test Wasp vs Java 17:
- `--add-opens=java.base/java.lang=ALL-UNNAMED`
- `--add-exports=java.base/sun.nio.ch=ALL-UNNAMED`
- `--add-opens=java.base/sun.util.calendar=ALL-UNNAMED`
- `--add-opens=java.base/java.lang.reflect=ALL-UNNAMED`
- `--add-opens=java.base/java.util=ALL-UNNAMED`
- `--add-opens=java.base/java.net=ALL-UNNAMED`
- `--add-opens=java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED`

# Breaking changes

You need a JRE 17 to build wasp locally or need to tweak the `.jvmopts` file in the root?

# Migration

None.

# Bug fixes

None.

# How this feature was tested

Existing pipelines.

# Related issue

Closes #583
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ cache:
 test-kernel:
   stage: test
   interruptible: true
-  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
+  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-17.0.13_11-jdk-jammy"
   parallel:
     matrix:
       - WASP_FLAVOR: [ "VANILLA2_2_12"]
@@ -54,7 +54,7 @@ test-kernel:
 test-plugin:
   stage: test
   interruptible: true
-  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
+  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-17.0.13_11-jdk-jammy"
   parallel:
     matrix:
       - WASP_FLAVOR: [ "VANILLA2_2_12"]
@@ -81,7 +81,7 @@ test-plugin:
 test-repo:
   stage: test
   interruptible: true
-  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
+  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-17.0.13_11-jdk-jammy"
   parallel:
     matrix:
       - WASP_FLAVOR: [ "VANILLA2_2_12"]
@@ -108,7 +108,7 @@ test-repo:
 compile-whitelabel:
   stage: deploy
   interruptible: true
-  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
+  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-17.0.13_11-jdk-jammy"
   parallel:
     matrix:
       - WASP_FLAVOR: [ "VANILLA2_2_12"]
@@ -133,7 +133,7 @@ censor:
 generate-open-api:
   stage: test
   interruptible: true
-  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
+  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-17.0.13_11-jdk-jammy"
   script:
     - ./run-sbt-unprivileged.sh "generateOpenApi"
   tags:
@@ -169,7 +169,7 @@ waspctl:
 snapshot:
   interruptible: false
   stage: deploy
-  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
+  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-17.0.13_11-jdk-jammy"
   parallel:
     matrix:
       - WASP_FLAVOR: [ "VANILLA2_2_12"]
@@ -193,7 +193,7 @@ snapshot:
 release:
   interruptible: false
   stage: deploy
-  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-8u432-b06-jdk-jammy"
+  image: "registry.gitlab.com/agilefactory/agile.wasp2/sbt:1.10.7-17.0.13_11-jdk-jammy"
   parallel:
     matrix:
       - WASP_FLAVOR: [ "VANILLA2_2_12"]
diff --git a/.jvmopts b/.jvmopts
@@ -6,3 +6,10 @@
 -Xss2M
 -Duser.timezone=GMT
 -XX:ReservedCodeCacheSize=1G
+--add-opens=java.base/java.lang=ALL-UNNAMED
+--add-exports=java.base/sun.nio.ch=ALL-UNNAMED
+--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+--add-opens=java.base/java.util=ALL-UNNAMED
+--add-opens=java.base/java.net=ALL-UNNAMED
+--add-opens=java.xml/com.sun.org.apache.xerces.internal.jaxp=ALL-UNNAMED
diff --git a/consumers-spark/src/test/scala/it/agilelab/bigdata/wasp/consumers/spark/utils/SparkSuite.scala b/consumers-spark/src/test/scala/it/agilelab/bigdata/wasp/consumers/spark/utils/SparkSuite.scala
@@ -9,7 +9,6 @@ import java.nio.file.Files
 trait SparkSuite extends Suite {
 
   lazy val spark: SparkSession = {
-    System.setSecurityManager(null)
     SparkSuite.spark.newSession()
   }
 
diff --git a/plugin-postgresql-spark/src/main/scala/it/agilelab/bigdata/wasp/consumers/spark/plugins/postgresql/JDBCPooledConnectionSupport.scala b/plugin-postgresql-spark/src/main/scala/it/agilelab/bigdata/wasp/consumers/spark/plugins/postgresql/JDBCPooledConnectionSupport.scala
@@ -60,7 +60,7 @@ trait JDBCPooledConnectionSupport {
 
   private def registerDriver(driverClassName: String): Unit = {
     val driverClass    = this.getClass.getClassLoader.loadClass(driverClassName)
-    val driverInstance = driverClass.newInstance().asInstanceOf[Driver]
+    val driverInstance = driverClass.getConstructor().newInstance().asInstanceOf[Driver]
     DriverManager.registerDriver(driverInstance)
   }
 
diff --git a/project/Flavor.scala b/project/Flavor.scala
@@ -9,12 +9,23 @@ sealed trait Flavor {
 object Flavor {
 
   case object Vanilla2_2_12 extends Flavor {
-    private val versions                    = new Vanilla2Versions()
-    val postfix: Option[String]             = None
-    override val scalaVersion: ScalaVersion = ScalaVersion.parseScalaVersion(versions.scala)
-    override val settings: Settings         = new BasicSettings(new BasicResolvers(), versions.jdk, scalaVersion)
-    override val dependencies: Dependencies = new Vanilla2Dependencies(versions)
-    override val id: String                 = "VANILLA2_2_12"
+    private val versions                            = new Vanilla2Versions()
+    val postfix: Option[String]                     = None
+    override val scalaVersion: ScalaVersion         = ScalaVersion.parseScalaVersion(versions.scala)
+    override val dependencies: Vanilla2Dependencies = new Vanilla2Dependencies(versions)
+    override val settings: Settings = new BasicSettings(
+      resolver = new BasicResolvers(),
+      jdkVersionValue = versions.jdk,
+      scalaVersionValue = scalaVersion,
+      // this is needed because otherwise parallel-write-plugin,
+      // only during tests with coverage enabled will wrongly put
+      // in the classpath version 3.3.5 (that we can't understand where it
+      // comes from, since it's nowhere to be found in the dependencyTree).
+      // the exception thrown is:
+      //   java.lang.NoSuchMethodError: 'org.apache.hadoop.fs.FSBuilder org.apache.hadoop.fs.FutureDataInputStreamBuilder.opt(java.lang.String, long)
+      overrideDep = Seq(dependencies.hadoopClientApi)
+    )
+    override val id: String = "VANILLA2_2_12"
   }
 
   case object CDP719 extends Flavor {
@@ -36,21 +47,27 @@ object Flavor {
   case object EMR613 extends Flavor {
     override val scalaVersion: ScalaVersion = ScalaVersion.parseScalaVersion(versions.scala)
     override lazy val settings: Settings =
-      new BasicSettings(new BasicResolvers(), versions.jdk, scalaVersion, dependencies.overrides, dependencies.removeShims)
+      new BasicSettings(
+        new BasicResolvers(),
+        versions.jdk,
+        scalaVersion,
+        dependencies.overrides,
+        dependencies.removeShims
+      )
     override lazy val dependencies: EMR613Dependencies = new EMR613Dependencies(versions)
-    lazy val postfix: Option[String] = Some("emr613")
-    private lazy val versions = new EMR613Versions()
-    override val id: String = "EMR_6_13"
+    lazy val postfix: Option[String]                   = Some("emr613")
+    private lazy val versions                          = new EMR613Versions()
+    override val id: String                            = "EMR_6_13"
   }
 
   val DEFAULT: Flavor = Vanilla2_2_12
 
   def parse(s: String): Either[String, Flavor] = {
     s.toUpperCase match {
       case "VANILLA2_2_12" => Right(Vanilla2_2_12)
-      case "CDP719"   => Right(CDP719)
-      case "EMR_6_13" => Right(EMR613)
-      case _      => Left(s"Cannot parse flavor [${s}]")
+      case "CDP719"        => Right(CDP719)
+      case "EMR_6_13"      => Right(EMR613)
+      case _               => Left(s"Cannot parse flavor [${s}]")
     }
   }
 
@@ -63,7 +80,7 @@ object Flavor {
 }
 
 case class ScalaVersion(major: Int, minor: Int, revision: Int) {
-  val raw: String = s"$major.$minor.$revision"
+  val raw: String                               = s"$major.$minor.$revision"
   def isMajorMinor(maj: Int, min: Int): Boolean = maj == major && min == minor
 }
 object ScalaVersion {
diff --git a/project/Settings.scala b/project/Settings.scala
@@ -78,12 +78,12 @@ class BasicSettings(
     scalacOptions ++= Seq(
       "-encoding",
       "UTF-8",
-      s"-target:jvm-${jdkVersionValue}",
+      s"-target:${jdkVersionValue}",
+      s"-release:${jdkVersionValue}",
       "-feature",
       "-language:_",
       "-deprecation",
       "-unchecked",
-      //"-Ylog-classpath",
       "-Xlint",
       "-Ywarn-dead-code",
       "-Xfatal-warnings",
@@ -94,16 +94,14 @@ class BasicSettings(
     javacOptions ++= Seq(
       "-encoding",
       "UTF-8",
-      "-source",
-      jdkVersionValue,
-      "-target",
-      jdkVersionValue,
+      "--release",
+      s"${jdkVersionValue}",
       "-Xlint:deprecation",
       "-Xlint:unchecked"
     ),
     doc / javacOptions --= Seq(
-      "-target",
-      jdkVersionValue,
+      "--release",
+      s"${jdkVersionValue}",
       "-Xlint:deprecation",
       "-Xlint:unchecked"
     ),
diff --git a/project/Vanilla2Dependencies.scala b/project/Vanilla2Dependencies.scala
@@ -45,6 +45,7 @@ class Vanilla2Dependencies(val versions: Vanilla2Versions)
   lazy val jettySecurity      = "org.eclipse.jetty"    % "jetty-security"            % versions.jettySecurity
   lazy val mongoTest          = "de.flapdoodle.embed"  % "de.flapdoodle.embed.mongo" % "3.5.4" % Test
   lazy val shapeless          = "com.chuusai"          %% "shapeless"                % "2.3.3"
+  lazy val hadoopClientApi    = "org.apache.hadoop"    % "hadoop-client-api"         % versions.hadoop
 
   val jacksonTestDependencies = Seq(
     "com.fasterxml.jackson.core"     % "jackson-annotations"             % "2.10.1" % Test force (),
diff --git a/project/Vanilla2Versions.scala b/project/Vanilla2Versions.scala
@@ -11,7 +11,7 @@ class Vanilla2Versions {
   val httpcomponents            = "4.3.3"
   val httpcomponentsMime        = "4.3.1"
   val javaxMail                 = "1.4"
-  val jdk                       = "1.8"
+  val jdk                       = "8"
   val jetty                     = "9.3.20.v20170531"
   val jopt                      = "3.2"
   val json4s                    = "3.5.3"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ import java.nio.file.Files`
`9`	`9`	`trait SparkSuite extends Suite {`
`10`	`10`
`11`	`11`	`lazy val spark: SparkSession = {`
`12`		`- System.setSecurityManager(null)`
`13`	`12`	`SparkSuite.spark.newSession()`
`14`	`13`	`}`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ trait JDBCPooledConnectionSupport {`
`60`	`60`
`61`	`61`	`private def registerDriver(driverClassName: String): Unit = {`
`62`	`62`	`val driverClass = this.getClass.getClassLoader.loadClass(driverClassName)`
`63`		`- val driverInstance = driverClass.newInstance().asInstanceOf[Driver]`
	`63`	`+ val driverInstance = driverClass.getConstructor().newInstance().asInstanceOf[Driver]`
`64`	`64`	`DriverManager.registerDriver(driverInstance)`
`65`	`65`	`}`
`66`	`66`