update wildfly to 22.0.1 and use bootable jar (#6368)

frameworks/Java/wildfly-ee/benchmark_config.json

@@ -2,12 +2,12 @@
   "framework": "wildfly-ee",
   "tests": [{
     "default" : {
-      "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=",
+      "json_url": "/rest/json",
+      "plaintext_url": "/rest/plaintext",
+      "db_url": "/rest/db",
+      "query_url": "/rest/queries?queries=",
+      "fortune_url": "/fortunes.xhtml",
+      "update_url": "/rest/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",

frameworks/Java/wildfly-ee/pom.xml

@@ -10,9 +10,9 @@
 
 	<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>
+		<java.version>15</java.version>
+		<version.compiler.plugin>3.8.1</version.compiler.plugin>
+		<version.war.plugin>3.3.1</version.war.plugin>
 		<version.javaee.api>8.0</version.javaee.api>
 	</properties>
 
@@ -71,4 +71,56 @@
 			</plugin>
 		</plugins>
 	</build>
+
+	<profiles>
+		<profile>
+			<id>bootable-jar</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.wildfly.plugins</groupId>
+						<artifactId>wildfly-jar-maven-plugin</artifactId>
+						<version>3.0.2.Final</version>
+						<configuration>
+							<feature-packs>
+								<feature-pack>
+									<location>wildfly@maven(org.jboss.universe:community-universe)#22.0.1.Final</location>
+								</feature-pack>
+								<feature-pack>
+									<groupId>org.wildfly</groupId>
+									<artifactId>wildfly-datasources-galleon-pack</artifactId>
+									<version>1.2.1.Final</version>
+								</feature-pack>
+							</feature-packs>
+							<layers>
+								<layer>jaxrs-server</layer>
+								<layer>jsf</layer>
+								<layer>mysql-driver</layer>
+							</layers>
+							<excluded-layers>
+								<layer>deployment-scanner</layer>
+							</excluded-layers>
+							<cli-sessions>
+								<cli-session>
+									<script-files>
+										<script>scripts/bootable-jar.cli</script>
+									</script-files>
+								</cli-session>
+							</cli-sessions>
+						</configuration>
+						<executions>
+							<execution>
+								<goals>
+									<goal>package</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

frameworks/Java/wildfly-ee/wildfly-config.txt → frameworks/Java/wildfly-ee/scripts/bootable-jar.cli

@@ -1,7 +1,5 @@
-embed-server
+/interface=public:undefine-attribute(name=inet-address)
+/interface=public:write-attribute(name=any-address, value=true)
 /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&allowPublicKeyRetrieval=true",driver-name="mysql-connector-java.jar",jndi-name="java:jboss/datasources/helloWorld",jta=true,max-pool-size=1024,min-pool-size=256,user-name="benchmarkdbuser",password="benchmarkdbpass")
-deploy target/wildfly-ee.war
-stop-embedded-server
+/subsystem=datasources/data-source=TechempowerBenchmark:add(connection-url="jdbc:mysql://tfb-database:3306/hello_world?useSSL=false&allowPublicKeyRetrieval=true",driver-name="mysql",jndi-name="java:jboss/datasources/helloWorld",jta=true,max-pool-size=1024,min-pool-size=256,user-name="benchmarkdbuser",password="benchmarkdbpass")

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

@@ -1,18 +1,10 @@
 FROM maven:3.6.3-adoptopenjdk-15
-ENV wfly=21.0.1.Final
-ENV connectorj=8.0.22
-ENV JAVA_OPTS="-Djava.net.preferIPv4Stack=true -Xmx24g -XX:+UseZGC"
 WORKDIR /wildfly
+EXPOSE 8080
 COPY src src
+COPY scripts scripts
 COPY pom.xml pom.xml
-COPY wildfly-config.txt wildfly-config.txt
 RUN apt-get update
 RUN apt-get install -yqq wget
-RUN wget -q -O- https://download.jboss.org/wildfly/$wfly/wildfly-$wfly.tar.gz | tar xz
-RUN wget -q https://repo1.maven.org/maven2/mysql/mysql-connector-java/$connectorj/mysql-connector-java-$connectorj.jar -O mysql-connector-java.jar
-RUN mvn clean package -q
-RUN ./wildfly-$wfly/bin/jboss-cli.sh --file=wildfly-config.txt
-
-EXPOSE 8080
-
-CMD ./wildfly-$wfly/bin/standalone.sh -b 0.0.0.0
+RUN mvn clean package -P bootable-jar
+CMD java -Djava.net.preferIPv4Stack=true -Xmx24g -XX:+UseZGC -jar target/wildfly-ee-bootable.jar