Skip to content
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

Jump to bottom

Adopt Jackson 2.11.3 #4612

Merged
merged 1 commit into from
Oct 30, 2020
Merged

Adopt Jackson 2.11.3 #4612

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
2 changes: 1 addition & 1 deletion media/json-jackson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jdk8</artifactId>
<version>2.11.0</version>
<version>${jackson.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion ...n/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/cfg/JaxRSFeature.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public enum JaxRSFeature implements ConfigFeature

/**
* Feature that may be enabled to force dynamic lookup of <code>ObjectMapper</code>
* via JAX-RS Provider interface, regardless of whether <code>MapperConfigurator<code>
* via JAX-RS Provider interface, regardless of whether <code>MapperConfigurator</code>
* has explicitly configured mapper or not; if disabled, static configuration will
* take precedence.
* Note that if this feature is enabled, it typically makes sense to also disable
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/PackageVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*/
public final class PackageVersion implements Versioned {
public final static Version VERSION = VersionUtil.parseVersion(
"2.10.1", "com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider");
"2.11.3", "com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider");

@Override
public Version version() {
Expand Down
1 change: 1 addition & 0 deletions ...java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/util/EndpointAsBeanProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class EndpointAsBeanProperty
extends BeanProperty.Std
{
private static final long serialVersionUID = 1L;

public final static PropertyName ENDPOINT_NAME = new PropertyName("JAX-RS/endpoint");

private final static AnnotationMap NO_ANNOTATIONS = new AnnotationMap();
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 @@ -2100,7 +2100,7 @@
<hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[2.5,4)"</hk2.jvnet.osgi.version>
<hk2.config.version>5.1.0</hk2.config.version>
<httpclient.version>4.5.9</httpclient.version>
<jackson.version>2.10.1</jackson.version>
<jackson.version>2.11.3</jackson.version>
<jackson1.version>1.9.13</jackson1.version>
<javassist.version>3.25.0-GA</javassist.version>
<jboss.logging.version>3.3.0.Final</jboss.logging.version>
Expand Down