Browse Source

update to wildfly 23 and JDK16 (#6456)

Cody Lerum 4 years ago
parent
commit
567e0d91c8

+ 4 - 21
frameworks/Java/wildfly-ee/pom.xml

@@ -10,29 +10,12 @@
 
 
 	<properties>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>15</java.version>
+		<java.version>16</java.version>
 		<version.compiler.plugin>3.8.1</version.compiler.plugin>
 		<version.compiler.plugin>3.8.1</version.compiler.plugin>
 		<version.war.plugin>3.3.1</version.war.plugin>
 		<version.war.plugin>3.3.1</version.war.plugin>
 		<version.javaee.api>8.0</version.javaee.api>
 		<version.javaee.api>8.0</version.javaee.api>
 	</properties>
 	</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>
 	<dependencies>
 
 
 		<dependency>
 		<dependency>
@@ -83,16 +66,16 @@
 					<plugin>
 					<plugin>
 						<groupId>org.wildfly.plugins</groupId>
 						<groupId>org.wildfly.plugins</groupId>
 						<artifactId>wildfly-jar-maven-plugin</artifactId>
 						<artifactId>wildfly-jar-maven-plugin</artifactId>
-						<version>3.0.2.Final</version>
+						<version>4.0.0.Final</version>
 						<configuration>
 						<configuration>
 							<feature-packs>
 							<feature-packs>
 								<feature-pack>
 								<feature-pack>
-									<location>wildfly@maven(org.jboss.universe:community-universe)#22.0.1.Final</location>
+									<location>wildfly@maven(org.jboss.universe:community-universe)#23.0.0.Final</location>
 								</feature-pack>
 								</feature-pack>
 								<feature-pack>
 								<feature-pack>
 									<groupId>org.wildfly</groupId>
 									<groupId>org.wildfly</groupId>
 									<artifactId>wildfly-datasources-galleon-pack</artifactId>
 									<artifactId>wildfly-datasources-galleon-pack</artifactId>
-									<version>1.2.1.Final</version>
+									<version>1.2.3.Final</version>
 								</feature-pack>
 								</feature-pack>
 							</feature-packs>
 							</feature-packs>
 							<layers>
 							<layers>

+ 2 - 3
frameworks/Java/wildfly-ee/wildfly-ee.dockerfile

@@ -1,10 +1,9 @@
-FROM maven:3.6.3-adoptopenjdk-15
+FROM maven:3.6.3-openjdk-16
 WORKDIR /wildfly
 WORKDIR /wildfly
 EXPOSE 8080
 EXPOSE 8080
+ENV MAVEN_OPTS="--add-exports=java.xml/com.sun.org.apache.xerces.internal.parsers=ALL-UNNAMED --add-exports=java.xml/com.sun.org.apache.xerces.internal.util=ALL-UNNAMED"
 COPY src src
 COPY src src
 COPY scripts scripts
 COPY scripts scripts
 COPY pom.xml pom.xml
 COPY pom.xml pom.xml
-RUN apt-get update
-RUN apt-get install -yqq wget
 RUN mvn clean package -P bootable-jar
 RUN mvn clean package -P bootable-jar
 CMD java -Djava.net.preferIPv4Stack=true -Xmx24g -XX:+UseZGC -jar target/wildfly-ee-bootable.jar
 CMD java -Djava.net.preferIPv4Stack=true -Xmx24g -XX:+UseZGC -jar target/wildfly-ee-bootable.jar