Sync from SUSE:SLFO:1.1 jackson-databind revision cfafb3260306578487e8281de5a0ea8e

jackson-databind-build.xml

@@ -11,7 +11,7 @@
   <property name="project.groupId" value="com.fasterxml.jackson.core"/>
   <property name="project.artifactId" value="jackson-databind"/>
   <property name="project.name" value="jackson-databind"/>
-  <property name="project.version" value="2.17.3"/>
+  <property name="project.version" value="2.17.1"/>
   <property name="project.vendor" value="FasterXML"/>
   <property name="project.description" value="General data-binding functionality for Jackson: works on core streaming API"/>
   <property name="bundle.version" value="${project.version}"/>
@@ -25,8 +25,10 @@
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
   <property name="build.resourceDir" value="src/main/resources"/>
-  <property name="build.moditectDir" value="src/moditect"/>
+  <property name="build.testOutputDir" value="${build.dir}/test-classes"/>
-
+  <property name="build.testDir" value="src/test/java"/>
+  <property name="build.testResourceDir" value="src/test/resources"/>
+  <property name="test.reports" value="${build.dir}/test-reports"/>
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
   <!-- ====================================================================== -->
@@ -38,6 +40,11 @@
       <include name="**/*.jar"/>
     </fileset>
   </path>
+  <path id="build.test.classpath">
+    <fileset dir="lib">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
 
   <!-- ====================================================================== -->
   <!-- Cleaning up target                                                     -->
@@ -86,26 +93,101 @@
       </src>
       <classpath refid="build.classpath"/>
     </javac>
-    <javac destdir="${build.outputDir}"
+    <copy todir="${build.outputDir}">
+      <fileset dir="${build.resourceDir}"/>
+    </copy>
+  </target>
+
+  <!-- ====================================================================== -->
+  <!-- Test-compilation target                                                -->
+  <!-- ====================================================================== -->
+
+  <target name="compile-tests" 
+          depends="compile" 
+          description="Compile the test code" 
+          unless="test.skip">
+    <mkdir dir="${build.testOutputDir}"/>
+    <javac destdir="${build.testOutputDir}" 
            nowarn="false" 
            debug="true" 
            optimize="false" 
            deprecation="true" 
-           release="9"
+           release="${compiler.release}" 
+           target="${compiler.target}" 
            verbose="false" 
            fork="false" 
-           encoding="utf-8">
+           source="${compiler.source}">
       <src>
-        <pathelement location="${build.moditectDir}"/>
+        <pathelement location="${build.testDir}"/>
       </src>
-      <modulepath>
+      <classpath>
-        <path refid="build.classpath"/>
+        <path refid="build.test.classpath"/>
         <pathelement location="${build.outputDir}"/>
-      </modulepath>
+      </classpath>
     </javac>
-    <copy todir="${build.outputDir}">
+  </target>
-      <fileset dir="${build.resourceDir}"/>
+
-    </copy>
+  <!-- ====================================================================== -->
+  <!-- Run all tests                                                          -->
+  <!-- ====================================================================== -->
+
+  <target name="test" 
+          depends="compile-tests, junit-missing" 
+          unless="junit.skipped" 
+          description="Run the test cases">
+    <mkdir dir="${test.reports}"/>
+    <junit printSummary="yes" haltonerror="true" haltonfailure="true" fork="true" dir=".">
+      <sysproperty key="basedir" value="."/>
+      <formatter type="xml"/>
+      <formatter type="plain" usefile="false"/>
+      <classpath>
+        <path refid="build.test.classpath"/>
+        <pathelement location="${build.outputDir}"/>
+        <pathelement location="${build.testOutputDir}"/>
+      </classpath>
+      <batchtest todir="${test.reports}" unless="test">
+        <fileset dir="${build.testDir}">
+          <include name="**/Test*.java"/>
+          <include name="**/*Test.java"/>
+          <include name="**/*TestCase.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+      <batchtest todir="${test.reports}" if="test">
+        <fileset dir="${build.testDir}">
+          <include name="**/${test}.java"/>
+          <exclude name="**/*Abstract*Test.java"/>
+        </fileset>
+      </batchtest>
+    </junit>
+  </target>
+
+  <target name="test-junit-present">
+    <available classname="junit.framework.Test" property="junit.present" classpathref="build.test.classpath"/>
+  </target>
+
+  <target name="test-junit-status" 
+          depends="test-junit-present">
+    <condition property="junit.missing">
+      <and>
+        <isfalse value="${junit.present}"/>
+        <isfalse value="${test.skip}"/>
+      </and>
+    </condition>
+    <condition property="junit.skipped">
+      <or>
+        <isfalse value="${junit.present}"/>
+        <istrue value="${test.skip}"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="junit-missing" 
+          depends="test-junit-status" 
+          if="junit.missing">
+    <echo>=================================== WARNING ===================================</echo>
+    <echo> JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed.</echo>
+    <echo>===============================================================================</echo>
   </target>
 
   <!-- ====================================================================== -->
@@ -143,7 +225,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile" description="Package the application">
+  <target name="package" depends="compile,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar" 
          compress="true" 
          index="false" 

jackson-databind.changes

@@ -1,111 +1,11 @@
--------------------------------------------------------------------
-Wed Nov  6 07:55:24 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Update to 2.17.3
-  * #4718: Should not fail on trying to serialize
-    'java.time.DateTimeException'
-
--------------------------------------------------------------------
-Mon Oct 28 07:07:17 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Remove LGPL-2.1-or-later license, since not found in the package
-
--------------------------------------------------------------------
-Thu Oct 10 14:07:26 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Build the module-info.java source too (with release=9)
-
--------------------------------------------------------------------
-Wed Aug  7 09:01:52 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Update to 2.17.2
-  * #4561: Issues using jackson-databind 2.17.1 with Reactor
-  * #4575: StdDelegatingSerializer does not consider a Converter
-    that may return null for a non-null input
-  * #4577: Cannot deserialize value of type 'java.math.BigDecimal'
-    from String "3." (not a valid representation)
-  * #4595: No way to explicitly disable wrapping in custom
-    annotation processor
-  * #4607: 'MismatchedInput': No Object Id found for an instance of
-    X to assign to property '@id'
-  * #4610: 'DeserializationFeature.FAIL_ON_UNRESOLVED_OBJECT_IDS'
-    does not work when used with Polymorphic type handling
-
 -------------------------------------------------------------------
 Mon May 20 12:26:44 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
 
 - Update to 2.17.1
-  * 2.17.1 (04-May-2024)
+  * No changes since 2.17.0
-    + #4428: 'ByteBuddy' scope went beyond 'test' in version 2.17.0
+- Includes changes from 2.17.0
-    + #4430: Use 'ReentrantLock' instead of 'synchronized' in
+  * #242: Allow `@JsonAnySetter` on `ElementType.PARAMETER` (for
-     'DeserializerCache' to avoid deadlock on pinning
+    use on constructor parameters)
-    + #4435: Cannot deserialize value of type 'java.math.BigDecimal'
-      from String ".05": not a valid representation
-    + #4441: '@JsonSetter(nulls = Nulls.SKIP)' doesn't work in some
-      situations
-    + #4450: Empty QName deserialized as 'null'
-    + #4471: Reconsider deprecation of
-      'JsonNode.asText(defaultValue)'
-    + #4481: Unable to override
-      'DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL' with
-      'JsonFormat.Feature.READ_UNKNOWN_ENUM_VALUES_AS_NULL'
-    + #4489: Unable to override 'DeserializationFeature
-      .READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE' with
-      'JsonFormat.Feature.READ_UNKNOWN_ENUM_VALUES_USING_DEFAULT_VALUE'
-  * 2.17.0 (12-Mar-2024)
-    + #437: Support throwing 'MismatchedInputException' when
-      deserializing properties that are not part of the view
-    + #736: 'MapperFeature.REQUIRE_SETTERS_FOR_GETTERS' has no effect
-    + #2543: Introspection includes delegating ctor's only parameter
-      as a property in 'BeanDescription'
-    + #4160: Deprecate 'DefaultTyping.EVERYTHING' in '2.x' and
-      remove in '3.0'
-    + #4194: Add 'JsonNodeFeature
-      .FAIL_ON_NAN_TO_BIG_DECIMAL_COERCION' option to fail on
-      attempting to coerce 'NaN' into 'BigDecimal'
-    + #4205: Consider types in 'sun.*' package(s) to be JDK
-      (platform) types for purposes of handling
-    + #4209: Make 'BeanDeserializerModifier'/'BeanSerializerModifier'
-      implement 'java.io.Serializable'
-    + #4214: 'EnumSet' deserialization does not work when we
-      activate default typing in 'ObjectMapper'
-    + #4248: 'ThrowableDeserializer' does not handle 'null' well for
-      'cause'
-    + #4250: Add input validation for 'NumberDeserializers'
-      deserializers for "stringified" FP numbers
-    + #4262: Improve handling of 'null' insertion failure for
-      'TreeSet'
-    + #4263: Change 'ObjectArrayDeserializer' to use "generic" type
-      parameter ('java.lang.Object') to remove co-variant return
-      type
-    + #4299: Some 'Collection' and 'Map' fallbacks don't work in
-      GraalVM native image
-    + #4309: '@JsonSetter(nulls=...)' handling of 'Collection'
-      'null' values during deserialization with
-      'READ_UNKNOWN_ENUM_VALUES_AS_NULL' and
-      'FAIL_ON_INVALID_SUBTYPE' wrong
-    + #4327: '@JsonAlias' not respected by polymorphic deduction
-    + #4337: 'AtomicReference' serializer does not support
-      '@JsonSerialize(contentConverter=...)'
-    + #4364: '@JsonProperty' and equivalents should merge with
-      'AnnotationIntrospectorPair'
-    + #4394: Better Base64 support for 'java.util.UUIDs' without
-      padding
-    + #4403: Deserialization of unknown value for enums does not
-      yield default enum value
-    + #4416: Deprecate 'JsonNode.asText(String)'
-  * 2.16.2 (09-Mar-2024)
-    + #4302: Problem deserializing some type of Enums when using
-     'PropertyNamingStrategy'
-    + #4303: 'ObjectReader' is not serializable if it's configured
-      for polymorphism
-    + #4316: NPE when deserializing 'JsonAnySetter' in 'Throwable'
-    + #4355: Jackson 2.16 fails attempting to obtain 'ObjectWriter'
-      for an 'Enum' of which some value returns null from
-      'toString()'
-    + #4409: Deserialization of enums with name defined with
-      different cases leads to 'InvalidDefinitionException':
-      Multiple fields representing property
 
 -------------------------------------------------------------------
 Fri Mar  8 08:33:47 UTC 2024 - Gus Kenion <gkenion@suse.com>

jackson-databind.spec

@@ -16,14 +16,11 @@
 #
 
 
-# The automatic requires would be java-headless >= 9, but the
-# binaries are java 8 compatible
-%define __requires_exclude java-headless
 Name:           jackson-databind
-Version:        2.17.3
+Version:        2.17.1
 Release:        0
 Summary:        General data-binding package for Jackson (2.x)
-License:        Apache-2.0
+License:        Apache-2.0 AND LGPL-2.1-or-later
 URL:            https://github.com/FasterXML/jackson-databind/
 Source0:        https://github.com/FasterXML/jackson-databind/archive/%{name}-%{version}.tar.gz
 Source1:        %{name}-build.xml
@@ -31,9 +28,8 @@ BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  jackson-annotations
 BuildRequires:  jackson-core
-BuildRequires:  java-devel >= 9
+BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
-Requires:       java-headless >= 1.8
 BuildArch:      noarch
 
 %description
@@ -57,7 +53,7 @@ sed -i 's/\r//' LICENSE NOTICE
 
 %build
 build-jar-repository -s lib jackson-annotations jackson-core
-ant jar javadoc
+%{ant} -Dtest.skip=true jar javadoc
 
 %install
 install -dm 0755 %{buildroot}%{_javadir}