Skip to content

Fix Jackson module #4597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
senivam merged 1 commit into from
Oct 9, 2020
Merged

Fix Jackson module #4597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,11 @@
<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>
Expand Down
30 changes: 6 additions & 24 deletions examples/json-jackson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,17 @@
<type>pom</type>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.glassfish.jersey.test-framework</groupId>
<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>
</dependencies>

<build>
Expand All @@ -63,33 +68,10 @@
<mainClass>org.glassfish.jersey.examples.jackson.App</mainClass>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- TODO remove after jakartification -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/examples/jackson/JacksonTest.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>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>pre-release</id>
<build>
Expand Down
3 changes: 2 additions & 1 deletion ...n-jackson/src/main/java/org/glassfish/jersey/examples/jackson/CombinedAnnotationBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

package org.glassfish.jersey.examples.jackson;

import jakarta.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlRootElement;

import com.fasterxml.jackson.annotation.JsonProperty;

Expand All @@ -19,6 +19,7 @@
*
* @author Jakub Podlesak
*/
// Jackson works with javax API, do not change it to jakarta API.
@XmlRootElement(name = "account")
public class CombinedAnnotationBean {

Expand Down
27 changes: 10 additions & 17 deletions examples/oauth-client-twitter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,16 @@
<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>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>
</dependencies>


Expand All @@ -66,18 +71,6 @@
</build>

<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>
<profile>
<id>pre-release</id>
<build>
Expand Down
6 changes: 3 additions & 3 deletions examples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<module>jaxrs-types-injection</module>
<module>jersey-ejb</module>
<module>json-binding-webapp</module>
<!-- <module>json-jackson</module> Jakartification-->
<module>json-jackson</module>
<module>json-jettison</module>
<module>json-moxy</module>
<module>json-processing-webapp</module>
Expand All @@ -106,9 +106,9 @@
<!-- <module>oauth-client-twitter</module> Jakartification -->
<!--<module>oauth2-client-google-webapp</module>-->
<module>reload</module>
<!-- <module>rx-client-webapp</module> Jakartification-->
<module>rx-client-webapp</module>
<module>server-async</module>
<!-- <module>server-async-managed</module> Jakartification-->
<module>server-async-managed</module>
<module>server-async-standalone</module>
<module>server-sent-events-jersey</module>
<module>server-sent-events-jaxrs</module>
Expand Down
18 changes: 4 additions & 14 deletions examples/rx-client-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -77,16 +77,6 @@
<war>${project.build.directory}/${project.build.finalName}.war</war>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- TODO remove after jakartification -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/examples/rx/RxClientsTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
18 changes: 4 additions & 14 deletions examples/server-async-managed/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -56,16 +56,6 @@
<mainClass>org.glassfish.jersey.examples.server.async.managed.App</mainClass>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- TODO remove after jakartification -->
<configuration>
<excludes>
<exclude>org/glassfish/jersey/examples/server/async/managed/ManagedAsyncResourceTest.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
24 changes: 12 additions & 12 deletions media/json-jackson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,6 @@
<unpackBundle>true</unpackBundle>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<!-- TODO remove after jakartification -->
<configuration>
<excludes> <!--JDK 11 -->
<exclude>org/glassfish/jersey/jackson/internal/DefaultJacksonJaxbJsonProviderTest.java</exclude>
</excludes>
</configuration>
</plugin>

</plugins>
</build>

Expand Down Expand Up @@ -128,7 +117,13 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
</dependency>

<dependency>
<!-- The last JAX-B API that has maven coordinates which do not colide with Jakarta coordinates -->
<!-- Do not update -->
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand All @@ -140,6 +135,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
Expand Down
4 changes: 1 addition & 3 deletions media/json-jackson/src/main/java/org/glassfish/jersey/jackson/JacksonFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,7 @@ public boolean configure(final FeatureContext context) {
context.register(JacksonFilteringFeature.class);
context.register(FilteringJacksonJaxbJsonProvider.class, MessageBodyReader.class, MessageBodyWriter.class);
} else {
//context.register(DefaultJacksonJaxbJsonProvider.class, MessageBodyReader.class, MessageBodyWriter.class);
// TODO: remove after jakartification
context.register(JacksonJaxbJsonProvider.class, MessageBodyReader.class, MessageBodyWriter.class);
context.register(DefaultJacksonJaxbJsonProvider.class, MessageBodyReader.class, MessageBodyWriter.class);
}
}

Expand Down
2 changes: 1 addition & 1 deletion media/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2152,7 +2152,7 @@
<yasson.version>2.0.0</yasson.version>
<!-- END of Jakartified -->

<javax.annotation.version>1.3.5</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->
<javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->

<jetty.plugin.version>6.1.26</jetty.plugin.version>
<jetty.version>11.0.0.beta2</jetty.version>
Expand Down
39 changes: 5 additions & 34 deletions tests/e2e-entity/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,35 +44,6 @@
<skipTests>${skip.e2e}</skipTests>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<testExcludes>
<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>
</plugins>
</build>

Expand Down Expand Up @@ -103,11 +74,11 @@
<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>
Expand Down
7 changes: 0 additions & 7 deletions tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Animal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,6 @@
* @author Jakub Podlesak
* @author Michal Gajdos
*/
// Jackson 1
@org.codehaus.jackson.annotate.JsonTypeInfo(
use = org.codehaus.jackson.annotate.JsonTypeInfo.Id.NAME,
include = org.codehaus.jackson.annotate.JsonTypeInfo.As.PROPERTY)
@org.codehaus.jackson.annotate.JsonSubTypes({
@org.codehaus.jackson.annotate.JsonSubTypes.Type(value = Cat.class),
@org.codehaus.jackson.annotate.JsonSubTypes.Type(value = Dog.class) })
// Jackson 2
@com.fasterxml.jackson.annotation.JsonTypeInfo(
use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME,
Expand Down
7 changes: 0 additions & 7 deletions ...s/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/Jersey1199List.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,6 @@ public Jersey1199List(final Object[] objects) {
this.total = objects.length;
}

// Jackson 1
@org.codehaus.jackson.annotate.JsonTypeInfo(
use = org.codehaus.jackson.annotate.JsonTypeInfo.Id.NAME,
include = org.codehaus.jackson.annotate.JsonTypeInfo.As.PROPERTY)
@org.codehaus.jackson.annotate.JsonSubTypes({
@org.codehaus.jackson.annotate.JsonSubTypes.Type(value = ColorHolder.class)
})
// Jackson 2
@com.fasterxml.jackson.annotation.JsonTypeInfo(
use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME,
Expand Down
9 changes: 1 addition & 8 deletions .../e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/json/entity/pojo/PojoAnimal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 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
Expand All @@ -20,13 +20,6 @@
* @author Jakub Podlesak
* @author Michal Gajdos
*/
// Jackson 1
@org.codehaus.jackson.annotate.JsonTypeInfo(
use = org.codehaus.jackson.annotate.JsonTypeInfo.Id.NAME,
include = org.codehaus.jackson.annotate.JsonTypeInfo.As.PROPERTY)
@org.codehaus.jackson.annotate.JsonSubTypes({
@org.codehaus.jackson.annotate.JsonSubTypes.Type(value = PojoCat.class),
@org.codehaus.jackson.annotate.JsonSubTypes.Type(value = PojoDog.class) })
// Jackson 2
@com.fasterxml.jackson.annotation.JsonTypeInfo(
use = com.fasterxml.jackson.annotation.JsonTypeInfo.Id.NAME,
Expand Down
Loading