Use docker hub images in undertow tests, update dependencies (#3496)

frameworks/Java/undertow/maven-version-rules.xml

@@ -2,7 +2,8 @@
 <ruleset comparisonMethod="maven"
          xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+         xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0
+                             http://www.mojohaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
 
   <rules>
 

frameworks/Java/undertow/pom.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                             http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -10,22 +11,22 @@
   <version>1.0-SNAPSHOT</version>
 
   <properties>
-    <maven.compiler.source>9</maven.compiler.source>
-    <maven.compiler.target>9</maven.compiler.target>
+    <maven.compiler.source>10</maven.compiler.source>
+    <maven.compiler.target>10</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <hikaricp.version>2.7.8</hikaricp.version>
-    <jackson.version>2.9.4</jackson.version>
-    <maven-shade-plugin.version>3.1.0</maven-shade-plugin.version>
+    <hikaricp.version>3.0.0</hikaricp.version>
+    <jackson.version>2.9.5</jackson.version>
+    <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version>
     <mongodb.version>3.6.3</mongodb.version>
     <mustache.version>0.9.5</mustache.version>
     <mysql.version>5.1.46</mysql.version>
-    <postgresql.version>42.2.1</postgresql.version>
-    <undertow.version>2.0.1.Final</undertow.version>
-    <versions-maven-plugin.version>2.4</versions-maven-plugin.version>
+    <postgresql.version>42.2.2</postgresql.version>
+    <undertow.version>2.0.3.Final</undertow.version>
+    <versions-maven-plugin.version>2.5</versions-maven-plugin.version>
   </properties>
 
   <prerequisites>
-    <maven>3.0</maven>
+    <maven>3.5</maven>
   </prerequisites>
 
   <dependencies>
@@ -82,7 +83,7 @@
   </dependencies>
 
   <build>
-    <finalName>hello-undertow</finalName>
+    <finalName>app</finalName>
     <plugins>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>

frameworks/Java/undertow/undertow-base.dockerfile

@@ -1,5 +0,0 @@
-FROM techempower/maven:0.1
-
-ADD ./ /undertow
-WORKDIR /undertow
-RUN mvn clean package

frameworks/Java/undertow/undertow-mongodb-async.dockerfile

@@ -1,3 +1,10 @@
-FROM techempower/undertow-base:0.1
+FROM maven:3.5.3-jdk-10-slim as maven
+WORKDIR /undertow
+COPY pom.xml pom.xml
+COPY src src
+RUN mvn clean package -q
 
-CMD java -jar target/hello-undertow.jar MONGODB_ASYNC
+FROM openjdk:10-jre-slim
+WORKDIR /undertow
+COPY --from=maven /undertow/target/app.jar app.jar
+CMD ["java", "-jar", "app.jar", "MONGODB_ASYNC"]

frameworks/Java/undertow/undertow-mongodb.dockerfile

@@ -1,3 +1,10 @@
-FROM techempower/undertow-base:0.1
+FROM maven:3.5.3-jdk-10-slim as maven
+WORKDIR /undertow
+COPY pom.xml pom.xml
+COPY src src
+RUN mvn clean package -q
 
-CMD java -jar target/hello-undertow.jar MONGODB
+FROM openjdk:10-jre-slim
+WORKDIR /undertow
+COPY --from=maven /undertow/target/app.jar app.jar
+CMD ["java", "-jar", "app.jar", "MONGODB"]

frameworks/Java/undertow/undertow-mysql.dockerfile

@@ -1,3 +1,10 @@
-FROM techempower/undertow-base:0.1
+FROM maven:3.5.3-jdk-10-slim as maven
+WORKDIR /undertow
+COPY pom.xml pom.xml
+COPY src src
+RUN mvn clean package -q
 
-CMD java -jar target/hello-undertow.jar MYSQL
+FROM openjdk:10-jre-slim
+WORKDIR /undertow
+COPY --from=maven /undertow/target/app.jar app.jar
+CMD ["java", "-jar", "app.jar", "MYSQL"]

frameworks/Java/undertow/undertow-postgresql.dockerfile

@@ -1,3 +1,10 @@
-FROM techempower/undertow-base:0.1
+FROM maven:3.5.3-jdk-10-slim as maven
+WORKDIR /undertow
+COPY pom.xml pom.xml
+COPY src src
+RUN mvn clean package -q
 
-CMD java -jar target/hello-undertow.jar POSTGRESQL
+FROM openjdk:10-jre-slim
+WORKDIR /undertow
+COPY --from=maven /undertow/target/app.jar app.jar
+CMD ["java", "-jar", "app.jar", "POSTGRESQL"]

frameworks/Java/undertow/undertow.dockerfile

@@ -1,3 +1,10 @@
-FROM techempower/undertow-base:0.1
+FROM maven:3.5.3-jdk-10-slim as maven
+WORKDIR /undertow
+COPY pom.xml pom.xml
+COPY src src
+RUN mvn clean package -q
 
-CMD java -jar target/hello-undertow.jar NO_DATABASE
+FROM openjdk:10-jre-slim
+WORKDIR /undertow
+COPY --from=maven /undertow/target/app.jar app.jar
+CMD ["java", "-jar", "app.jar", "NO_DATABASE"]