Merge branch '2.18' into issue388

Author: cowtowncoder

.github/workflows/dep_build_v2.yml

@@ -0,0 +1,32 @@
+name: Re-build on jackson-databind v2 push
+on:
+  repository_dispatch:
+    types: [jackson-databind-pushed]
+  # just for testing
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    # Do we want wide matrix build? For now, limited
+    runs-on: 'ubuntu-22.04'
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: ['8', '17', '21']
+    env:
+      JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+    steps:
+    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+    - name: Set up JDK
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java_version }}
+        cache: 'maven'
+    - name: Build and test
+      run: ./mvnw -B -ff -ntp clean verify
+
+# No recursive rebuild (yet?)

.github/workflows/dep_build_v3.yml

@@ -0,0 +1,34 @@
+name: Re-build on jackson-databind v3 push
+on:
+  repository_dispatch:
+    types: [jackson-databind-pushed-v3]
+  # just for testing
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    # Do we want wide matrix build? For now, limited
+    runs-on: 'ubuntu-22.04'
+    strategy:
+      fail-fast: false
+      matrix:
+        java_version: ['8', '17', '21']
+    env:
+      JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
+    steps:
+    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      with:
+        ref: master
+    - name: Set up JDK
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      with:
+        distribution: 'temurin'
+        java-version: ${{ matrix.java_version }}
+        cache: 'maven'
+    - name: Build and test
+      run: ./mvnw -B -ff -ntp clean verify
+
+# No recursive rebuild (yet?)

.github/workflows/main.yml

@@ -4,15 +4,15 @@ on:
     branches:
     - master
     - "3.0"
-    - "2.16"
+    - "2.18"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
     branches:
     - master
     - "3.0"
-    - "2.16"
+    - "2.18"
     paths-ignore:
     - "README.md"
     - "release-notes/*"
@@ -32,7 +32,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
@@ -60,7 +60,7 @@ jobs:
       run: ./mvnw -B -q -ff -ntp test
     - name: Publish code coverage
       if: github.event_name != 'pull_request' && matrix.java_version == '8'
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
       with:
         token: ${{ secrets.CODECOV_TOKEN }}
         file: ./target/site/jacoco/jacoco.xml

avro/README.md

@@ -23,7 +23,7 @@ To use this extension on Maven-based projects, use following dependency:
 <dependency>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformat-avro</artifactId>
-    <version>2.8.5</version>
+    <version>2.16.0</version>
 </dependency>
 ```
 
@@ -114,7 +114,7 @@ and that's about it, for now.
 
 ## Avro Logical Types
 
-Following is an extract from [Logical Types](http://avro.apache.org/docs/current/spec.html#Logical+Types) paragraph in 
+Following is an extract from [Logical Types](http://avro.apache.org/docs/current/specification/_print/#logical-types) paragraph in 
 Avro schema specification:
 > A logical type is an Avro primitive or complex type with extra attributes to represent a derived type. The attribute 
 > `logicalType` is always be present for a logical type, and is a string with the name of one of the logical types 

avro/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.16.3-SNAPSHOT</version>
+    <version>2.18.3-SNAPSHOT</version>
   </parent>
   <artifactId>jackson-dataformat-avro</artifactId>
   <name>Jackson dataformat: Avro</name>
@@ -47,23 +47,20 @@ abstractions.
     <dependency>
       <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.8.2</version>
+      <version>1.11.3</version>
     </dependency>
 
     <!-- and for testing we need logback -->
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.13</version>
+      <version>1.3.14</version>
       <scope>test</scope>
     </dependency>
     <!-- For validating more complex comparisons -->
-    <!-- 27-Feb-2017, tatu: NOTE! Can NOT use 3.x as it requires Java 8 
-      -->
     <dependency>
       <groupId>org.assertj</groupId>
       <artifactId>assertj-core</artifactId>
-      <version>2.5.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroParser.java

@@ -250,19 +250,25 @@ public Object getTypeId() throws IOException {
      */
 
     @Override
-    public JsonLocation getTokenLocation()
-    {
+    public JsonLocation currentLocation() {
         // !!! TODO
         return null;
     }
 
     @Override
-    public JsonLocation getCurrentLocation()
-    {
+    public JsonLocation currentTokenLocation() {
         // !!! TODO
         return null;
     }
 
+    @Deprecated // since 2.17
+    @Override
+    public JsonLocation getCurrentLocation() { return currentLocation(); }
+
+    @Deprecated // since 2.17
+    @Override
+    public JsonLocation getTokenLocation() { return currentTokenLocation(); }
+
     /*
     /**********************************************************
     /* Parsing
@@ -278,17 +284,8 @@ public JsonLocation getCurrentLocation()
     /**********************************************************
      */
 
-    @Override
-    public abstract boolean hasTextCharacters();
-
-    @Override
-    public abstract String getText() throws IOException;
-
-    @Override
-    public abstract int getText(Writer writer) throws IOException;
-
-    @Override
-    public String getCurrentName() throws IOException {
+    @Override // since 2.17
+    public String currentName() throws IOException {
         return _avroContext.getCurrentName();
     }
 
@@ -300,16 +297,28 @@ public void overrideCurrentName(String name)
         if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
             ctxt = ctxt.getParent();
         }
-        /* 24-Sep-2013, tatu: Unfortunate, but since we did not expose exceptions,
-         *   need to wrap this here
-         */
+        // 24-Sep-2013, tatu: Unfortunate, but since we did not expose exceptions,
+        //   need to wrap this here
         try {
             ctxt.setCurrentName(name);
         } catch (IOException e) {
             throw new IllegalStateException(e);
         }
     }
 
+    @Deprecated // since 2.17
+    @Override
+    public String getCurrentName() throws IOException { return currentName(); }
+
+    @Override
+    public abstract boolean hasTextCharacters();
+
+    @Override
+    public abstract String getText() throws IOException;
+
+    @Override
+    public abstract int getText(Writer writer) throws IOException;
+
     @Override
     public char[] getTextCharacters() throws IOException {
         String text = getText();

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroSerializerModifier.java

@@ -19,6 +19,8 @@
 public class AvroSerializerModifier
     extends BeanSerializerModifier
 {
+    private static final long serialVersionUID = 1L;
+
     @Override
     public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
             BeanDescription beanDesc, List<BeanPropertyWriter> beanProperties)
@@ -32,9 +34,8 @@ public List<BeanPropertyWriter> changeProperties(SerializationConfig config,
             Iterator<BeanPropertyWriter> it = beanProperties.iterator();
             while (it.hasNext()) {
                 BeanPropertyWriter prop = it.next();
-                if ("schema".equals(prop.getName())) {
+                if ("schema".equals(prop.getName()) || "specificData".equals(prop.getName())) {
                     it.remove();
-                    break;
                 }
             }
         }

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java

@@ -21,6 +21,8 @@
  */
 public class AvroTypeIdResolver extends ClassNameIdResolver
 {
+    private static final long serialVersionUID = 1L;
+
     private final Map<String, Class<?>> _idTypes = new HashMap<>();
 
     // 04-Jan-2021, tatu: Not sure why this is being kept around, not used as of

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/ApacheAvroParserImpl.java

@@ -5,7 +5,6 @@
 import java.io.Writer;
 
 import org.apache.avro.io.BinaryDecoder;
-import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.DecoderFactory;
 
 import com.fasterxml.jackson.core.*;

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/apacheimpl/AvroRecyclerPools.java

@@ -7,7 +7,6 @@
 import com.fasterxml.jackson.core.util.RecyclerPool;
 import com.fasterxml.jackson.core.util.RecyclerPool.BoundedPoolBase;
 import com.fasterxml.jackson.core.util.RecyclerPool.ConcurrentDequePoolBase;
-import com.fasterxml.jackson.core.util.RecyclerPool.LockFreePoolBase;
 
 public final class AvroRecyclerPools
 {
@@ -58,24 +57,6 @@ public static RecyclerPool<ApacheCodecRecycler> newConcurrentDequePool() {
         return ConcurrentDequePool.construct();
     }
 
-    /**
-     * Accessor for getting the shared/global {@link LockFreePool} instance.
-     *
-     * @return Globally shared instance of {@link LockFreePool}.
-     */
-    public static RecyclerPool<ApacheCodecRecycler> sharedLockFreePool() {
-        return LockFreePool.GLOBAL;
-    }
-
-    /**
-     * Accessor for constructing a new, non-shared {@link LockFreePool} instance.
-     *
-     * @return Globally shared instance of {@link LockFreePool}.
-     */
-    public static RecyclerPool<ApacheCodecRecycler> newLockFreePool() {
-        return LockFreePool.construct();
-    }
-
     /**
      * Accessor for getting the shared/global {@link BoundedPool} instance.
      *
@@ -105,7 +86,7 @@ public static RecyclerPool<ApacheCodecRecycler> newBoundedPool(int size) {
     /**
      * {@link ThreadLocal}-based {@link RecyclerPool} implementation used for
      * recycling {@link ApacheCodecRecycler} instances:
-     * see {@link RecyclerPool.ThreadLocalPoolBase} for full explanation
+     * see {@code RecyclerPool.ThreadLocalPoolBase} for full explanation
      * of functioning.
      */
     public static class ThreadLocalPool
@@ -195,42 +176,6 @@ protected Object readResolve() {
         }
     }
 
-    /**
-     * {@link RecyclerPool} implementation that uses
-     * a lock free linked list for recycling instances.
-     *<p>
-     * Pool is unbounded: see {@link RecyclerPool} for
-     * details on what this means.
-     */
-    public static class LockFreePool extends LockFreePoolBase<ApacheCodecRecycler>
-    {
-        private static final long serialVersionUID = 1L;
-
-        protected static final LockFreePool GLOBAL = new LockFreePool(SERIALIZATION_SHARED);
-
-        // // // Life-cycle (constructors, factory methods)
-
-        protected LockFreePool(int serialization) {
-            super(serialization);
-        }
-
-        public static LockFreePool construct() {
-            return new LockFreePool(SERIALIZATION_NON_SHARED);
-        }
-        
-        @Override
-        public ApacheCodecRecycler createPooled() {
-            return new ApacheCodecRecycler();
-        }
-
-        // // // JDK serialization support
-
-        // Make sure to re-link to global/shared or non-shared.
-        protected Object readResolve() {
-            return _resolveToShared(GLOBAL).orElseGet(() -> construct());
-        }
-    }
-
     /**
      * {@link RecyclerPool} implementation that uses
      * a bounded queue ({@link ArrayBlockingQueue} for recycling instances.