wildfly 13.0.0.Final (#3840)

frameworks/Java/wildfly-ee7/pom.xml

@@ -10,9 +10,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<version.compiler.plugin>3.7.0</version.compiler.plugin>
-		<version.war.plugin>3.2.0</version.war.plugin>
-		<version.wildfly>12.0.0.Final</version.wildfly>
-		<version.mysql.connector>5.1.45</version.mysql.connector>
+		<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>
@@ -117,88 +116,4 @@
 			</plugin>
 		</plugins>
 	</build>
-
-	<profiles>
-		<profile>
-			<id>benchmark</id>
-			<build>
-				<plugins>
-					<plugin>
-						<artifactId>maven-war-plugin</artifactId>
-						<version>${version.war.plugin}</version>
-						<configuration>
-							<failOnMissingWebXml>false</failOnMissingWebXml>
-							<outputDirectory>${project.build.directory}/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
-						</configuration>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-						<version>2.8</version>
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<id>unpack-wildfly-server</id>
-								<goals>
-									<goal>unpack</goal>
-								</goals>
-								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>org.wildfly</groupId>
-											<artifactId>wildfly-dist</artifactId>
-											<version>${version.wildfly}</version>
-											<type>zip</type>
-											<overWrite>false</overWrite>
-											<outputDirectory>${project.build.directory}</outputDirectory>
-										</artifactItem>
-									</artifactItems>
-								</configuration>
-							</execution>
-							<execution>
-								<phase>initialize</phase>
-								<id>copy-mysql-driver</id>
-								<goals>
-									<goal>copy</goal>
-								</goals>
-								<configuration>
-									<artifactItems>
-										<artifactItem>
-											<groupId>mysql</groupId>
-											<artifactId>mysql-connector-java</artifactId>
-											<version>${version.mysql.connector}</version>
-											<type>jar</type>
-											<outputDirectory>${project.build.directory}/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
-										</artifactItem>
-									</artifactItems>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<artifactId>maven-resources-plugin</artifactId>
-						<version>2.6</version>
-						<executions>
-							<execution>
-								<phase>initialize</phase>
-								<id>copy-mysql-datasource</id>
-								<goals>
-									<goal>copy-resources</goal>
-								</goals>
-								<configuration>
-									<outputDirectory>${project.build.directory}/wildfly-${version.wildfly}/standalone/deployments</outputDirectory>
-									<resources>
-										<resource>
-											<directory>${basedir}/server-resources/datasources</directory>
-											<filtering>true</filtering>
-										</resource>
-									</resources>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
 </project>

frameworks/Java/wildfly-ee7/server-resources/datasources/mysql-ds.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE xml>
-<datasources xmlns="http://www.jboss.org/ironjacamar/schema">
-    <datasource jta="true" jndi-name="java:jboss/datasources/helloWorld" pool-name="MySqlDS" enabled="true" use-java-context="true" use-ccm="true">
-		<connection-url>jdbc:mysql://tfb-database:3306/hello_world?jdbcCompliantTruncation=false&amp;elideSetAutoCommits=true&amp;useLocalSessionState=true&amp;cachePrepStmts=true&amp;cacheCallableStmts=true&amp;alwaysSendSetIsolation=false&amp;prepStmtCacheSize=4096&amp;cacheServerConfiguration=true&amp;prepStmtCacheSqlLimit=2048&amp;traceProtocol=false&amp;useServerPrepStmts=true&amp;enableQueryTimeouts=false&amp;useUnbufferedIO=false&amp;useReadAheadInput=false&amp;maintainTimeStats=false&amp;cacheRSMetadata=true&amp;useSSL=false</connection-url>
-		<driver>mysql-connector-java-${version.mysql.connector}.jar_com.mysql.jdbc.Driver_5_1</driver>
-		<pool>
-		    <prefill>true</prefill>
-		    <min-pool-size>32</min-pool-size>
-		    <max-pool-size>512</max-pool-size>
-		</pool>
-		<security>
-		    <user-name>benchmarkdbuser</user-name>
-		    <password>benchmarkdbpass</password>
-		</security>
-		<validation>
-		    <validate-on-match>false</validate-on-match>
-		    <background-validation>false</background-validation>
-		    <use-fast-fail>false</use-fast-fail>
-		</validation>
-     </datasource>
-</datasources>

frameworks/Java/wildfly-ee7/src/main/resources/META-INF/persistence.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.1"
-	xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
 	<persistence-unit name="primary" transaction-type="JTA">
 		<jta-data-source>java:jboss/datasources/helloWorld</jta-data-source>
 		<shared-cache-mode>NONE</shared-cache-mode>
 		<properties>
 			<property name="hibernate.jdbc.batch_size" value="100" />
+			<property name="hibernate.dialect" value="MySQL57InnoDB" />
 		</properties>
 	</persistence-unit>
 </persistence>

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

@@ -0,0 +1,7 @@
+embed-server
+/subsystem=undertow/configuration=filter/response-header=server-header:add(header-name="Server", header-value="wfly")
+/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
+stop-embedded-server

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

@@ -1,8 +1,14 @@
 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"
 WORKDIR /wildfly
-COPY server-resources server-resources
 COPY src src
 COPY pom.xml pom.xml
-RUN mvn initialize package -q -P benchmark
-ENV JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Xms2g -Xmx2g -XX:+UseG1GC -XX:MaxGCPauseMillis=50"
-CMD target/wildfly-12.0.0.Final/bin/standalone.sh -b 0.0.0.0
+COPY wildfly-config.txt wildfly-config.txt
+RUN apt-get update
+RUN apt-get install -yqq wget
+RUN wget -q -O- http://download.jboss.org/wildfly/$wfly/wildfly-$wfly.tar.gz | tar xz
+RUN wget -q http://central.maven.org/maven2/mysql/mysql-connector-java/5.1.46/mysql-connector-java-5.1.46.jar -O mysql-connector-java.jar
+RUN mvn clean package -q
+RUN ./wildfly-$wfly/bin/jboss-cli.sh --file=wildfly-config.txt
+CMD ./wildfly-$wfly/bin/standalone.sh -b 0.0.0.0