Update to Java 11 and Hibernate (#4761)

* Undertow-jersey Java updates

* Add hk2 dependency to undertow-jersey

* Change javax.activation not to be in scope:provided

* Update to Hibernate 5.4.2Final

* Update to Hibernate 5.4.2Final definetly

* Update Dropwizard

* dropwizard to Java 11 compilation

* Update spark to Java 11

* Update officefloor

* Change officefloor-spring to Java 10 compilation and OpenJDK 10 runtime

* Downgrade officefloor version for SpringBoot variant

frameworks/Java/dropwizard/dropwizard-jdbi-postgres.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-10-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /dropwizard
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P postgres,jdbi
 
-FROM openjdk:10-jre-slim
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /dropwizard
 COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar
 COPY hello-world-jdbi-postgres.yml hello-world-jdbi-postgres.yml

frameworks/Java/dropwizard/dropwizard-mongodb.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-10-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /dropwizard
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P mongo
 
-FROM openjdk:10-jre-slim
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /dropwizard
 COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar
 COPY hello-world-mongo.yml hello-world-mongo.yml

frameworks/Java/dropwizard/dropwizard-postgres.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-10-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /dropwizard
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P postgres
 
-FROM openjdk:10-jre-slim
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /dropwizard
 COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar
 COPY hello-world-postgres.yml hello-world-postgres.yml

frameworks/Java/dropwizard/dropwizard.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-10-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /dropwizard
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn package -q -P mysql
 
-FROM openjdk:10-jre-slim
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /dropwizard
 COPY --from=maven /dropwizard/target/hello-world-0.0.1-SNAPSHOT.jar app.jar
 COPY hello-world-mysql.yml hello-world-mysql.yml

frameworks/Java/dropwizard/pom.xml

@@ -12,9 +12,9 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>10</maven.compiler.source>
-		<maven.compiler.target>10</maven.compiler.target>
-		<dropwizard.version>1.3.9</dropwizard.version>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
+		<dropwizard.version>1.3.10</dropwizard.version>
 		<javax-activation.version>1.1.1</javax-activation.version>
 		<jaxb.version>2.3.0</jaxb.version>
 		<mysql-connector-java.version>5.1.47</mysql-connector-java.version>
@@ -24,6 +24,7 @@
 		<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
 		<maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
 		<main.class>com.example.helloworld.HelloWorldService</main.class>
+		<hibernate.version>5.4.2.Final</hibernate.version>
 	</properties>
 
 	<profiles>
@@ -82,6 +83,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<version>${hibernate.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>io.dropwizard</groupId>
 			<artifactId>dropwizard-jdbi3</artifactId>

frameworks/Java/officefloor/officefloor-micro.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.4-jdk-10 as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /officefloor
 COPY src src
 WORKDIR /officefloor/src/woof_benchmark_micro
 RUN mvn -q clean package
 
-FROM openjdk:10
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /officefloor
 COPY --from=maven /officefloor/src/woof_benchmark_micro/target/woof_benchmark_micro-1.0.0.jar server.jar
 CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:+UseNUMA", "-Dhttp.port=8080", "-Dhttp.server.name=OF", "-Dhttp.date.header=true", "-jar", "server.jar"]

frameworks/Java/officefloor/officefloor-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.5.4-jdk-10 as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /officefloor
 COPY src src
 WORKDIR /officefloor/src
@@ -8,7 +8,7 @@ RUN mvn -q clean install
 WORKDIR /officefloor/src/woof_benchmark_netty
 RUN mvn -q clean package
 
-FROM openjdk:10
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /officefloor
 COPY --from=maven /officefloor/src/woof_benchmark_netty/target/woof_benchmark_netty-1.0.0.jar server.jar
 CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:+UseNUMA", "-Dhttp.port=8080", "-Dhttp.server.name=OF", "-Dhttp.date.header=true", "-jar", "server.jar"]

frameworks/Java/officefloor/officefloor-rapidoid.dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.5.4-jdk-10 as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /officefloor
 COPY src src
 WORKDIR /officefloor/src
@@ -8,7 +8,7 @@ RUN mvn -q clean install
 WORKDIR /officefloor/src/woof_benchmark_rapidoid
 RUN mvn -q clean package
 
-FROM openjdk:10
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /officefloor
 COPY --from=maven /officefloor/src/woof_benchmark_rapidoid/target/woof_benchmark_rapidoid-1.0.0.jar server.jar
 CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:+UseNUMA", "-Dhttp.port=8080", "-Dhttp.server.name=OF", "-Dhttp.date.header=true", "-jar", "server.jar"]

frameworks/Java/officefloor/officefloor-raw.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.4-jdk-10 as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /officefloor
 COPY src src
 WORKDIR /officefloor/src/woof_benchmark_raw
 RUN mvn -q clean package
 
-FROM openjdk:10
+FROM openjdk:11.0.3-jre-slim
 RUN apt-get update && apt-get install -y libjna-java
 WORKDIR /officefloor
 COPY --from=maven /officefloor/src/woof_benchmark_raw/target/woof_benchmark_raw-1.0.0.jar server.jar

frameworks/Java/officefloor/officefloor-spring_data.dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.5.4-jdk-10 as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /officefloor
 COPY src src
 WORKDIR /officefloor/src/woof_benchmark_spring

frameworks/Java/officefloor/officefloor-thread_affinity.dockerfile

@@ -1,4 +1,4 @@
-FROM maven:3.5.4-jdk-10 as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /officefloor
 COPY src src
 WORKDIR /officefloor/src
@@ -8,7 +8,7 @@ RUN mvn -q clean install
 WORKDIR /officefloor/src/woof_benchmark_thread_affinity
 RUN mvn -q clean package
 
-FROM openjdk:10
+FROM openjdk:11.0.3-jre-slim
 RUN apt-get update && apt-get install -y libjna-java
 WORKDIR /officefloor
 COPY --from=maven /officefloor/src/woof_benchmark_thread_affinity/target/woof_benchmark_thread_affinity-1.0.0.jar server.jar

frameworks/Java/officefloor/officefloor-tpr.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.4-jdk-10 as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /officefloor
 COPY src src
 WORKDIR /officefloor/src/woof_benchmark_tpr
 RUN mvn -q clean package
 
-FROM openjdk:10
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /officefloor
 COPY --from=maven /officefloor/src/woof_benchmark_tpr/target/woof_benchmark_tpr-1.0.0.jar server.jar
 CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:+UseNUMA", "-Dhttp.port=8080", "-Dhttp.server.name=OF", "-Dhttp.date.header=true", "-jar", "server.jar"]

frameworks/Java/officefloor/officefloor.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.4-jdk-10 as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /officefloor
 COPY src src
 WORKDIR /officefloor/src/woof_benchmark
 RUN mvn -q clean package
 
-FROM openjdk:10
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /officefloor
 COPY --from=maven /officefloor/src/woof_benchmark/target/woof_benchmark-1.0.0.jar server.jar
 CMD ["java", "-server", "-Xms2g", "-Xmx2g", "-XX:+UseNUMA", "-Dhttp.port=8080", "-Dhttp.server.name=OF", "-Dhttp.date.header=true", "-jar", "server.jar"]

frameworks/Java/officefloor/src/pom.xml

@@ -9,10 +9,9 @@
 	<packaging>pom</packaging>
 	<name>OfficeFloor Benchmarks</name>
 	<properties>
-		<officefloor.version>3.4.0</officefloor.version>
-		<maven.compiler.source>10</maven.compiler.source>
-		<maven.compiler.target>10</maven.compiler.target>
-		<jackson.version>2.9.7</jackson.version>
+		<officefloor.version>3.9.2</officefloor.version>
+		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.target>11</maven.compiler.target>
 		<jaxb.version>2.3.0</jaxb.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>

frameworks/Java/officefloor/src/woof_benchmark_spring/pom.xml

@@ -10,6 +10,11 @@
 	</parent>
 	<artifactId>woof_benchmark_spring</artifactId>
 	<packaging>jar</packaging>
+	<properties>
+		<maven.compiler.source>10</maven.compiler.source>
+		<maven.compiler.target>10</maven.compiler.target>
+		<officefloor.version>3.4.0</officefloor.version>
+	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>net.officefloor.web</groupId>
@@ -52,4 +57,4 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+</project>

frameworks/Java/spark/pom.xml

@@ -10,10 +10,10 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <spark-version>2.7.2</spark-version>
-        <hibernate-version>5.3.6.Final</hibernate-version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <spark-version>2.9.0</spark-version>
+        <hibernate-version>5.4.2.Final</hibernate-version>
         <gson-version>2.8.5</gson-version>
         <mysql-connector-version>5.1.47</mysql-connector-version>
         <slf4j-version>1.7.25</slf4j-version>
@@ -112,6 +112,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.0</version>
+                <configuration>
+                    <debug>false</debug>
+				</configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

frameworks/Java/spark/spark.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-8-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /spark
 COPY src src
 COPY pom.xml pom.xml
 RUN mvn package -q
 
-FROM openjdk:8-jdk
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /spark
 COPY --from=maven /spark/target/hello-spark-1.0.0-BUILD-SNAPSHOT.jar app.jar
 CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-jar", "app.jar"]

frameworks/Java/undertow-jersey/pom.xml

@@ -15,9 +15,12 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <jersey.version>2.22.1</jersey.version>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+    <jersey.version>2.28</jersey.version>
+    <hibernate.version>5.4.2.Final</hibernate.version>
+    <activation.version>1.1.1</activation.version>
+    <jaxb.version>2.3.0</jaxb.version>
   </properties>
 
   <profiles>
@@ -30,7 +33,7 @@
         <dependency>
           <groupId>org.hibernate</groupId>
           <artifactId>hibernate-c3p0</artifactId>
-          <version>4.3.11.Final</version>
+          <version>${hibernate.version}</version>
         </dependency>
       </dependencies>
       <build>
@@ -54,7 +57,7 @@
         <dependency>
           <groupId>org.hibernate</groupId>
           <artifactId>hibernate-hikaricp</artifactId>
-          <version>4.3.11.Final</version>
+          <version>${hibernate.version}</version>
         </dependency>
       </dependencies>
       <build>
@@ -97,6 +100,18 @@
       <artifactId>jersey-server</artifactId>
       <version>${jersey.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jersey.inject</groupId>
+      <artifactId>jersey-hk2</artifactId>
+      <version>${jersey.version}</version>
+      <exclusions>
+          <exclusion>
+          <artifactId>javax.inject</artifactId>
+          <groupId>javax.inject</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <dependency>
       <groupId>org.glassfish.jersey.ext</groupId>
       <artifactId>jersey-mvc-mustache</artifactId>
@@ -111,7 +126,7 @@
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
-      <version>4.3.11.Final</version>
+      <version>${hibernate.version}</version>
     </dependency>
 
     <dependency>
@@ -129,19 +144,18 @@
     <dependency>
       <groupId>io.undertow</groupId>
       <artifactId>undertow-core</artifactId>
-      <version>1.3.33.Final</version>
+      <version>2.0.20.Final</version>
     </dependency>
 
     <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.2.12</version>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>${jaxb.version}</version>
     </dependency>
-
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
-      <version>1.1.1</version>
+      <version>${activation.version}</version>
     </dependency>
 
   </dependencies>

frameworks/Java/undertow-jersey/src/main/java/hello/JerseyWebServer.java

@@ -4,7 +4,7 @@ import hello.undertow.*;
 import io.undertow.*;
 import io.undertow.server.handlers.*;
 import org.apache.commons.cli.*;
-import org.glassfish.hk2.utilities.binding.*;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
 import org.glassfish.jersey.server.*;
 import org.hibernate.*;
 
@@ -48,16 +48,14 @@ public class JerseyWebServer
     config.register(org.glassfish.jersey.server.mvc.MvcFeature.class);
     config.register(
         org.glassfish.jersey.server.mvc.mustache.MustacheMvcFeature.class);
-
-    config.register(new AbstractBinder()
-    {
-      @Override
-      protected void configure()
-      {
-        bindFactory(SessionFactoryProvider.class).to(SessionFactory.class).in(
-          Singleton.class);
-      }
-    });
+	config.property("jersey.config.server.mvc.caching.mustache", "true");
+	config.register(new AbstractBinder() {
+		@Override
+		protected void configure() {
+			bindFactory(SessionFactoryFactory.class).to(SessionFactory.class).in(
+					Singleton.class);
+		}
+	});
 
     UndertowJerseyContainer container = new UndertowJerseyContainer(config);
 

frameworks/Java/undertow-jersey/src/main/java/hello/PlaintextResource.java

@@ -2,7 +2,6 @@ package hello;
 
 import javax.inject.*;
 import javax.ws.rs.*;
-import java.util.*;
 
 @Singleton
 @Path("/plaintext")

frameworks/Java/undertow-jersey/src/main/java/hello/SessionFactoryFactory.java

@@ -0,0 +1,39 @@
+package hello;
+
+import hello.domain.Fortune;
+import hello.domain.World;
+
+import javax.ws.rs.ext.Provider;
+
+import org.glassfish.hk2.api.Factory;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.cfg.Configuration;
+
+@Provider
+public class SessionFactoryFactory implements Factory<SessionFactory> {
+	private final SessionFactory factory;
+
+	public SessionFactoryFactory() {
+		factory = createSessionFactory();
+	}
+
+	@Override
+	public SessionFactory provide() {
+		return factory;
+	}
+
+	@Override
+	public void dispose(SessionFactory factory) {
+		factory.close();
+	}
+
+	private static SessionFactory createSessionFactory() {
+		Configuration configuration = new Configuration().configure();
+		configuration.addAnnotatedClass(World.class);
+		configuration.addAnnotatedClass(Fortune.class);
+		StandardServiceRegistryBuilder builder = new StandardServiceRegistryBuilder();
+		builder.applySettings(configuration.getProperties());
+		return configuration.buildSessionFactory(builder.build());
+	}
+}

frameworks/Java/undertow-jersey/src/main/java/hello/SessionFactoryProvider.java

@@ -1,45 +0,0 @@
-package hello;
-
-import hello.domain.*;
-import org.glassfish.hk2.api.*;
-import org.hibernate.*;
-import org.hibernate.cfg.Configuration;
-import org.hibernate.service.*;
-
-import javax.ws.rs.core.*;
-import javax.ws.rs.core.Context;
-
-public class SessionFactoryProvider
-    implements Factory<SessionFactory>
-{
-
-  @Context
-  Application application;
-
-  public SessionFactoryProvider()
-  {
-  }
-
-  @Override
-  public SessionFactory provide()
-  {
-    Configuration configuration = new Configuration().configure();
-//    String url = configuration.getProperty("hibernate.connection.url");
-//    url = url.replace("//localhost:3306/",
-//        "//" + this.application.getProperties().get("dbhost") + ":"
-//            + this.application.getProperties().get("dbport") + "/");
-//    configuration.setProperty("hibernate.connection.url", url);
-    configuration.addAnnotatedClass(World.class);
-    configuration.addAnnotatedClass(Fortune.class);
-    ServiceRegistryBuilder serviceRegistryBuilder = new ServiceRegistryBuilder().applySettings(
-        configuration.getProperties());
-    return configuration.buildSessionFactory(
-        serviceRegistryBuilder.buildServiceRegistry());
-  }
-
-  @Override
-  public void dispose(SessionFactory instance)
-  {
-
-  }
-}

frameworks/Java/undertow-jersey/undertow-jersey-hikaricp.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-10-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /undertow-jersey
 COPY src src
 COPY pom.xml pom.xml
 RUN mvn package -q -P hikaricp
 
-FROM openjdk:10-jre-slim
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /undertow-jersey
 COPY --from=maven /undertow-jersey/target/undertow-jersey.jar app.jar
 CMD ["java", "-jar", "app.jar"]

frameworks/Java/undertow-jersey/undertow-jersey.dockerfile

@@ -1,10 +1,10 @@
-FROM maven:3.5.3-jdk-10-slim as maven
+FROM maven:3.6.1-jdk-11-slim as maven
 WORKDIR /undertow-jersey
 COPY src src
 COPY pom.xml pom.xml
 RUN mvn package -q
 
-FROM openjdk:10-jre-slim
+FROM openjdk:11.0.3-jre-slim
 WORKDIR /undertow-jersey
 COPY --from=maven /undertow-jersey/target/undertow-jersey.jar app.jar
 CMD ["java", "-jar", "app.jar"]