Update to Willdfly 14.0.1 Final (#4203)

* update to wildfly 14.0.1.Final

* rename wildfly-ee7 to wildfly-ee

.travis.yml

@@ -85,7 +85,7 @@ env:
      - "TESTDIR=Java/vertx"
      - "TESTDIR=Java/vertx-web"
      - "TESTDIR=Java/wicket"
-     - "TESTDIR=Java/wildfly-ee7"
+     - "TESTDIR=Java/wildfly-ee"
      - "TESTDIR=Java/wizzardo-http"
      - "TESTDIR=Scala/cask"
      - "TESTLANG=JavaScript"

frameworks/Java/wildfly-ee7/benchmark_config.json → frameworks/Java/wildfly-ee/benchmark_config.json

@@ -1,13 +1,13 @@
 {
-  "framework": "wildfly-ee7",
+  "framework": "wildfly-ee",
   "tests": [{
     "default" : {
-      "json_url": "/wildfly-ee7/rest/json",
-      "plaintext_url": "/wildfly-ee7/rest/plaintext",
-      "db_url": "/wildfly-ee7/rest/db",
-      "query_url": "/wildfly-ee7/rest/queries?queries=",
-      "fortune_url": "/wildfly-ee7/fortunes.xhtml",
-      "update_url": "/wildfly-ee7/rest/updates?queries=",
+      "json_url": "/wildfly-ee/rest/json",
+      "plaintext_url": "/wildfly-ee/rest/plaintext",
+      "db_url": "/wildfly-ee/rest/db",
+      "query_url": "/wildfly-ee/rest/queries?queries=",
+      "fortune_url": "/wildfly-ee/fortunes.xhtml",
+      "update_url": "/wildfly-ee/rest/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
@@ -20,7 +20,7 @@
       "webserver": "Wildfly",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "wildfly-ee7",
+      "display_name": "wildfly-ee",
       "notes": "",
       "versus": ""
     }   

frameworks/Java/wildfly-ee/pom.xml

@@ -0,0 +1,75 @@
+<?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">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.techempower</groupId>
+	<artifactId>wildfly-ee</artifactId>
+	<version>0.1</version>
+	<packaging>war</packaging>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<java.version>11</java.version>
+		<version.compiler.plugin>3.8.0</version.compiler.plugin>
+		<version.war.plugin>3.2.2</version.war.plugin>
+		<version.wildfly>14.0.1.Final</version.wildfly>
+		<version.javaee.api>8.0</version.javaee.api>
+	</properties>
+
+	<repositories>
+		<repository>
+			<id>jboss-public-repository-group</id>
+			<name>JBoss Public Maven Repository Group</name>
+			<url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+			<layout>default</layout>
+			<releases>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>never</updatePolicy>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>javaee-api</artifactId>
+			<version>${version.javaee.api}</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>2.4.0-b180830.0438</version>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<finalName>${project.artifactId}</finalName>
+		<plugins>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>${version.war.plugin}</version>
+				<configuration>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${version.compiler.plugin}</version>
+				<configuration>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
+					<release>${java.version}</release>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>

frameworks/Java/wildfly-ee7/src/main/java/com/techempower/ee7/rest/CatchAllExceptionMapper.java → frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee7/rest/CatchAllExceptionMapper.java

@@ -5,16 +5,11 @@ import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
-import org.jboss.logging.Logger;
-
 @Provider
 public class CatchAllExceptionMapper implements ExceptionMapper<Exception> {
 
-    static final Logger log = Logger.getLogger(CatchAllExceptionMapper.class);
-
     @Override
     public Response toResponse(Exception exception) {
-        log.info("Request Failed: " + exception.getMessage());
         return Response.status(Status.BAD_REQUEST).build();
     }
 }

frameworks/Java/wildfly-ee7/wildfly-config.txt → frameworks/Java/wildfly-ee/wildfly-config.txt

@@ -3,5 +3,5 @@ embed-server
 /subsystem=undertow/server=default-server/host=default-host/filter-ref=server-header:add()
 deploy mysql-connector-java.jar
 /subsystem=datasources/data-source=TechempowerBenchmark:add(connection-url="jdbc:mysql://tfb-database:3306/hello_world?useSSL=false",driver-name="mysql-connector-java.jar_com.mysql.jdbc.Driver_5_1",jndi-name="java:jboss/datasources/helloWorld",jta=true,max-pool-size=512,min-pool-size=512,user-name="benchmarkdbuser",password="benchmarkdbpass")
-deploy target/wildfly-ee7.war
+deploy target/wildfly-ee.war
 stop-embedded-server

frameworks/Java/wildfly-ee7/wildfly-ee7.dockerfile → frameworks/Java/wildfly-ee/wildfly-ee.dockerfile

@@ -1,6 +1,6 @@
-FROM maven:3.5.3-jdk-10-slim as maven
-ENV wfly=13.0.0.Final
-ENV JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Xms2g -Xmx2g -XX:+UseG1GC -XX:MaxGCPauseMillis=50"
+FROM maven:3.6.0-jdk-11-slim as maven
+ENV wfly=14.0.1.Final
+ENV JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Xms2g -Xmx2g -XX:+UnlockExperimentalVMOptions -XX:+UseZGC"
 WORKDIR /wildfly
 COPY src src
 COPY pom.xml pom.xml

frameworks/Java/wildfly-ee7/pom.xml

@@ -1,118 +0,0 @@
-<?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">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.techempower</groupId>
-	<artifactId>wildfly-ee7</artifactId>
-	<version>0.1</version>
-	<packaging>war</packaging>
-
-	<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>
-		<version.compiler.plugin>3.8.0</version.compiler.plugin>
-		<version.war.plugin>3.2.1</version.war.plugin>
-		<version.wildfly>13.0.0.Final</version.wildfly>
-		<version.javaee.api>7.0</version.javaee.api>
-		<version.jboss.spec.javaee.7.0>1.0.3.Final</version.jboss.spec.javaee.7.0>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>jboss-public-repository-group</id>
-			<name>JBoss Public Maven Repository Group</name>
-			<url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
-			<layout>default</layout>
-			<releases>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</releases>
-			<snapshots>
-				<enabled>true</enabled>
-				<updatePolicy>never</updatePolicy>
-			</snapshots>
-		</repository>
-	</repositories>
-
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.jboss.spec</groupId>
-				<artifactId>jboss-javaee-7.0</artifactId>
-				<version>${version.jboss.spec.javaee.7.0}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-
-			<dependency>
-				<groupId>org.wildfly</groupId>
-				<artifactId>wildfly-parent</artifactId>
-				<version>${version.wildfly}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-api</artifactId>
-			<version>${version.javaee.api}</version>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jboss.spec.javax.servlet</groupId>
-			<artifactId>jboss-servlet-api_3.1_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jaxrs</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>io.undertow</groupId>
-			<artifactId>undertow-servlet</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jboss.spec.javax.ejb</groupId>
-			<artifactId>jboss-ejb-api_3.2_spec</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.jboss.logging</groupId>
-			<artifactId>jboss-logging</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-	</dependencies>
-
-	<build>
-		<finalName>${project.artifactId}</finalName>
-		<plugins>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>${version.war.plugin}</version>
-				<configuration>
-					<failOnMissingWebXml>false</failOnMissingWebXml>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>${version.compiler.plugin}</version>
-				<configuration>
-					<debug>false</debug>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>