Adopt Jackson 2.11.3

Signed-off-by: Jan Supol <jan.supol@oracle.com>
tvallin · Oct 30, 2020 · c1263e0 · c1263e0
1 parent bdf6c38
commit c1263e0
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/media/json-jackson/pom.xml b/media/json-jackson/pom.xml
@@ -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>

diff --git a/...n/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/cfg/JaxRSFeature.java b/...n/src/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/cfg/JaxRSFeature.java
@@ -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

diff --git a/...rc/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/PackageVersion.java b/...rc/main/java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/json/PackageVersion.java
@@ -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() {

diff --git a/...java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/util/EndpointAsBeanProperty.java b/...java/org/glassfish/jersey/jackson/internal/jackson/jaxrs/util/EndpointAsBeanProperty.java
@@ -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();

diff --git a/pom.xml b/pom.xml
@@ -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>