Skip to content

Commit 64441be

Browse files
timis1timis1
authored
[JAVA-37378] Upgrade web-modules/resteasy to jakarta namespace (eugenp#17110)
1 parent 8df8ec6 commit 64441be

8 files changed

Lines changed: 31 additions & 25 deletions

File tree

‎web-modules/resteasy/pom.xml‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,14 @@
3838
<version>${resteasy.version}</version>
3939
</dependency>
4040
<dependency>
41-
<groupId>javax.servlet</groupId>
42-
<artifactId>javax.servlet-api</artifactId>
43-
<version>${javax.servlet-api.version}</version>
41+
<groupId>jakarta.servlet</groupId>
42+
<artifactId>jakarta.servlet-api</artifactId>
43+
<version>${jakarta.servlet-api.version}</version>
44+
</dependency>
45+
<dependency>
46+
<groupId>commons-io</groupId>
47+
<artifactId>commons-io</artifactId>
48+
<version>${commons-io.version}</version>
4449
</dependency>
4550
</dependencies>
4651

@@ -49,7 +54,7 @@
4954
<plugins>
5055
<plugin>
5156
<groupId>org.codehaus.cargo</groupId>
52-
<artifactId>cargo-maven2-plugin</artifactId>
57+
<artifactId>cargo-maven3-plugin</artifactId>
5358
<version>${cargo-maven2-plugin.version}</version>
5459
<configuration>
5560
<wait>true</wait>
@@ -100,7 +105,7 @@
100105
</plugin>
101106
<plugin>
102107
<groupId>org.codehaus.cargo</groupId>
103-
<artifactId>cargo-maven2-plugin</artifactId>
108+
<artifactId>cargo-maven3-plugin</artifactId>
104109
<version>${cargo-maven2-plugin.version}</version>
105110
<configuration>
106111
<wait>false</wait>
@@ -128,8 +133,9 @@
128133
</profiles>
129134

130135
<properties>
131-
<resteasy.version>4.7.2.Final</resteasy.version>
132-
<cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
136+
<resteasy.version>6.2.9.Final</resteasy.version>
137+
<cargo-maven2-plugin.version>1.10.14</cargo-maven2-plugin.version>
138+
<jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
133139
</properties>
134140

135141
</project>

‎web-modules/resteasy/src/main/java/com/baeldung/client/ServicesInterface.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.baeldung.client;
22

33
import com.baeldung.model.Movie;
4-
import javax.ws.rs.*;
5-
import javax.ws.rs.core.MediaType;
6-
import javax.ws.rs.core.Response;
4+
import jakarta.ws.rs.*;
5+
import jakarta.ws.rs.core.MediaType;
6+
import jakarta.ws.rs.core.Response;
77
import java.util.List;
88

99
@Path("/movies")

‎web-modules/resteasy/src/main/java/com/baeldung/filter/CORSFilter.java‎

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

33
import java.io.IOException;
44

5-
import javax.ws.rs.container.ContainerRequestContext;
6-
import javax.ws.rs.container.ContainerResponseContext;
7-
import javax.ws.rs.container.ContainerResponseFilter;
5+
import jakarta.ws.rs.container.ContainerRequestContext;
6+
import jakarta.ws.rs.container.ContainerResponseContext;
7+
import jakarta.ws.rs.container.ContainerResponseFilter;
88

99
public class CORSFilter implements ContainerResponseFilter {
1010

‎web-modules/resteasy/src/main/java/com/baeldung/model/Movie.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.baeldung.model;
22

3-
import javax.xml.bind.annotation.XmlAccessType;
4-
import javax.xml.bind.annotation.XmlAccessorType;
5-
import javax.xml.bind.annotation.XmlType;
3+
import jakarta.xml.bind.annotation.XmlAccessType;
4+
import jakarta.xml.bind.annotation.XmlAccessorType;
5+
import jakarta.xml.bind.annotation.XmlType;
66

77
@XmlAccessorType(XmlAccessType.FIELD)
88
@XmlType(name = "movie", propOrder = { "imdbId", "title" })

‎web-modules/resteasy/src/main/java/com/baeldung/server/MovieCrudService.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.baeldung.server;
22

33
import com.baeldung.model.Movie;
4-
import javax.ws.rs.*;
5-
import javax.ws.rs.core.MediaType;
6-
import javax.ws.rs.core.Response;
4+
import jakarta.ws.rs.*;
5+
import jakarta.ws.rs.core.MediaType;
6+
import jakarta.ws.rs.core.Response;
77
import java.util.ArrayList;
88
import java.util.HashMap;
99
import java.util.List;

‎web-modules/resteasy/src/main/java/com/baeldung/server/RestEasyServices.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.server;
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
import java.util.HashSet;
66
import java.util.Map;
77
import java.util.Set;

‎web-modules/resteasy/src/main/webapp/WEB-INF/jboss-deployment-structure.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<subsystem name="resteasy"/>
66
</exclude-subsystems>
77
<exclusions>
8-
<module name="javaee.api"/><module name="javax.ws.rs.api"/>
8+
<module name="javaee.api"/><module name="jakarta.ws.rs.api"/>
99
<module name="org.jboss.resteasy.resteasy-jaxrs"/>
1010
</exclusions>
1111
<local-last value="true"/>

‎web-modules/resteasy/src/test/java/com/baeldung/server/RestEasyClientLiveTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import java.util.Locale;
88

99
import javax.naming.NamingException;
10-
import javax.ws.rs.client.ClientBuilder;
11-
import javax.ws.rs.core.Response;
12-
import javax.ws.rs.core.UriBuilder;
10+
import jakarta.ws.rs.client.ClientBuilder;
11+
import jakarta.ws.rs.core.Response;
12+
import jakarta.ws.rs.core.UriBuilder;
1313

1414
import org.apache.commons.io.IOUtils;
1515
import org.apache.http.impl.client.CloseableHttpClient;

0 commit comments

Comments
 (0)