Enable tests after jakartified media
Signed-off-by: Jan Supol <jan.supol@oracle.com>
diff --git a/bom/pom.xml b/bom/pom.xml
index 007dead..5fcbaca 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -188,21 +188,16 @@
<artifactId>jersey-proxy-client</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-servlet-portability</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-spring4</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-spring5</artifactId>
- <version>${project.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.ext</groupId>-->
+<!-- <artifactId>jersey-spring4</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.ext</groupId>-->
+<!-- <artifactId>jersey-spring5</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-declarative-linking</artifactId>
@@ -258,21 +253,21 @@
<artifactId>jersey-rx-client-rxjava2</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext.microprofile</groupId>
- <artifactId>jersey-mp-rest-client</artifactId>
- <version>${project.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.ext.microprofile</groupId>-->
+<!-- <artifactId>jersey-mp-rest-client</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-jaxb</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <version>${project.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jettison</artifactId>
diff --git a/connectors/jetty-connector/pom.xml b/connectors/jetty-connector/pom.xml
index b54574d..fa6d9c0 100644
--- a/connectors/jetty-connector/pom.xml
+++ b/connectors/jetty-connector/pom.xml
@@ -48,12 +48,12 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-jetty</artifactId>
diff --git a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java b/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java
index 140ab60..7b44c7d 100644
--- a/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java
+++ b/connectors/jetty-connector/src/test/java/org/glassfish/jersey/jetty/connector/EntityTest.java
@@ -32,7 +32,7 @@
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.logging.LoggingFeature;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
@@ -103,15 +103,15 @@
@Override
protected Application configure() {
- ResourceConfig config = new ResourceConfig(EntityResource.class, JacksonFeature.class);
+ ResourceConfig config = new ResourceConfig(EntityResource.class/*, JacksonFeature.class*/);
config.register(new LoggingFeature(LOGGER, LoggingFeature.Verbosity.PAYLOAD_ANY));
return config;
}
@Override
protected void configureClient(ClientConfig config) {
- config.connectorProvider(new JettyConnectorProvider())
- .register(JacksonFeature.class);
+ config.connectorProvider(new JettyConnectorProvider());
+ //.register(/*JacksonFeature.class*/);
}
@Test
diff --git a/core-server/pom.xml b/core-server/pom.xml
index fdc0f05..210c233 100644
--- a/core-server/pom.xml
+++ b/core-server/pom.xml
@@ -199,6 +199,12 @@
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<scope>provided</scope>
@@ -232,48 +238,6 @@
<profiles>
<profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- TODO remove after jakartification -->
- <configuration>
- <excludes> <!--JDK 8 -->
- <exclude>org/glassfish/jersey/server/filter/FilterSetMethodTest.java</exclude>
- <exclude>org/glassfish/jersey/server/internal/inject/FormParamTest.java</exclude>
- <exclude>org/glassfish/jersey/server/model/OptionsSubResourceMethodTest.java</exclude>
- <exclude>org/glassfish/jersey/server/model/OptionsTest.java</exclude>
- <exclude>org/glassfish/jersey/server/wadl/generators/resourcedoc/WadlGeneratorResourceDocSupportTest.java</exclude>
- <exclude>org/glassfish/jersey/server/ExtendedResourceContextTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>securityOff</id>
<properties>
<surefire.security.argline />
diff --git a/examples/declarative-linking/pom.xml b/examples/declarative-linking/pom.xml
index a6a94c4..76a0c0e 100644
--- a/examples/declarative-linking/pom.xml
+++ b/examples/declarative-linking/pom.xml
@@ -55,6 +55,11 @@
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-moxy</artifactId>
</dependency>
@@ -82,32 +87,11 @@
<mainClass>org.glassfish.jersey.examples.linking.App</mainClass>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/examples/linking/LinkWebAppTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
<profiles>
<profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>pre-release</id>
<build>
<plugins>
diff --git a/examples/entity-filtering-security/pom.xml b/examples/entity-filtering-security/pom.xml
index e911b73..2c5a9b9 100644
--- a/examples/entity-filtering-security/pom.xml
+++ b/examples/entity-filtering-security/pom.xml
@@ -49,8 +49,12 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
+ <artifactId>jersey-media-json-processing</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
@@ -70,16 +74,6 @@
<mainClass>org.glassfish.jersey.examples.entityfiltering.security.App</mainClass>
</configuration>
</plugin>
- <!-- TODO remove after jakartification is done -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/SecurityEntityFilteringApplication.java b/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/SecurityEntityFilteringApplication.java
index e4962d6..a6001e0 100644
--- a/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/SecurityEntityFilteringApplication.java
+++ b/examples/entity-filtering-security/src/main/java/org/glassfish/jersey/examples/entityfiltering/security/SecurityEntityFilteringApplication.java
@@ -12,7 +12,7 @@
import jakarta.ws.rs.ApplicationPath;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.filtering.SecurityEntityFilteringFeature;
import org.glassfish.jersey.moxy.json.MoxyJsonConfig;
import org.glassfish.jersey.server.ResourceConfig;
diff --git a/examples/entity-filtering-security/src/test/java/org/glassfish/jersey/examples/entityfiltering/security/RestrictedResourceTest.java b/examples/entity-filtering-security/src/test/java/org/glassfish/jersey/examples/entityfiltering/security/RestrictedResourceTest.java
index 748c5d8..2a0e3e6 100644
--- a/examples/entity-filtering-security/src/test/java/org/glassfish/jersey/examples/entityfiltering/security/RestrictedResourceTest.java
+++ b/examples/entity-filtering-security/src/test/java/org/glassfish/jersey/examples/entityfiltering/security/RestrictedResourceTest.java
@@ -17,7 +17,7 @@
import org.glassfish.jersey.examples.entityfiltering.security.domain.RestrictedEntity;
import org.glassfish.jersey.examples.entityfiltering.security.domain.RestrictedSubEntity;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.filtering.SecurityEntityFilteringFeature;
import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
import org.glassfish.jersey.server.ResourceConfig;
@@ -42,7 +42,7 @@
@Parameterized.Parameters(name = "Provider: {0}")
public static Iterable<Class[]> providers() {
- return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}, {JacksonFeature.class}});
+ return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}/*, {JacksonFeature.class}*/});
}
public RestrictedResourceTest(final Class<Feature> filteringProvider) {
diff --git a/examples/entity-filtering-security/src/test/java/org/glassfish/jersey/examples/entityfiltering/security/UnrestrictedResourceTest.java b/examples/entity-filtering-security/src/test/java/org/glassfish/jersey/examples/entityfiltering/security/UnrestrictedResourceTest.java
index 9f630eb..aeebc96 100644
--- a/examples/entity-filtering-security/src/test/java/org/glassfish/jersey/examples/entityfiltering/security/UnrestrictedResourceTest.java
+++ b/examples/entity-filtering-security/src/test/java/org/glassfish/jersey/examples/entityfiltering/security/UnrestrictedResourceTest.java
@@ -16,7 +16,7 @@
import org.glassfish.jersey.examples.entityfiltering.security.domain.RestrictedEntity;
import org.glassfish.jersey.examples.entityfiltering.security.domain.RestrictedSubEntity;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.filtering.SecurityEntityFilteringFeature;
import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
import org.glassfish.jersey.server.ResourceConfig;
@@ -40,7 +40,7 @@
@Parameterized.Parameters(name = "Provider: {0}")
public static Iterable<Class[]> providers() {
- return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}, {JacksonFeature.class}});
+ return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}/*, {JacksonFeature.class}*/});
}
public UnrestrictedResourceTest(final Class<Feature> filteringProvider) {
diff --git a/examples/entity-filtering-selectable/pom.xml b/examples/entity-filtering-selectable/pom.xml
index 009042c..9888667 100644
--- a/examples/entity-filtering-selectable/pom.xml
+++ b/examples/entity-filtering-selectable/pom.xml
@@ -49,8 +49,12 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
+ <artifactId>jersey-media-json-processing</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
@@ -70,16 +74,6 @@
<mainClass>org.glassfish.jersey.examples.entityfiltering.selectable.App</mainClass>
</configuration>
</plugin>
- <!-- TODO remove after jakartification is done -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/SelectableEntityFilteringApplication.java b/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/SelectableEntityFilteringApplication.java
index b56f842..093d6c2 100644
--- a/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/SelectableEntityFilteringApplication.java
+++ b/examples/entity-filtering-selectable/src/main/java/org/glassfish/jersey/examples/entityfiltering/selectable/SelectableEntityFilteringApplication.java
@@ -12,7 +12,7 @@
import jakarta.ws.rs.ApplicationPath;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.filtering.SelectableEntityFilteringFeature;
import org.glassfish.jersey.moxy.json.MoxyJsonConfig;
import org.glassfish.jersey.server.ResourceConfig;
diff --git a/examples/entity-filtering-selectable/src/test/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java b/examples/entity-filtering-selectable/src/test/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java
index faee55e..a1b8c46 100644
--- a/examples/entity-filtering-selectable/src/test/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java
+++ b/examples/entity-filtering-selectable/src/test/java/org/glassfish/jersey/examples/entityfiltering/selectable/PersonResourceTest.java
@@ -21,7 +21,7 @@
import org.glassfish.jersey.examples.entityfiltering.selectable.domain.Person;
import org.glassfish.jersey.examples.entityfiltering.selectable.domain.PhoneNumber;
import org.glassfish.jersey.examples.entityfiltering.selectable.resource.PersonResource;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.filtering.SelectableEntityFilteringFeature;
import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
import org.glassfish.jersey.server.ResourceConfig;
@@ -46,7 +46,7 @@
@Parameterized.Parameters(name = "Provider: {0}")
public static Iterable<Class[]> providers() {
- return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}, {JacksonFeature.class}});
+ return Arrays.asList(new Class[][]{{MoxyJsonFeature.class} /*, {JacksonFeature.class} */});
}
private final Class<Feature> filteringProvider;
@@ -94,12 +94,12 @@
assertThat(phoneNumbers, notNullValue());
// TODO: enable for MOXy as well when JERSEY-2751 gets fixed.
- if (JacksonFeature.class.isAssignableFrom(filteringProvider)) {
- phoneNumber = phoneNumbers.get("HOME");
- assertThat(phoneNumber, notNullValue());
- assertThat(phoneNumber.getAreaCode(), notNullValue());
- assertThat(phoneNumber.getNumber(), notNullValue());
- }
+// if (JacksonFeature.class.isAssignableFrom(filteringProvider)) {
+// phoneNumber = phoneNumbers.get("HOME");
+// assertThat(phoneNumber, notNullValue());
+// assertThat(phoneNumber.getAreaCode(), notNullValue());
+// assertThat(phoneNumber.getNumber(), notNullValue());
+// }
}
@Test
diff --git a/examples/entity-filtering/pom.xml b/examples/entity-filtering/pom.xml
index 1033231..a3498b0 100644
--- a/examples/entity-filtering/pom.xml
+++ b/examples/entity-filtering/pom.xml
@@ -49,8 +49,12 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
+ <artifactId>jersey-media-json-processing</artifactId>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
<dependency>
@@ -71,16 +75,6 @@
<mainClass>org.glassfish.jersey.examples.entityfiltering.App</mainClass>
</configuration>
</plugin>
- <!-- TODO remove after jakartification is done -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/EntityFilteringApplication.java b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/EntityFilteringApplication.java
index ae64664..af03d02 100644
--- a/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/EntityFilteringApplication.java
+++ b/examples/entity-filtering/src/main/java/org/glassfish/jersey/examples/entityfiltering/EntityFilteringApplication.java
@@ -12,7 +12,6 @@
import jakarta.ws.rs.ApplicationPath;
-import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.filtering.EntityFilteringFeature;
import org.glassfish.jersey.moxy.json.MoxyJsonConfig;
import org.glassfish.jersey.server.ResourceConfig;
diff --git a/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/ProjectsResourceTest.java b/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/ProjectsResourceTest.java
index 3977a0c..8590d92 100644
--- a/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/ProjectsResourceTest.java
+++ b/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/ProjectsResourceTest.java
@@ -17,7 +17,7 @@
import jakarta.ws.rs.core.GenericType;
import org.glassfish.jersey.examples.entityfiltering.domain.Project;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.filtering.EntityFilteringFeature;
import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
import org.glassfish.jersey.server.ResourceConfig;
@@ -41,7 +41,7 @@
@Parameterized.Parameters(name = "Provider: {0}")
public static Iterable<Class[]> providers() {
- return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}, {JacksonFeature.class}});
+ return Arrays.asList(new Class[][]{{MoxyJsonFeature.class} /*, {JacksonFeature.class} */});
}
public ProjectsResourceTest(final Class<Feature> filteringProvider) {
diff --git a/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/TaskResourceTest.java b/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/TaskResourceTest.java
index cc7d5e5..8cb28bb 100644
--- a/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/TaskResourceTest.java
+++ b/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/TaskResourceTest.java
@@ -17,7 +17,7 @@
import jakarta.ws.rs.core.GenericType;
import org.glassfish.jersey.examples.entityfiltering.domain.Task;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.filtering.EntityFilteringFeature;
import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
import org.glassfish.jersey.server.ResourceConfig;
@@ -41,7 +41,7 @@
@Parameterized.Parameters(name = "Provider: {0}")
public static Iterable<Class[]> providers() {
- return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}, {JacksonFeature.class}});
+ return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}/*, {JacksonFeature.class}*/});
}
public TaskResourceTest(final Class<Feature> filteringProvider) {
diff --git a/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/UsersResourceTest.java b/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/UsersResourceTest.java
index 2fc0adf..c8201da 100644
--- a/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/UsersResourceTest.java
+++ b/examples/entity-filtering/src/test/java/org/glassfish/jersey/examples/entityfiltering/UsersResourceTest.java
@@ -17,7 +17,7 @@
import jakarta.ws.rs.core.GenericType;
import org.glassfish.jersey.examples.entityfiltering.domain.User;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.filtering.EntityFilteringFeature;
import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
import org.glassfish.jersey.server.ResourceConfig;
@@ -41,7 +41,7 @@
@Parameterized.Parameters(name = "Provider: {0}")
public static Iterable<Class[]> providers() {
- return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}, {JacksonFeature.class}});
+ return Arrays.asList(new Class[][]{{MoxyJsonFeature.class}/*, {JacksonFeature.class}*/});
}
public UsersResourceTest(final Class<Feature> filteringProvider) {
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
index 99bc9d3..11727d5 100644
--- a/examples/extended-wadl-webapp/pom.xml
+++ b/examples/extended-wadl-webapp/pom.xml
@@ -132,6 +132,10 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -216,6 +220,9 @@
<configuration>
<forkMode>always</forkMode>
<enableAssertions>false</enableAssertions>
+ <excludes>
+ <exclude>org/glassfish/jersey/examples/extendedwadl/ExtendedWadlWebappOsgiTest.java</exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>
@@ -235,18 +242,6 @@
<profiles>
<profile>
- <id>testsJdk11</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>pre-release</id>
<build>
<plugins>
diff --git a/examples/helloworld-benchmark/pom.xml b/examples/helloworld-benchmark/pom.xml
index f198cda..17bca07 100644
--- a/examples/helloworld-benchmark/pom.xml
+++ b/examples/helloworld-benchmark/pom.xml
@@ -127,14 +127,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <!-- TODO remove after jakartification -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <failOnError>false</failOnError>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/examples/helloworld-cdi2-se/pom.xml b/examples/helloworld-cdi2-se/pom.xml
index 7078f97..683854b 100644
--- a/examples/helloworld-cdi2-se/pom.xml
+++ b/examples/helloworld-cdi2-se/pom.xml
@@ -65,17 +65,6 @@
<mainClass>org.glassfish.jersey.examples.helloworld.cdi2se.App</mainClass>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- TODO remove after jakartification -->
- <configuration>
- <excludes> <!--JDK 11 -->
- <exclude>**/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
-
</plugins>
</build>
@@ -101,7 +90,6 @@
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
- <version>3.1.1.Final</version>
</dependency>
</dependencies>
</profile>
diff --git a/examples/http-patch/pom.xml b/examples/http-patch/pom.xml
index 5121b97..e5f83d0 100644
--- a/examples/http-patch/pom.xml
+++ b/examples/http-patch/pom.xml
@@ -87,16 +87,6 @@
<mainClass>org.glassfish.jersey.examples.httppatch.App</mainClass>
</configuration>
</plugin>
- <plugin>
- <!-- TODO remove after jakartification -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/examples/httppatch/HttpPatchTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/examples/jaxb/pom.xml b/examples/jaxb/pom.xml
index 0b6f65d..5846cf8 100644
--- a/examples/jaxb/pom.xml
+++ b/examples/jaxb/pom.xml
@@ -39,7 +39,11 @@
<artifactId>woodstox-core-asl</artifactId>
<version>4.1.2</version>
</dependency>
-
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-bundle</artifactId>
@@ -62,51 +66,6 @@
<profiles>
<profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build> <!-- TODO remove after jakartification -->
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/examples/jaxb/JaxbTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/examples/jaxb/JaxbTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>pre-release</id>
<build>
<plugins>
diff --git a/examples/jaxb/src/test/java/org/glassfish/jersey/examples/jaxb/JaxbTest.java b/examples/jaxb/src/test/java/org/glassfish/jersey/examples/jaxb/JaxbTest.java
index 3304757..05b07ee 100644
--- a/examples/jaxb/src/test/java/org/glassfish/jersey/examples/jaxb/JaxbTest.java
+++ b/examples/jaxb/src/test/java/org/glassfish/jersey/examples/jaxb/JaxbTest.java
@@ -23,6 +23,7 @@
import org.glassfish.jersey.test.JerseyTest;
import org.glassfish.jersey.test.TestProperties;
+import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -64,6 +65,7 @@
}
@Test
+ @Ignore("Jakartification")
public void testRootElementWithHeader() {
String e1 = target().path("jaxb/XmlRootElement").request().get(String.class);
diff --git a/examples/json-jettison/pom.xml b/examples/json-jettison/pom.xml
index 6ba363c..ec9df05 100644
--- a/examples/json-jettison/pom.xml
+++ b/examples/json-jettison/pom.xml
@@ -41,6 +41,18 @@
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.istack</groupId>
+ <artifactId>istack-commons-runtime</artifactId>
+ <version>${istack.commons.runtime.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-bundle</artifactId>
<type>pom</type>
@@ -62,49 +74,6 @@
<profiles>
<profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sun.istack</groupId>
- <artifactId>istack-commons-runtime</artifactId>
- <version>${istack.commons.runtime.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/examples/jettison/JsonJettisonTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>pre-release</id>
<build>
<plugins>
diff --git a/examples/json-moxy/pom.xml b/examples/json-moxy/pom.xml
index 1f0df6b..64e4477 100644
--- a/examples/json-moxy/pom.xml
+++ b/examples/json-moxy/pom.xml
@@ -39,7 +39,10 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-moxy</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-json-processing</artifactId>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-bundle</artifactId>
diff --git a/examples/json-processing-webapp/pom.xml b/examples/json-processing-webapp/pom.xml
index fe8dc67..34155c0 100644
--- a/examples/json-processing-webapp/pom.xml
+++ b/examples/json-processing-webapp/pom.xml
@@ -19,7 +19,7 @@
<groupId>org.glassfish.jersey.examples</groupId>
<artifactId>webapp-example-parent</artifactId>
<relativePath>../webapp-example-parent/pom.xml</relativePath>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>json-processing-webapp</artifactId>
diff --git a/examples/json-with-padding/pom.xml b/examples/json-with-padding/pom.xml
index 375ac54..cf7c4ed 100644
--- a/examples/json-with-padding/pom.xml
+++ b/examples/json-with-padding/pom.xml
@@ -40,6 +40,10 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-moxy</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-json-processing</artifactId>
+ </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -63,15 +67,6 @@
<mainClass>org.glassfish.jersey.examples.jsonp.App</mainClass>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/examples/jsonp/JsonWithPaddingTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
diff --git a/examples/multipart-webapp/pom.xml b/examples/multipart-webapp/pom.xml
index 5e721b0..156ccb6 100644
--- a/examples/multipart-webapp/pom.xml
+++ b/examples/multipart-webapp/pom.xml
@@ -37,6 +37,11 @@
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
@@ -50,19 +55,6 @@
<profiles>
<profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>pre-release</id>
<build>
<plugins>
@@ -77,25 +69,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/examples/multipart/webapp/MultiPartWebAppTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/examples/oauth-client-twitter/pom.xml b/examples/oauth-client-twitter/pom.xml
index 71c449f..f376247 100644
--- a/examples/oauth-client-twitter/pom.xml
+++ b/examples/oauth-client-twitter/pom.xml
@@ -45,11 +45,11 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <version>${project.version}</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- </dependency>-->
</dependencies>
diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml
index fa3217a..207ea78 100644
--- a/examples/osgi-helloworld-webapp/functional-test/pom.xml
+++ b/examples/osgi-helloworld-webapp/functional-test/pom.xml
@@ -147,6 +147,11 @@
<artifactId>jakarta.xml.bind-api</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>${jakarta.activation.version}</version>
+ </dependency>
<!-- uncomment the following dependency to get ability
to run felix console in the test -->
<!--dependency>
@@ -228,19 +233,6 @@
<profiles>
<profile>
- <id>testsJdk11</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- <version>${jakarta.activation.version}</version>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>release</id>
<!-- do not create source zip bundles -->
<build>
diff --git a/examples/pom.xml b/examples/pom.xml
index 840bced..50a496a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -64,14 +64,14 @@
<module>entity-filtering</module>
<module>entity-filtering-selectable</module>
<module>entity-filtering-security</module>
- <!-- <module>extended-wadl-webapp</module> -->
+<!-- <module>extended-wadl-webapp</module> Jakartification -->
<module>exception-mapping</module>
<!--<module>feed-combiner-java8-webapp</module>-->
<module>freemarker-webapp</module>
<!--<module>flight-mgmt-webapp</module>-->
<module>groovy</module>
<module>helloworld</module>
- <module>helloworld-benchmark</module>
+<!-- <module>helloworld-benchmark</module> Jakartification -->
<module>helloworld-cdi2-se</module>
<module>helloworld-netty</module>
<module>helloworld-programmatic</module>
@@ -89,10 +89,10 @@
<module>jaxrs-types-injection</module>
<module>jersey-ejb</module>
<module>json-binding-webapp</module>
-<!-- <module>json-jackson</module>-->
-<!-- <module>json-jettison</module>-->
+<!-- <module>json-jackson</module> Jakartification-->
+ <module>json-jettison</module>
<module>json-moxy</module>
-<!-- <module>json-processing-webapp</module> JSONP-->
+ <module>json-processing-webapp</module>
<module>json-with-padding</module>
<module>managed-beans-webapp</module>
<module>managed-client</module>
@@ -103,12 +103,12 @@
<module>open-tracing</module>
<module>osgi-helloworld-webapp</module>
<module>osgi-http-service</module>
- <module>oauth-client-twitter</module>
+<!-- <module>oauth-client-twitter</module> Jakartification -->
<!--<module>oauth2-client-google-webapp</module>-->
<module>reload</module>
- <module>rx-client-webapp</module>
+<!-- <module>rx-client-webapp</module> Jakartification-->
<module>server-async</module>
- <module>server-async-managed</module>
+<!-- <module>server-async-managed</module> Jakartification-->
<module>server-async-standalone</module>
<module>server-sent-events-jersey</module>
<module>server-sent-events-jaxrs</module>
@@ -124,12 +124,6 @@
<module>webapp-example-parent</module>
<module>xml-moxy</module>
</modules>
- <profiles>
- <profile>
- <id>exluded_due_to_jakartification</id>
- <modules><module>extended-wadl-webapp</module></modules>
- </profile>
- </profiles>
<dependencyManagement>
<dependencies>
diff --git a/examples/rx-client-webapp/pom.xml b/examples/rx-client-webapp/pom.xml
index d903e6e..165ea80 100644
--- a/examples/rx-client-webapp/pom.xml
+++ b/examples/rx-client-webapp/pom.xml
@@ -48,10 +48,10 @@
<groupId>org.glassfish.jersey.ext.rx</groupId>
<artifactId>jersey-rx-client-rxjava2</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
</dependencies>
<build>
diff --git a/examples/server-async-managed/pom.xml b/examples/server-async-managed/pom.xml
index 4b03ace..4eca746 100644
--- a/examples/server-async-managed/pom.xml
+++ b/examples/server-async-managed/pom.xml
@@ -31,10 +31,10 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-http</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
diff --git a/ext/entity-filtering/pom.xml b/ext/entity-filtering/pom.xml
index 2543c8e..839c256 100644
--- a/ext/entity-filtering/pom.xml
+++ b/ext/entity-filtering/pom.xml
@@ -48,6 +48,12 @@
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-bundle</artifactId>
<version>${project.version}</version>
diff --git a/ext/pom.xml b/ext/pom.xml
index 7fe8970..38f7764 100644
--- a/ext/pom.xml
+++ b/ext/pom.xml
@@ -56,9 +56,7 @@
<module>spring5</module>
-->
<module>wadl-doclet</module>
- <!-- do not release MP modules with Jersey 3.x
<module>microprofile</module>
- -->
</modules>
<dependencies>
diff --git a/ext/proxy-client/pom.xml b/ext/proxy-client/pom.xml
index 8698f58..ae13161 100644
--- a/ext/proxy-client/pom.xml
+++ b/ext/proxy-client/pom.xml
@@ -67,41 +67,10 @@
<type>pom</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- TODO remove after jakartification -->
- <configuration>
- <excludes> <!--JDK 8 -->
- <exclude>org/glassfish/jersey/client/proxy/WebResourceFactoryTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/ext/wadl-doclet/pom.xml b/ext/wadl-doclet/pom.xml
index c53c980..3576770 100644
--- a/ext/wadl-doclet/pom.xml
+++ b/ext/wadl-doclet/pom.xml
@@ -232,6 +232,10 @@
<artifactId>jersey-server</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/incubator/declarative-linking/pom.xml b/incubator/declarative-linking/pom.xml
index a6e4aff7..8794408 100644
--- a/incubator/declarative-linking/pom.xml
+++ b/incubator/declarative-linking/pom.xml
@@ -49,6 +49,11 @@
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>jakarta.el</groupId>
<artifactId>jakarta.el-api</artifactId>
<scope>provided</scope>
@@ -70,10 +75,15 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- <version>${jersey.version}</version>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <version>${jersey.version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/media/jaxb/pom.xml b/media/jaxb/pom.xml
index 4372875..28e897a 100644
--- a/media/jaxb/pom.xml
+++ b/media/jaxb/pom.xml
@@ -144,45 +144,14 @@
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- TODO remove after jakartification -->
- <configuration>
- <excludes> <!--JDK 8 -->
- <exclude>org/glassfish/jersey/jaxb/internal/JaxbStringReaderProviderTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/media/json-binding/pom.xml b/media/json-binding/pom.xml
index b8ea137..11d6eab 100644
--- a/media/json-binding/pom.xml
+++ b/media/json-binding/pom.xml
@@ -70,24 +70,23 @@
</dependency>
<dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.json.bind</groupId>
+ <artifactId>jakarta.json.bind-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
+ <classifier>module</classifier>
</dependency>
- <!-- TODO - remove snapshot dependencies (will need yasson & API release, as there only is 2 month old M1 version -->
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
<exclusions>
- <!-- Remove ancient jakarta.el that causes problems with Hibernate -->
- <exclusion>
- <groupId>jakarta.el</groupId>
- <artifactId>el-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.el</groupId>
- <artifactId>jakarta.el-api</artifactId>
- </exclusion>
<exclusion>
<groupId>jakarta.json.bind</groupId>
<artifactId>jakarta.json.bind-api</artifactId>
@@ -100,18 +99,6 @@
</dependency>
<dependency>
- <groupId>jakarta.json.bind</groupId>
- <artifactId>jakarta.json.bind-api</artifactId>
- <version>${jsonb.api.version}</version>
- </dependency>
-
- <dependency>
- <groupId>jakarta.json</groupId>
- <artifactId>jakarta.json-api</artifactId>
- <version>${jsonp.ri.version}</version>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/media/json-jettison/pom.xml b/media/json-jettison/pom.xml
index 1e085e6..62d2337 100644
--- a/media/json-jettison/pom.xml
+++ b/media/json-jettison/pom.xml
@@ -69,6 +69,7 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
@@ -92,19 +93,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
</project>
diff --git a/media/json-processing/pom.xml b/media/json-processing/pom.xml
index f0a6f88..8a38db1 100644
--- a/media/json-processing/pom.xml
+++ b/media/json-processing/pom.xml
@@ -65,17 +65,6 @@
<unpackBundle>true</unpackBundle>
</configuration>
</plugin>
- <!-- TODO remove after jakartification is done -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/jsonp/JsonProcessingAutoDiscoverableServerTest.java</exclude>
- <exclude>org/glassfish/jersey/jsonp/JsonProcessingAutoDiscoverableClientTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -88,8 +77,13 @@
<!-- JSON-P API + RI + JAX-RS Providers -->
<dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
+ <classifier>module</classifier>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@ -113,5 +107,10 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/media/moxy/pom.xml b/media/moxy/pom.xml
index 364c117..e8abfb6 100644
--- a/media/moxy/pom.xml
+++ b/media/moxy/pom.xml
@@ -95,13 +95,15 @@
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
- <version>${jsonp.ri.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>jakarta.json.bind</groupId>
+ <artifactId>jakarta.json.bind-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
- <version>${jsonp.ri.version}</version>
+ <classifier>module</classifier>
</dependency>
<dependency>
@@ -109,12 +111,8 @@
<artifactId>org.eclipse.persistence.moxy</artifactId>
<exclusions>
<exclusion>
- <groupId>jakarta.json</groupId>
- <artifactId>jakarta.json-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.json</groupId>
- <artifactId>jakarta.json-api</artifactId>
+ <groupId>jakarta.json.bind</groupId>
+ <artifactId>jakarta.json.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -134,20 +132,4 @@
<layout>default</layout>
</repository>
</repositories>
-
- <profiles>
- <profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
diff --git a/media/pom.xml b/media/pom.xml
index 50336fd..9ff8ac7 100644
--- a/media/pom.xml
+++ b/media/pom.xml
@@ -38,7 +38,7 @@
<modules>
<module>jaxb</module>
<module>json-binding</module>
- <module>json-jackson</module>
+<!-- <module>json-jackson</module>-->
<module>json-jettison</module>
<module>json-processing</module>
<module>moxy</module>
diff --git a/pom.xml b/pom.xml
index 1b50dce..922b970 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1808,8 +1808,14 @@
</dependency>
<dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ <version>${jsonp.ri.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
+ <classifier>module</classifier>
<version>${jsonp.ri.version}</version>
</dependency>
<dependency>
diff --git a/security/oauth2-client/pom.xml b/security/oauth2-client/pom.xml
index 4314eeb..81bf9be 100644
--- a/security/oauth2-client/pom.xml
+++ b/security/oauth2-client/pom.xml
@@ -47,9 +47,15 @@
<dependencies>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- <version>${project.version}</version>-->
+<!-- </dependency>-->
+
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
+ <artifactId>jersey-media-json-binding</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/security/oauth2-client/src/main/java/org/glassfish/jersey/client/oauth2/AuthCodeGrantImpl.java b/security/oauth2-client/src/main/java/org/glassfish/jersey/client/oauth2/AuthCodeGrantImpl.java
index 7e6aa76..bed3cee 100644
--- a/security/oauth2-client/src/main/java/org/glassfish/jersey/client/oauth2/AuthCodeGrantImpl.java
+++ b/security/oauth2-client/src/main/java/org/glassfish/jersey/client/oauth2/AuthCodeGrantImpl.java
@@ -47,7 +47,7 @@
import org.glassfish.jersey.client.oauth2.internal.LocalizationMessages;
import org.glassfish.jersey.internal.PropertiesDelegate;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.MessageBodyWorkers;
/**
@@ -233,9 +233,9 @@
if (!config.isRegistered(AuthCodeGrantImpl.DefaultTokenMessageBodyReader.class)) {
client.register(AuthCodeGrantImpl.DefaultTokenMessageBodyReader.class);
}
- if (!config.isRegistered(JacksonFeature.class)) {
- client.register(JacksonFeature.class);
- }
+// if (!config.isRegistered(JacksonFeature.class)) {
+// client.register(JacksonFeature.class);
+// }
return client;
}
diff --git a/tests/e2e-client/pom.xml b/tests/e2e-client/pom.xml
index 6d5140c..57da3ca 100644
--- a/tests/e2e-client/pom.xml
+++ b/tests/e2e-client/pom.xml
@@ -45,18 +45,6 @@
<systemPropertyVariables>
<sun.net.http.allowRestrictedHeaders>true</sun.net.http.allowRestrictedHeaders>
</systemPropertyVariables>
- <excludes>
- <exclude>org/glassfish/jersey/tests/e2e/client/AbortResponseClientTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <exclude>org/glassfish/jersey/tests/e2e/client/AbortResponseClientTest.java</exclude>
- </testExcludes>
</configuration>
</plugin>
</plugins>
@@ -91,24 +79,14 @@
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
+ <artifactId>jersey-media-moxy</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jettison</artifactId>
+ <artifactId>jersey-media-json-processing</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-moxy</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-json-processing</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>
@@ -191,13 +169,16 @@
<artifactId>jersey-test-framework-util</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
@@ -211,39 +192,12 @@
<activation>
<jdk>[11,)</jdk>
</activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
<properties>
<!-- https://bugs.openjdk.java.net/browse/JDK-8211426 -->
<surefire.security.argline>-Djdk.tls.server.protocols=TLSv1.2</surefire.security.argline>
</properties>
</profile>
<profile>
- <id>jdk8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <!-- TODO remove after jakartification -->
- <configuration>
- <excludes> <!--JDK 8 -->
- <exclude>org/glassfish/jersey/tests/e2e/client/BasicClientTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>xdk</id>
<properties>
<!-- do not use security manager for xdk -->
diff --git a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientExecutorTest.java b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientExecutorTest.java
index b5ee965..88dea4b 100644
--- a/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientExecutorTest.java
+++ b/tests/e2e-client/src/test/java/org/glassfish/jersey/tests/e2e/client/ClientExecutorTest.java
@@ -81,7 +81,6 @@
}
@Test
- @Ignore //TODO - remove after jakartification
public void testDefaultExecutorRx() throws InterruptedException {
Client client = ClientBuilder.newClient();
testRx(client, latch);
diff --git a/tests/e2e-entity/pom.xml b/tests/e2e-entity/pom.xml
index decf2cf..06e9075 100644
--- a/tests/e2e-entity/pom.xml
+++ b/tests/e2e-entity/pom.xml
@@ -42,56 +42,34 @@
<reuseForks>false</reuseForks>
<enableAssertions>false</enableAssertions>
<skipTests>${skip.e2e}</skipTests>
- <excludes>
- <exclude>org/glassfish/jersey/tests/e2e/json/AbstractJsonTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/json/JsonTestProvider.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/json/JsonProcessingTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/JsonMoxyTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringClientTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringScopesTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringServerTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringOnPropertiesTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/XmlMoxyTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringOnClassTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEmptyEntityTest.java</exclude>
- </excludes>
</configuration>
- <!-- TODO remove after jakartification -->
- <executions>
- <execution>
- <id>default-test</id> <!-- jakartification-excluded-tests -->
- <configuration>
- <excludes>
- <exclude>org/glassfish/jersey/tests/e2e/entity/MultipartTest.java</exclude>
- <!--JDK 8 -->
- <exclude>org/glassfish/jersey/tests/e2e/entity/CharsetTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/EmptyRequestWithJaxbTest*</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/EntityTypesTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/JAXBContextResolverTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/JAXBContextResolverTest*</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/XXETest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/XmlJaxBElementProviderTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/MoxyEntityFilteringTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
- <exclude>org/glassfish/jersey/tests/e2e/json/*</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/json/**/*</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/JsonMoxyTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringClientTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringScopesTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringServerTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringOnPropertiesTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/XmlMoxyTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEntityFilteringOnClassTest.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/JsonEmptyEntityTest.java</exclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/entity/filtering/domain/*.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/entity/filtering/EntityFilteringClientTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/entity/filtering/EntityFilteringOnClassTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/entity/filtering/EntityFilteringOnPropertiesTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/entity/filtering/EntityFilteringServerTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/entity/filtering/EntityFilteringScopesTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/entity/filtering/json/Json*.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/InheritanceTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/JacksonJsonViewTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/JsonWithoutExceptionMapperTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/JsonEntityFilteringScopesTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/GenericTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/Jersey1199Test.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/PojoTest.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/entity/pojo/*</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/entity/Animal.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/entity/AnimalList.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/entity/AnotherCat.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/entity/Cat.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/entity/Dog.java</testExclude>
+ <testExclude>org/glassfish/jersey/tests/e2e/json/entity/Jersey1199List.java</testExclude>
</testExcludes>
</configuration>
</plugin>
@@ -125,26 +103,26 @@
<artifactId>jersey-mvc-mustache</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <scope>test</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jettison</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-moxy</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-json-processing</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-moxy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-json-processing</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-binding</artifactId>
@@ -235,6 +213,18 @@
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-osgi</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<scope>test</scope>
@@ -243,19 +233,6 @@
<profiles>
<profile>
- <id>jdk11+</id>
- <activation>
- <jdk>[11,)</jdk>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-osgi</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>xdk</id>
<properties>
<!-- do not use security manager for xdk -->
diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/MultipartTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/MultipartTest.java
index 5f23435..8652af4 100644
--- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/MultipartTest.java
+++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/MultipartTest.java
@@ -38,12 +38,14 @@
import jakarta.ws.rs.ext.MessageBodyWriter;
import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.jackson.JacksonFeature;
+//import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.jsonb.JsonBindingFeature;
import org.glassfish.jersey.media.multipart.FormDataBodyPart;
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.FormDataParam;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
@@ -157,13 +159,15 @@
protected Application configure() {
return new ResourceConfig(MultipartResource.class, MessageBodyProvider.class)
.register(MultiPartFeature.class)
- .register(JacksonFeature.class);
+// .register(JacksonFeature.class);
+ .register(JsonBindingFeature.class);
}
@Override
protected void configureClient(final ClientConfig config) {
config.register(MultiPartFeature.class);
- config.register(JacksonFeature.class);
+ //config.register(JacksonFeature.class);
+ config.register(JsonBindingFeature.class);
}
@Test
diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonTestProvider.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonTestProvider.java
index 2db4810..288a2e8 100644
--- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonTestProvider.java
+++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonTestProvider.java
@@ -30,7 +30,7 @@
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;
-import org.glassfish.jersey.jackson.JacksonFeature;
+//import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.jettison.JettisonConfig;
import org.glassfish.jersey.jettison.JettisonFeature;
import org.glassfish.jersey.jsonb.JsonBindingFeature;
@@ -45,7 +45,7 @@
public abstract class JsonTestProvider {
public static final Collection<JsonTestProvider> JAXB_PROVIDERS = new LinkedHashSet<JsonTestProvider>() {{
- add(new JacksonJsonTestProvider());
+// add(new JacksonJsonTestProvider());
add(new JettisonMappedJsonTestProvider());
add(new JettisonBadgerfishJsonTestProvider());
add(new MoxyJsonTestProvider());
@@ -54,13 +54,13 @@
// TODO add MoxyJsonTestProvider once MOXy supports POJO
public static final Collection<JsonTestProvider> POJO_PROVIDERS = new LinkedHashSet<JsonTestProvider>() {{
- add(new JacksonJsonTestProvider());
+// add(new JacksonJsonTestProvider());
}};
private Feature feature;
private JettisonConfig configuration;
private Set<Object> providers = new LinkedHashSet<>();
-/*
+
public static class JettisonMappedJsonTestProvider extends JsonTestProvider {
public JettisonMappedJsonTestProvider() {
@@ -125,7 +125,7 @@
return JsonbBuilder.create(config);
}
}
-
+/*
public static class JacksonJsonTestProvider extends JsonTestProvider {
public JacksonJsonTestProvider() {
@@ -134,11 +134,7 @@
}
- public static class Jackson1JsonTestProvider extends JsonTestProvider {
- public Jackson1JsonTestProvider() {
- setFeature(new Jackson1Feature());
- }
- }
+*/
public static class JsonbTestProvider extends JsonTestProvider {
public JsonbTestProvider() {
@@ -146,7 +142,6 @@
getProviders().add(new JsonbContextResolver());
}
}
- */
public JettisonConfig getConfiguration() {
return configuration;
diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingEncodingFilterTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingEncodingFilterTest.java
index a7fb9a3..f334dd6 100644
--- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingEncodingFilterTest.java
+++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingEncodingFilterTest.java
@@ -24,7 +24,7 @@
import jakarta.ws.rs.core.MultivaluedMap;
import jakarta.ws.rs.core.Response;
-import org.glassfish.jersey.jackson.JacksonFeature;
+//import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.message.DeflateEncoder;
import org.glassfish.jersey.message.GZipEncoder;
import org.glassfish.jersey.server.JSONP;
@@ -50,7 +50,7 @@
protected ResourceConfig configure() {
enable(TestProperties.LOG_TRAFFIC);
return new ResourceConfig(MyResource.class)
- .register(JacksonFeature.class)
+// .register(JacksonFeature.class)
.register(EncodingFilter.class)
.register(GZipEncoder.class)
.register(DeflateEncoder.class);
diff --git a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingTest.java b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingTest.java
index 97aaf33..1a5d5e4 100644
--- a/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingTest.java
+++ b/tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/JsonWithPaddingTest.java
@@ -30,7 +30,7 @@
import jakarta.xml.bind.annotation.XmlRootElement;
import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
import org.glassfish.jersey.server.JSONP;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
@@ -176,9 +176,9 @@
final Response response = target("jsonp").path("PureJson").request("application/x-javascript").get();
// Method is invoked but we do not have a MBW for application/x-javascript.
- if (jsonTestProvider.getFeature().getClass() == JacksonFeature.class) {
+ /* if (jsonTestProvider.getFeature().getClass() == JacksonFeature.class) {
assertThat(response.getStatus(), equalTo(200));
- } else {
+ } else */ {
assertThat(response.getStatus(), equalTo(500));
}
}
diff --git a/tests/e2e-server/pom.xml b/tests/e2e-server/pom.xml
index 2ad6cfa..95d4a0a 100644
--- a/tests/e2e-server/pom.xml
+++ b/tests/e2e-server/pom.xml
@@ -108,26 +108,26 @@
<artifactId>jersey-mvc-mustache</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <scope>test</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jettison</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-moxy</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-json-processing</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-moxy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-json-processing</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>
diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/BeanParamExceptionTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/BeanParamExceptionTest.java
index a801822..ef4e519 100644
--- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/BeanParamExceptionTest.java
+++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/BeanParamExceptionTest.java
@@ -19,6 +19,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
+import jakarta.json.bind.annotation.JsonbProperty;
import jakarta.ws.rs.BeanParam;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
@@ -32,7 +33,7 @@
import jakarta.ws.rs.ext.ParamConverterProvider;
import jakarta.ws.rs.ext.Provider;
-import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+// import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import org.glassfish.jersey.server.ParamException;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
@@ -40,7 +41,7 @@
import org.junit.Test;
import static org.junit.Assert.assertEquals;
-import com.fasterxml.jackson.annotation.JsonProperty;
+// import com.fasterxml.jackson.annotation.JsonProperty;
/**
* Tests the ability to catch WebApplicationException thrown in ParamConverter
@@ -57,8 +58,8 @@
return new ResourceConfig(
BeanParamController.class,
ModelObjectParamConverter.class,
- QueryParamErrorMapper.class,
- JacksonJaxbJsonProvider.class);
+ QueryParamErrorMapper.class/*,
+ JacksonJaxbJsonProvider.class*/);
}
@Path("/")
@@ -198,12 +199,14 @@
this.status = status;
}
- @JsonProperty
+ // @JsonProperty
+ @JsonbProperty
public String getMessage() {
return message;
}
- @JsonProperty
+ // @JsonProperty
+ @JsonbProperty
public int getStatus() {
return status;
}
diff --git a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/EntityInheritanceValidationTest.java b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/EntityInheritanceValidationTest.java
index 484243a..606cb99 100644
--- a/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/EntityInheritanceValidationTest.java
+++ b/tests/e2e-server/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/EntityInheritanceValidationTest.java
@@ -28,7 +28,8 @@
import jakarta.validation.constraints.NotNull;
import org.glassfish.jersey.client.ClientConfig;
-import org.glassfish.jersey.jackson.JacksonFeature;
+// import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.jsonb.JsonBindingFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
@@ -154,12 +155,14 @@
@Override
protected Application configure() {
return new ResourceConfig(Resource.class)
- .register(JacksonFeature.class);
+ // .register(JacksonFeature.class);
+ .register(JsonBindingFeature.class);
}
@Override
protected void configureClient(final ClientConfig config) {
- config.register(JacksonFeature.class);
+ // config.register(JacksonFeature.class);
+ config.register(JsonBindingFeature.class);
}
@Test
diff --git a/tests/e2e/pom.xml b/tests/e2e/pom.xml
index aa12387..3089c83 100644
--- a/tests/e2e/pom.xml
+++ b/tests/e2e/pom.xml
@@ -43,23 +43,11 @@
<enableAssertions>false</enableAssertions>
<skipTests>${skip.e2e}</skipTests>
<excludes>
- <exclude>org/glassfish/jersey/tests/e2e/oauth/OAuth2Test.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/common/NoEntityTest.java</exclude>
<!--TODO remove after jakartification-->
<exclude>org/glassfish/jersey/tests/e2e/server/wadl/NoJAXBNoWadlTest.java</exclude>
</excludes>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <testExcludes>
- <exclude>org/glassfish/jersey/tests/e2e/oauth/OAuth2Test.java</exclude>
- <exclude>org/glassfish/jersey/tests/e2e/common/NoEntityTest.java</exclude>
- </testExcludes>
- </configuration>
- </plugin>
</plugins>
</build>
@@ -95,26 +83,21 @@
<artifactId>jersey-mvc-mustache</artifactId>
<scope>test</scope>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
+ <artifactId>jersey-media-moxy</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jettison</artifactId>
+ <artifactId>jersey-media-json-processing</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-moxy</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-json-processing</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>
diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/common/MessageBodyWorkerInheritanceTest.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/common/MessageBodyWorkerInheritanceTest.java
index 85fb558..e5bc65a 100644
--- a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/common/MessageBodyWorkerInheritanceTest.java
+++ b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/common/MessageBodyWorkerInheritanceTest.java
@@ -37,7 +37,7 @@
import jakarta.ws.rs.ext.MessageBodyWriter;
import jakarta.ws.rs.ext.Provider;
-import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
@@ -47,7 +47,7 @@
/**
* Test-case for JERSEY-1481.
*
- * {@link JacksonFeature Jackson provider} should not take precedence over our
+ * {@link MoxyJsonFeature Moxy provider} should not take precedence over our
* custom provider.
*
* @author Michal Gajdos
@@ -182,7 +182,7 @@
return new ResourceConfig(Resource.class)
.register(GenericModelWriter.class)
.register(ModelReader.class)
- .register(JacksonFeature.class);
+ .register(MoxyJsonFeature.class);
}
@Test
diff --git a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/NoJAXBNoWadlTest.java b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/NoJAXBNoWadlTest.java
index 85ac3bd..164faf5 100644
--- a/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/NoJAXBNoWadlTest.java
+++ b/tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/wadl/NoJAXBNoWadlTest.java
@@ -70,7 +70,7 @@
final boolean shouldHaveJaxb = JdkVersion.getJdkVersion().getMajor() == 1;
// Make sure the test does not have JAX-B on a classpath
- Assert.assertFalse(ServiceFinder.find("javax.xml.bind.JAXBContext").iterator().hasNext());
+ Assert.assertFalse(ServiceFinder.find("jakarta.xml.bind.JAXBContext").iterator().hasNext());
try (Response r = target("dummy").request(MediaTypes.WADL_TYPE).options()) {
String headers = r.getHeaderString(HttpHeaders.ALLOW);
diff --git a/tests/integration/jersey-1964/pom.xml b/tests/integration/jersey-1964/pom.xml
index d85e039..ad1026d 100644
--- a/tests/integration/jersey-1964/pom.xml
+++ b/tests/integration/jersey-1964/pom.xml
@@ -38,10 +38,6 @@
<artifactId>jersey-container-servlet-core</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-metainf-services</artifactId>
</dependency>
diff --git a/tests/integration/jersey-2164/pom.xml b/tests/integration/jersey-2164/pom.xml
index 60b6f9e..2eed430 100644
--- a/tests/integration/jersey-2164/pom.xml
+++ b/tests/integration/jersey-2164/pom.xml
@@ -37,10 +37,6 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/tests/integration/jersey-2322/pom.xml b/tests/integration/jersey-2322/pom.xml
index 991205f..82bb0e0 100644
--- a/tests/integration/jersey-2322/pom.xml
+++ b/tests/integration/jersey-2322/pom.xml
@@ -37,10 +37,10 @@
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-metainf-services</artifactId>
@@ -58,6 +58,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ <testExcludes>
+ <testExclude>**/*</testExclude>
+ </testExcludes>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/tests/integration/jersey-2673/pom.xml b/tests/integration/jersey-2673/pom.xml
index e4fad93..7822fff 100644
--- a/tests/integration/jersey-2673/pom.xml
+++ b/tests/integration/jersey-2673/pom.xml
@@ -40,10 +40,10 @@
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
@@ -57,6 +57,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ <testExcludes>
+ <testExclude>**/*</testExclude>
+ </testExcludes>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/tests/integration/jersey-2689/pom.xml b/tests/integration/jersey-2689/pom.xml
index 961ec18..6b1e1c1 100644
--- a/tests/integration/jersey-2689/pom.xml
+++ b/tests/integration/jersey-2689/pom.xml
@@ -68,10 +68,10 @@
<artifactId>jersey-test-framework-provider-external</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
</dependencies>
<build>
@@ -79,6 +79,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/glassfish/jersey/tests/integration/jersey2689/Jersey2689.java</exclude>
+ </excludes>
+ <testExcludes>
+ <testExclude>org/glassfish/jersey/tests/integration/jersey2689/*.java</testExclude>
+ </testExcludes>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/tests/integration/jersey-2892/pom.xml b/tests/integration/jersey-2892/pom.xml
index cbb0b94..ca4b58d 100644
--- a/tests/integration/jersey-2892/pom.xml
+++ b/tests/integration/jersey-2892/pom.xml
@@ -53,10 +53,6 @@
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-moxy</artifactId>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/tests/integration/jersey-3796/pom.xml b/tests/integration/jersey-3796/pom.xml
index ccfc136..a6cfec6 100644
--- a/tests/integration/jersey-3796/pom.xml
+++ b/tests/integration/jersey-3796/pom.xml
@@ -41,11 +41,6 @@
</dependency>
<dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-external</artifactId>
<scope>test</scope>
diff --git a/tests/integration/pom.xml b/tests/integration/pom.xml
index ea6d13c..e1389e4 100644
--- a/tests/integration/pom.xml
+++ b/tests/integration/pom.xml
@@ -63,15 +63,15 @@
<module>jersey-2176</module>
<module>jersey-2184</module>
<module>jersey-2255</module>
- <module>jersey-2322</module>
+<!-- <module>jersey-2322</module> Jakartification-->
<module>jersey-2335</module>
<module>jersey-2421</module>
<module>jersey-2551</module>
<module>jersey-2612</module>
<module>jersey-2637</module>
<module>jersey-2654</module>
- <module>jersey-2673</module>
- <module>jersey-2689</module>
+<!-- <module>jersey-2673</module> Jakartification-->
+<!-- <module>jersey-2689</module> Jakartification-->
<module>jersey-2704</module>
<module>jersey-2776</module>
<module>jersey-2794</module>
@@ -88,7 +88,7 @@
<module>jersey-4507</module>
<module>jersey-4542</module>
<module>jetty-response-close</module>
-<!-- <module>microprofile</module> --> <!--TODO remove when Jakartified -->
+ <module>microprofile</module>
<module>property-check</module>
<module>security-digest</module>
<module>servlet-2.5-autodiscovery-1</module>
diff --git a/tests/integration/servlet-2.5-mvc-1/pom.xml b/tests/integration/servlet-2.5-mvc-1/pom.xml
index 7f7f710..dd816ab 100644
--- a/tests/integration/servlet-2.5-mvc-1/pom.xml
+++ b/tests/integration/servlet-2.5-mvc-1/pom.xml
@@ -47,6 +47,10 @@
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet2.version}</version>
diff --git a/tests/integration/servlet-2.5-mvc-2/pom.xml b/tests/integration/servlet-2.5-mvc-2/pom.xml
index 1f04c0e..d60bd05 100644
--- a/tests/integration/servlet-2.5-mvc-2/pom.xml
+++ b/tests/integration/servlet-2.5-mvc-2/pom.xml
@@ -47,6 +47,10 @@
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet2.version}</version>
diff --git a/tests/integration/servlet-2.5-mvc-3/pom.xml b/tests/integration/servlet-2.5-mvc-3/pom.xml
index 7e51d71..ef34c2a 100644
--- a/tests/integration/servlet-2.5-mvc-3/pom.xml
+++ b/tests/integration/servlet-2.5-mvc-3/pom.xml
@@ -47,6 +47,10 @@
</dependency>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet2.version}</version>
diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml
index 108e356..e73cebd 100644
--- a/tests/osgi/functional/pom.xml
+++ b/tests/osgi/functional/pom.xml
@@ -48,8 +48,7 @@
</goals>
<configuration>
<testExcludes>
- <exclude>org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java</exclude>
- <exclude>org/glassfish/jersey/osgi/test/basic/JsonProcessingTest.java</exclude>
+ <exclude>org/glassfish/jersey/osgi/test/basic/JsonJacksonTest.java</exclude>
</testExcludes>
</configuration>
</execution>
@@ -199,26 +198,26 @@
<version>${httpclient.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- <scope>test</scope>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- <scope>test</scope>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jettison</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-moxy</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
-<!-- <dependency>-->
-<!-- <groupId>org.glassfish.jersey.media</groupId>-->
-<!-- <artifactId>jersey-media-json-processing</artifactId>-->
-<!-- <scope>test</scope>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-moxy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.media</groupId>
+ <artifactId>jersey-media-json-processing</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.ext</groupId>
<artifactId>jersey-bean-validation</artifactId>
@@ -295,8 +294,13 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>jakarta.json</groupId>
+ <artifactId>jakarta.json-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
+ <classifier>module</classifier>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/tests/performance/benchmarks/pom.xml b/tests/performance/benchmarks/pom.xml
index d325f09..51a293c 100644
--- a/tests/performance/benchmarks/pom.xml
+++ b/tests/performance/benchmarks/pom.xml
@@ -34,15 +34,22 @@
<dependencies>
<dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
<version>${project.version}</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
<dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
+ <groupId>org.glassfish.jersey.ext</groupId>
+ <artifactId>jersey-entity-filtering</artifactId>
</dependency>
-
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-grizzly2-http</artifactId>
@@ -144,6 +151,38 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default-compile</id>
+ <configuration>
+ <excludes>
+ <exclude>org/glassfish/jersey/tests/performance/benchmark/entity/json/JacksonApplication.java</exclude>
+ <exclude>org/glassfish/jersey/tests/performance/benchmark/JacksonBenchmark.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>base-compile</id>
+ <configuration>
+ <excludes>
+ <exclude>org/glassfish/jersey/tests/performance/benchmark/entity/json/JacksonApplication.java</exclude>
+ <exclude>org/glassfish/jersey/tests/performance/benchmark/JacksonBenchmark.java</exclude>
+ </excludes>
+ <testExcludes>
+ <testExclude>org/glassfish/jersey/tests/performance/benchmark/server/JacksonTest.java</testExclude>
+ </testExcludes>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <testExcludes>
+ <testExclude>org/glassfish/jersey/tests/performance/benchmark/server/JacksonTest.java</testExclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
diff --git a/tests/performance/benchmarks/src/main/java/org/glassfish/jersey/tests/performance/benchmark/AllBenchmarks.java b/tests/performance/benchmarks/src/main/java/org/glassfish/jersey/tests/performance/benchmark/AllBenchmarks.java
index badc3ee..af66d45 100644
--- a/tests/performance/benchmarks/src/main/java/org/glassfish/jersey/tests/performance/benchmark/AllBenchmarks.java
+++ b/tests/performance/benchmarks/src/main/java/org/glassfish/jersey/tests/performance/benchmark/AllBenchmarks.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -33,7 +33,7 @@
final Options opt = new OptionsBuilder()
// Register our benchmarks.
.include(ClientBenchmark.class.getSimpleName())
- .include(JacksonBenchmark.class.getSimpleName())
+// .include(JacksonBenchmark.class.getSimpleName())
.include(LocatorBenchmark.class.getSimpleName())
.include(JerseyUriBuilderBenchmark.class.getSimpleName())
// Measure throughput in seconds (ops/s).
diff --git a/tests/performance/test-cases/mbw-json-jackson/pom.xml b/tests/performance/test-cases/mbw-json-jackson/pom.xml
index fbaa878..ca96894 100644
--- a/tests/performance/test-cases/mbw-json-jackson/pom.xml
+++ b/tests/performance/test-cases/mbw-json-jackson/pom.xml
@@ -48,10 +48,10 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.glassfish.jersey.media</groupId>
- <artifactId>jersey-media-json-jackson</artifactId>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.glassfish.jersey.media</groupId>-->
+<!-- <artifactId>jersey-media-json-jackson</artifactId>-->
+<!-- </dependency>-->
</dependencies>
<build>
@@ -70,6 +70,18 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ <testExcludes>
+ <testExclude>**/*</testExclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/tests/performance/test-cases/mbw-json-moxy/pom.xml b/tests/performance/test-cases/mbw-json-moxy/pom.xml
index 03fa7f9..32f4d40 100644
--- a/tests/performance/test-cases/mbw-json-moxy/pom.xml
+++ b/tests/performance/test-cases/mbw-json-moxy/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>json-moxy</artifactId>
diff --git a/tests/performance/test-cases/mbw-xml-moxy/pom.xml b/tests/performance/test-cases/mbw-xml-moxy/pom.xml
index 0e6909a..5801e15 100644
--- a/tests/performance/test-cases/mbw-xml-moxy/pom.xml
+++ b/tests/performance/test-cases/mbw-xml-moxy/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.glassfish.jersey.tests.performance.testcases</groupId>
<artifactId>project</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
<artifactId>xml-moxy</artifactId>
diff --git a/tests/performance/test-cases/pom.xml b/tests/performance/test-cases/pom.xml
index 61c16a5..aacfb52 100644
--- a/tests/performance/test-cases/pom.xml
+++ b/tests/performance/test-cases/pom.xml
@@ -44,12 +44,12 @@
<module>interceptor-global</module>
<module>interceptor-name</module>
<module>mbw-custom-provider</module>
- <module>mbw-json-jackson</module>
-<!-- <module>mbw-json-moxy</module>-->
+<!-- <module>mbw-json-jackson</module>-->
+ <module>mbw-json-moxy</module>
<module>mbw-kryo</module>
<module>mbw-text-plain</module>
<module>mbw-xml-jaxb</module>
-<!-- <module>mbw-xml-moxy</module>-->
+ <module>mbw-xml-moxy</module>
<module>param-srl</module>
<module>proxy-injection</module>
</modules>
