Sync from SUSE:SLFO:1.1 jackson-annotations revision 8c4d65962251efcc06ef05c0b05e9c68

jackson-annotations-build.xml

@@ -11,7 +11,7 @@
   <property name="project.groupId" value="com.fasterxml.jackson.core"/>
   <property name="project.artifactId" value="jackson-annotations"/>
   <property name="project.name" value="Jackson-annotations"/>
-  <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="Core annotations used for value types, used by Jackson data binding package."/>
   <property name="bundle.version" value="${project.version}"/>
@@ -24,8 +24,9 @@
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
   <property name="build.srcDir" value="src/main/java"/>
-  <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="test.reports" value="${build.dir}/test-reports"/>
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
   <!-- ====================================================================== -->
@@ -33,6 +34,11 @@
   <!-- ====================================================================== -->
 
   <path id="build.classpath"/>
+  <path id="build.test.classpath">
+    <fileset dir="lib">
+      <include name="**/*.jar"/>
+    </fileset>
+  </path>
 
   <!-- ====================================================================== -->
   <!-- Cleaning up target                                                     -->
@@ -57,32 +63,107 @@
            target="${compiler.target}" 
            verbose="false" 
            fork="false" 
-           encoding="utf-8"
+		   encoding="utf-8"
            source="${compiler.source}">
       <src>
         <pathelement location="${build.srcDir}"/>
       </src>
       <classpath refid="build.classpath"/>
     </javac>
-    <javac destdir="${build.outputDir}"
+  </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>
   </target>
 
+  <!-- ====================================================================== -->
+  <!-- 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>
+
   <!-- ====================================================================== -->
   <!-- Javadoc target                                                         -->
   <!-- ====================================================================== -->
@@ -105,7 +186,7 @@
              nohelp="false" 
              nonavbar="false" 
              serialwarn="false" 
-             encoding="utf-8"
+			 encoding="utf-8"
              charset="utf-8" 
              linksource="false" 
              breakiterator="false" 
@@ -117,35 +198,35 @@
   <!-- 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" 
          basedir="${build.outputDir}" 
          excludes="**/package.html">
       <manifest>
-        <attribute name="Bundle-Description" value="${project.description}"/>
+		<attribute name="Bundle-Description" value="${project.description}"/>
-        <attribute name="Bundle-DocURL" value="http://github.com/FasterXML/jackson"/>
+		<attribute name="Bundle-DocURL" value="http://github.com/FasterXML/jackson"/>
-        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-        <attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
-        <attribute name="Bundle-Name" value="${project.name}"/>
+		<attribute name="Bundle-Name" value="${project.name}"/>
-        <attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/>
+		<attribute name="Bundle-SymbolicName" value="${project.groupId}.${project.artifactId}"/>
-        <attribute name="Bundle-Vendor" value="${project.vendor}"/>
+		<attribute name="Bundle-Vendor" value="${project.vendor}"/>
-        <attribute name="Bundle-Version" value="${bundle.version}"/>
+		<attribute name="Bundle-Version" value="${bundle.version}"/>
-        <attribute name="Export-Package" value="com.fasterxml.jackson.annotation;version=&quot;${project.version}&quot;"/>
+		<attribute name="Export-Package" value="com.fasterxml.jackson.annotation;version=&quot;${project.version}&quot;"/>
-        <attribute name="Implementation-Title" value="${project.name}"/>
+		<attribute name="Implementation-Title" value="${project.name}"/>
-        <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
+		<attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
-        <attribute name="Implementation-Vendor" value="${project.vendor}"/>
+		<attribute name="Implementation-Vendor" value="${project.vendor}"/>
-        <attribute name="Implementation-Version" value="${project.version}"/>
+		<attribute name="Implementation-Version" value="${project.version}"/>
-        <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
+		<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
-        <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
+		<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
-        <attribute name="JavaPackages-Version" value="${project.version}"/>
+		<attribute name="JavaPackages-Version" value="${project.version}"/>
-        <attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
+		<attribute name="Require-Capability" value="osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(version=${compiler.target}))&quot;"/>
-        <attribute name="Specification-Title" value="${project.name}"/>
+		<attribute name="Specification-Title" value="${project.name}"/>
-        <attribute name="Specification-Vendor" value="${project.vendor}"/>
+		<attribute name="Specification-Vendor" value="${project.vendor}"/>
-        <attribute name="Specification-Version" value="${project.version}"/>
+		<attribute name="Specification-Version" value="${project.version}"/>
       </manifest>
-    </jar>
+	</jar>
   </target>
 
   <!-- ====================================================================== -->

jackson-annotations.changes

@@ -1,20 +1,3 @@
--------------------------------------------------------------------
-Wed Nov  6 07:47:03 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Update to 2.17.3
-  * No changes since 2.17.2
-
--------------------------------------------------------------------
-Thu Oct 10 13:56:19 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Build the module-info.java source too (with release=9)
-
--------------------------------------------------------------------
-Wed Aug  7 08:49:06 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Update to 2.17.2
-  * No changes since 2.17.1
-
 -------------------------------------------------------------------
 Mon May 20 12:36:56 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
 

jackson-annotations.spec

@@ -16,11 +16,8 @@
 #
 
 
-# The automatic requires would be java-headless >= 9, but the
-# binaries are java 8 compatible
-%define __requires_exclude java-headless
 Name:           jackson-annotations
-Version:        2.17.3
+Version:        2.17.1
 Release:        0
 Summary:        Core annotations for Jackson data processor
 License:        Apache-2.0
@@ -30,9 +27,7 @@ Source0:        https://github.com/FasterXML/jackson-annotations/archive/%{name}
 Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 9
 BuildRequires:  javapackages-local >= 6
-Requires:       java-headless >= 1.8
 BuildArch:      noarch
 
 %description
@@ -57,7 +52,7 @@ mkdir -p lib
 sed -i 's/\r//' LICENSE
 
 %build
-ant package javadoc
+%{ant} -Dtest.skip=true package javadoc
 
 %install
 install -dm 0755 %{buildroot}%{_javadir}