Accepting request 1205269 from Java:packages

Spec file cleanup

OBS-URL: https://build.opensuse.org/request/show/1205269
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/joda-convert?expand=0&rev=5

joda-convert-1.9.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07ca09b22cf898b7529cae24078d32c7fd0d0f835ff583495e09b6f3bb21e36e
-size 52321

joda-convert-2.2.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bc1f580da3bb2919da8062c67b2d3c2b44a2212f8e2fd12211c4bd816b117617
+size 69830

joda-convert-build.xml

@@ -11,7 +11,7 @@
   <property name="project.name" value="Joda-Convert"/>
   <property name="project.artifactId" value="joda-convert"/>
   <property name="project.groupId" value="org.joda"/>
-  <property name="project.version" value="1.9.2"/>
+  <property name="project.version" value="[UNKNOWN]"/>
   <property name="project.description" value="Library to convert Objects to and from String"/>
   <property name="project.url" value="http://www.joda.org/joda-convert/"/>
   <property name="project.organization.name" value="Joda.org"/>
@@ -21,23 +21,23 @@
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
   <property name="build.dir" value="target"/>
   <property name="build.outputDir" value="${build.dir}/classes"/>
-  <property name="build.srcDir.0" value="src/main/java"/>
-  <property name="build.resourceDir.0" value="src/main/resources"/>
-  <property name="build.resourceDir.1" value="."/>
+  <property name="build.srcDir" value="src/main/java"/>
+  <property name="build.resourceDir" value="."/>
 
   <property name="reporting.outputDirectory" value="${build.dir}/site"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
   
-  <property name="guava.jar" value="lib/guava.jar"/>
-
   <!-- ====================================================================== -->
   <!-- Defining classpaths                                                    -->
   <!-- ====================================================================== -->
 
   <path id="build.classpath">
-    <pathelement location="${guava.jar}"/>
+    <fileset dir="lib">
+      <include name="**/*.jar"/>
+    </fileset>
   </path>
 
   <!-- ====================================================================== -->
@@ -59,18 +59,36 @@
            debug="true" 
            optimize="false" 
            deprecation="true" 
+           verbose="false" 
+           fork="false" 
+           release="9"
+           includes="**/module-info.java"
+           >
+      <src>
+        <pathelement location="${build.srcDir}"/>
+      </src>
+      <classpath refid="build.classpath"/>
+    </javac>
+    <javac destdir="${build.outputDir}" 
+           nowarn="false" 
+           debug="true" 
+           optimize="false" 
+           deprecation="true" 
+           release="${compiler.release}" 
            target="${compiler.target}" 
            verbose="false" 
            fork="false" 
-           source="${compiler.source}">
+           source="${compiler.source}"
+           excludes="**/module-info.java"
+           >
       <src>
-        <pathelement location="${build.srcDir.0}"/>
+        <pathelement location="${build.srcDir}"/>
       </src>
       <classpath refid="build.classpath"/>
     </javac>
     <mkdir dir="${build.outputDir}/META-INF"/>
     <copy todir="${build.outputDir}/META-INF">
-      <fileset dir="${build.resourceDir.1}">
+      <fileset dir="${build.resourceDir}">
         <include name="LICENSE.txt"/>
         <include name="NOTICE.txt"/>
       </fileset>
@@ -82,7 +100,7 @@
   <!-- ====================================================================== -->
 
   <target name="javadoc" description="Generates the Javadoc of the application">
-    <javadoc sourcepath="${build.srcDir.0}" 
+    <javadoc sourcepath="${build.srcDir}" 
              packagenames="*" 
              destdir="${reporting.outputDirectory}/apidocs" 
              access="protected" 
@@ -116,28 +134,28 @@
          basedir="${build.outputDir}" 
          excludes="**/package.html">
       <manifest>
-		<attribute name="Bundle-Description" value="${project.description}"/>
-		<attribute name="Bundle-DocURL" value="${project.url}"/>
-		<attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
-		<attribute name="Bundle-ManifestVersion" value="2"/>
-		<attribute name="Bundle-Name" value="%{project.name}"/>
-		<attribute name="Bundle-SymbolicName" value="org.joda.convert"/>
-		<attribute name="Bundle-Vendor" value="${project.organization.name}"/>
-		<attribute name="Bundle-Version" value="${project.version}"/>
-		<attribute name="Export-Package" value="org.joda.convert;version=&quot;${project.version}&quot;,org.joda.convert.factory;uses:=&quot;org.joda.convert&quot;;version=&quot;${project.version}&quot;"/>
-		<attribute name="Implementation-Title" value="${project.name}"/>
-		<attribute name="Implementation-URL" value="${project.url}"/>
-		<attribute name="Implementation-Vendor" value="${project.organization.name}"/>
-		<attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
-		<attribute name="Implementation-Version" value="${project.version}"/>
-		<attribute name="Import-Package" value="com.google.common.collect;version=&quot;[20.0,21)&quot;;resolution:=optional,com.google.common.reflect;version=&quot;[20.0,21)&quot;;resolution:=optional,org.joda.convert,org.joda.convert.factory"/>
-		<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
-		<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
-		<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="Specification-Title" value="${project.name}"/>
-		<attribute name="Specification-Vendor" value="${project.organization.name}"/>
-		<attribute name="Specification-Version" value="${spec.version}"/>
+        <attribute name="Bundle-Description" value="${project.description}"/>
+        <attribute name="Bundle-DocURL" value="${project.url}"/>
+        <attribute name="Bundle-License" value="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
+        <attribute name="Bundle-ManifestVersion" value="2"/>
+        <attribute name="Bundle-Name" value="%{project.name}"/>
+        <attribute name="Bundle-SymbolicName" value="org.joda.convert"/>
+        <attribute name="Bundle-Vendor" value="${project.organization.name}"/>
+        <attribute name="Bundle-Version" value="${project.version}"/>
+        <attribute name="Export-Package" value="org.joda.convert;version=&quot;${project.version}&quot;,org.joda.convert.factory;uses:=&quot;org.joda.convert&quot;;version=&quot;${project.version}&quot;"/>
+        <attribute name="Implementation-Title" value="${project.name}"/>
+        <attribute name="Implementation-URL" value="${project.url}"/>
+        <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
+        <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
+        <attribute name="Implementation-Version" value="${project.version}"/>
+        <attribute name="Import-Package" value="com.google.common.collect;version=&quot;[20.0,21)&quot;;resolution:=optional,com.google.common.reflect;version=&quot;[20.0,21)&quot;;resolution:=optional,org.joda.convert,org.joda.convert.factory"/>
+        <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
+        <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
+        <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="Specification-Title" value="${project.name}"/>
+        <attribute name="Specification-Vendor" value="${project.organization.name}"/>
+        <attribute name="Specification-Version" value="${spec.version}"/>
       </manifest>
     </jar>
   </target>

joda-convert.changes

@@ -1,3 +1,63 @@
+-------------------------------------------------------------------
+Wed Oct  2 15:53:41 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
+-------------------------------------------------------------------
+Thu Sep  5 13:11:08 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
+
+- Update to version 2.2.3
+  * Changes of version 2.2.3:
+    + Support classes that define `@FromString` but not
+      `@ToString`. This can be used to leniently parse classes
+      where the format used to be a Joda-Convert class.
+    + Switch LGTM to CodeQL.
+  * Changes of version 2.2.2:
+    + Fix deserialization of array classes. Fixes #30
+	+ Switch master to main.
+  * Changes of version 2.2.1:
+    + Ensure `ZoneRegion` is correctly converted.
+  * Changes of version 2.2.0:
+    + Avoid circular loops in dynamic registration of converters.
+	+ Optimise dynamic registration of converters.
+    + Add Tidelift commercial support and security policy.
+  * Changes of version 2.1.2:
+    + Fix `Renamed.ini` to avoid NPE during loading. A null
+      `RenameHandler.INSTANCE` could be observed if `Renamed.ini`
+      referred to a class with a static initializer that referred
+      back to `RenameHandler`.
+	+ Fix build to work on Java 11.
+  * Changes of version 2.1.1:
+    + Log startup issues when using renames by configuration.
+  * Changes of version 2.1:
+    + Register renames by configuration. Add `Renamed.ini` to
+      configure renames more cleanly. Fixes #26.
+  * Changes of version 2.0.2:
+    + Enhance speed of numeric array parsing. Previous version used
+      regex patterns, which were slower.
+  * Changes of version 2.0.1:
+    + Add "classic" variant for systems that can't handle
+      module-info.class.
+  * Changes of version 2.0:
+    + Add module-info for Java 9. Fixes #21.
+    + Update and redesign build to support Java 9.
+    + Remove direct dependency on Guava by copying code into
+      Joda-Convert. The code previously used reflection
+      setAccessible() which would not work on Java 9. The best
+      alternative was to copy (shaded) the relevant part of Guava
+      (same license). This also allowed the converter for `Type` to
+      work without Guava. Given all this, Joda-Convert no longer
+      has an optional dependency on Guava. It will still adapt and
+      setup a converter for `TypeToken` if Guava is present. This
+      adaptation will also work on Java 9, provided the modules are
+      loaded in the same layer. Fixes #20, #22.
+    + Enable build to work on Java 9.
+    + Dynamic Java 8 code must not extend Guava code. Incorrect
+      setup of reflection-based converters. Fixes #19.
+    + Avoid bridge and synthetic methods in reflection. If an
+      annotation is copied to the bridge/synthetic method it causes
+      trouble. Fixes #23.
+
 -------------------------------------------------------------------
 Tue Mar 22 17:10:52 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

joda-convert.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package joda-convert
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           joda-convert
-Version:        1.9.2
+Version:        2.2.3
 Release:        0
 Summary:        Java library for conversion to and from standard string formats
 License:        Apache-2.0
@@ -29,8 +29,8 @@ BuildRequires:  ant
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  guava
-BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  java-devel >= 9
+BuildRequires:  javapackages-local >= 6
 BuildArch:      noarch
 
 %description
@@ -53,8 +53,10 @@ dos2unix *.txt
 %pom_remove_plugin :maven-javadoc-plugin
 
 %build
-%{ant} \
-  -Dguava.jar=%{_javadir}/guava/guava.jar \
+mkdir -p lib
+build-jar-repository -s lib guava
+ant \
+  -Dproject.version=%{version} \
   clean jar javadoc
 
 %install
@@ -63,7 +65,7 @@ install -dm 0755 %{buildroot}%{_javadir}
 install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}