Skip to content

Commit 42acadf

Browse files
jamezpjamezp
authored
Update WildFly to Jakarta EE 10 and the latest version of WildFly. (#9266)
Signed-off-by: James R. Perkins <[email protected]>
1 parent 7ccad70 commit 42acadf

File tree

18 files changed

+159
-132
lines changed

18 files changed

+159
-132
lines changed

‎frameworks/Java/wildfly-ee/pom.xml‎

Lines changed: 96 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,69 @@
1313
<java.version>17</java.version>
1414
<version.compiler.plugin>3.9.0</version.compiler.plugin>
1515
<version.war.plugin>3.3.2</version.war.plugin>
16-
<version.javaee.api>8.0</version.javaee.api>
17-
<version.wildfly.bootable>26.0.1.Final</version.wildfly.bootable>
18-
<version.wildfly.maven.jar.plugin>7.0.0.Final</version.wildfly.maven.jar.plugin>
19-
<version.wildfly.galleon.datasources.feature.pack>2.0.6.Final</version.wildfly.galleon.datasources.feature.pack>
16+
<version.jakarta.ee>10.0.0</version.jakarta.ee>
17+
<version.wildfly-maven-plugin>5.0.1.Final</version.wildfly-maven-plugin>
18+
<version.wildfly.galleon.datasources.feature.pack>8.0.1.Final</version.wildfly.galleon.datasources.feature.pack>
2019
</properties>
2120

22-
<dependencies>
21+
<dependencyManagement>
22+
<dependencies>
23+
<dependency>
24+
<groupId>jakarta.platform</groupId>
25+
<artifactId>jakarta.jakartaee-bom</artifactId>
26+
<version>${version.jakarta.ee}</version>
27+
<scope>import</scope>
28+
<type>pom</type>
29+
</dependency>
30+
</dependencies>
31+
</dependencyManagement>
2332

33+
<dependencies>
2434
<dependency>
25-
<groupId>javax</groupId>
26-
<artifactId>javaee-api</artifactId>
27-
<version>${version.javaee.api}</version>
35+
<groupId>jakarta.annotation</groupId>
36+
<artifactId>jakarta.annotation-api</artifactId>
37+
<scope>provided</scope>
38+
</dependency>
39+
<dependency>
40+
<groupId>jakarta.enterprise</groupId>
41+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
2842
<scope>provided</scope>
2943
</dependency>
30-
3144
<dependency>
32-
<groupId>org.glassfish.jaxb</groupId>
33-
<artifactId>jaxb-runtime</artifactId>
34-
<version>2.4.0-b180830.0438</version>
45+
<groupId>jakarta.enterprise.concurrent</groupId>
46+
<artifactId>jakarta.enterprise.concurrent-api</artifactId>
47+
<scope>provided</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>jakarta.inject</groupId>
51+
<artifactId>jakarta.inject-api</artifactId>
52+
<scope>provided</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>jakarta.json</groupId>
56+
<artifactId>jakarta.json-api</artifactId>
57+
<scope>provided</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>jakarta.persistence</groupId>
61+
<artifactId>jakarta.persistence-api</artifactId>
62+
<scope>provided</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>jakarta.transaction</groupId>
66+
<artifactId>jakarta.transaction-api</artifactId>
67+
<scope>provided</scope>
68+
</dependency>
69+
<dependency>
70+
<groupId>jakarta.validation</groupId>
71+
<artifactId>jakarta.validation-api</artifactId>
72+
<scope>provided</scope>
73+
</dependency>
74+
<dependency>
75+
<groupId>jakarta.ws.rs</groupId>
76+
<artifactId>jakarta.ws.rs-api</artifactId>
77+
<scope>provided</scope>
3578
</dependency>
36-
3779
</dependencies>
3880

3981
<build>
@@ -50,63 +92,50 @@
5092
<artifactId>maven-compiler-plugin</artifactId>
5193
<version>${version.compiler.plugin}</version>
5294
<configuration>
53-
<source>${java.version}</source>
54-
<target>${java.version}</target>
5595
<release>${java.version}</release>
5696
</configuration>
5797
</plugin>
98+
<plugin>
99+
<groupId>org.wildfly.plugins</groupId>
100+
<artifactId>wildfly-maven-plugin</artifactId>
101+
<version>${version.wildfly-maven-plugin}</version>
102+
<configuration>
103+
<name>ROOT.war</name>
104+
<!-- Not using the version for the feature-pack and channel manifest will always use the latest -->
105+
<feature-packs>
106+
<feature-pack>
107+
<groupId>org.wildfly</groupId>
108+
<artifactId>wildfly-ee-galleon-pack</artifactId>
109+
</feature-pack>
110+
<feature-pack>
111+
<groupId>org.wildfly</groupId>
112+
<artifactId>wildfly-datasources-galleon-pack</artifactId>
113+
<version>${version.wildfly.galleon.datasources.feature.pack}</version>
114+
</feature-pack>
115+
</feature-packs>
116+
<channels>
117+
<channel>
118+
<manifest>
119+
<groupId>org.wildfly.channels</groupId>
120+
<artifactId>wildfly-ee</artifactId>
121+
</manifest>
122+
</channel>
123+
</channels>
124+
<layers>
125+
<layer>jaxrs-server</layer>
126+
<layer>jpa</layer>
127+
<layer>jsf</layer>
128+
<layer>mysql-driver</layer>
129+
</layers>
130+
<packaging-scripts>
131+
<packaging-script>
132+
<scripts>
133+
<script>${basedir}/scripts/wildfly-setup.cli</script>
134+
</scripts>
135+
</packaging-script>
136+
</packaging-scripts>
137+
</configuration>
138+
</plugin>
58139
</plugins>
59140
</build>
60-
61-
<profiles>
62-
<profile>
63-
<id>bootable-jar</id>
64-
<activation>
65-
<activeByDefault>false</activeByDefault>
66-
</activation>
67-
<build>
68-
<plugins>
69-
<plugin>
70-
<groupId>org.wildfly.plugins</groupId>
71-
<artifactId>wildfly-jar-maven-plugin</artifactId>
72-
<version>${version.wildfly.maven.jar.plugin}</version>
73-
<configuration>
74-
<feature-packs>
75-
<feature-pack>
76-
<location>wildfly@maven(org.jboss.universe:community-universe)#${version.wildfly.bootable}</location>
77-
</feature-pack>
78-
<feature-pack>
79-
<groupId>org.wildfly</groupId>
80-
<artifactId>wildfly-datasources-galleon-pack</artifactId>
81-
<version>${version.wildfly.galleon.datasources.feature.pack}</version>
82-
</feature-pack>
83-
</feature-packs>
84-
<layers>
85-
<layer>jaxrs-server</layer>
86-
<layer>jsf</layer>
87-
<layer>mysql-driver</layer>
88-
</layers>
89-
<excluded-layers>
90-
<layer>deployment-scanner</layer>
91-
</excluded-layers>
92-
<cli-sessions>
93-
<cli-session>
94-
<script-files>
95-
<script>scripts/bootable-jar.cli</script>
96-
</script-files>
97-
</cli-session>
98-
</cli-sessions>
99-
</configuration>
100-
<executions>
101-
<execution>
102-
<goals>
103-
<goal>package</goal>
104-
</goals>
105-
</execution>
106-
</executions>
107-
</plugin>
108-
</plugins>
109-
</build>
110-
</profile>
111-
</profiles>
112141
</project>

‎frameworks/Java/wildfly-ee/scripts/bootable-jar.cli‎ renamed to ‎frameworks/Java/wildfly-ee/scripts/wildfly-setup.cli‎

File renamed without changes.

‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee7/jpa/PersistenceResources.java‎ renamed to ‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee/jpa/PersistenceResources.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.techempower.ee7.jpa;
22

3-
import javax.enterprise.context.Dependent;
4-
import javax.enterprise.inject.Produces;
5-
import javax.persistence.EntityManager;
6-
import javax.persistence.PersistenceContext;
3+
import jakarta.enterprise.context.Dependent;
4+
import jakarta.enterprise.inject.Produces;
5+
import jakarta.persistence.EntityManager;
6+
import jakarta.persistence.PersistenceContext;
77

88
public class PersistenceResources {
99

‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee7/model/Fortune.java‎ renamed to ‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee/model/Fortune.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import java.io.Serializable;
44

5-
import javax.persistence.Entity;
6-
import javax.persistence.GeneratedValue;
7-
import javax.persistence.GenerationType;
8-
import javax.persistence.Id;
9-
import javax.persistence.NamedQuery;
10-
import javax.validation.constraints.NotNull;
11-
import javax.validation.constraints.Size;
5+
import jakarta.persistence.Entity;
6+
import jakarta.persistence.GeneratedValue;
7+
import jakarta.persistence.GenerationType;
8+
import jakarta.persistence.Id;
9+
import jakarta.persistence.NamedQuery;
10+
import jakarta.validation.constraints.NotNull;
11+
import jakarta.validation.constraints.Size;
1212

1313
@NamedQuery(name = "allFortunes", query = "SELECT f FROM Fortune f")
1414
@Entity

‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee7/model/World.java‎ renamed to ‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee/model/World.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import java.io.Serializable;
44

5-
import javax.persistence.Entity;
6-
import javax.persistence.GeneratedValue;
7-
import javax.persistence.GenerationType;
8-
import javax.persistence.Id;
9-
import javax.validation.constraints.NotNull;
5+
import jakarta.persistence.Entity;
6+
import jakarta.persistence.GeneratedValue;
7+
import jakarta.persistence.GenerationType;
8+
import jakarta.persistence.Id;
9+
import jakarta.validation.constraints.NotNull;
1010

1111
@Entity
1212
public class World implements Serializable {

‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee7/rest/CatchAllExceptionMapper.java‎ renamed to ‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee/rest/CatchAllExceptionMapper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.techempower.ee7.rest;
22

3-
import javax.ws.rs.core.Response;
4-
import javax.ws.rs.core.Response.Status;
5-
import javax.ws.rs.ext.ExceptionMapper;
6-
import javax.ws.rs.ext.Provider;
3+
import jakarta.ws.rs.core.Response;
4+
import jakarta.ws.rs.core.Response.Status;
5+
import jakarta.ws.rs.ext.ExceptionMapper;
6+
import jakarta.ws.rs.ext.Provider;
77

88
@Provider
99
public class CatchAllExceptionMapper implements ExceptionMapper<Exception> {

‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee7/rest/MyApplication.java‎ renamed to ‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee/rest/MyApplication.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.techempower.ee7.rest;
22

3-
import javax.ws.rs.ApplicationPath;
4-
import javax.ws.rs.core.Application;
3+
import jakarta.ws.rs.ApplicationPath;
4+
import jakarta.ws.rs.core.Application;
55

66
@ApplicationPath("rest")
77
public class MyApplication extends Application {

‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee7/tests/Fortunes.java‎ renamed to ‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee/tests/Fortunes.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import java.util.Collections;
44
import java.util.List;
55

6-
import javax.annotation.PostConstruct;
7-
import javax.enterprise.context.RequestScoped;
8-
import javax.inject.Inject;
9-
import javax.inject.Named;
10-
import javax.persistence.EntityManager;
6+
import jakarta.annotation.PostConstruct;
7+
import jakarta.enterprise.context.RequestScoped;
8+
import jakarta.inject.Inject;
9+
import jakarta.inject.Named;
10+
import jakarta.persistence.EntityManager;
1111

1212
import com.techempower.ee7.model.Fortune;
1313

‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee7/tests/JsonSerialization.java‎ renamed to ‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee/tests/JsonSerialization.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.techempower.ee7.tests;
22

3-
import javax.ws.rs.GET;
4-
import javax.ws.rs.Path;
5-
import javax.ws.rs.Produces;
6-
import javax.ws.rs.core.MediaType;
3+
import jakarta.ws.rs.GET;
4+
import jakarta.ws.rs.Path;
5+
import jakarta.ws.rs.Produces;
6+
import jakarta.ws.rs.core.MediaType;
77

88
@Path("/json")
99
public class JsonSerialization {

‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee7/tests/MultipleQueries.java‎ renamed to ‎frameworks/Java/wildfly-ee/src/main/java/com/techempower/ee/tests/MultipleQueries.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import java.util.ArrayList;
44
import java.util.List;
55

6-
import javax.inject.Inject;
7-
import javax.persistence.EntityManager;
8-
import javax.ws.rs.GET;
9-
import javax.ws.rs.Path;
10-
import javax.ws.rs.Produces;
11-
import javax.ws.rs.QueryParam;
12-
import javax.ws.rs.core.MediaType;
6+
import jakarta.inject.Inject;
7+
import jakarta.persistence.EntityManager;
8+
import jakarta.ws.rs.GET;
9+
import jakarta.ws.rs.Path;
10+
import jakarta.ws.rs.Produces;
11+
import jakarta.ws.rs.QueryParam;
12+
import jakarta.ws.rs.core.MediaType;
1313

1414
import com.techempower.ee7.model.World;
1515
import com.techempower.ee7.util.Helpers;

0 commit comments

Comments
 (0)