Accepting request 1199278 from Java:packages

2.12.7

OBS-URL: https://build.opensuse.org/request/show/1199278
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/joda-time?expand=0&rev=17

joda-time-build.xml

@@ -8,7 +8,11 @@
 
   <property file="build.properties"/>
 
-  <property name="build.finalName" value="joda-time-2.10.1"/>
+  <property name="project.version" value="[UNKNOWN]"/>
+  <property name="project.spec.version" value="[UNKNOWN]"/>
+  <property name="project.groupId" value="joda-time"/>
+  <property name="project.artifactId" value="joda-time"/>
+  <property name="build.finalName" value="${ant.project.name}-${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"/>
@@ -104,10 +108,12 @@
       <arg value="europe"/>
       <arg value="northamerica"/>
       <arg value="southamerica"/>
-      <arg value="pacificnew"/>
+      <!--arg value="pacificnew"/-->
       <arg value="etcetera"/>
+      <arg value="factory"/>
       <arg value="backward"/>
-      <arg value="systemv"/>
+      <arg value="backzone"/>
+      <!--arg value="systemv"/-->
     </java>
   </target>
   
@@ -135,8 +141,8 @@
              serialwarn="false" 
              linksource="false" 
              breakiterator="false">
-      <group title="User packages"/>
+      <!--group title="User packages"/>
-      <group title="Implementation packages"/>
+      <group title="Implementation packages"/-->
       <classpath refid="build.classpath"/>
     </javadoc>
   </target>
@@ -153,6 +159,26 @@
 		 manifest="src/conf/MANIFEST.MF"
          excludes="**/package.html">
       <manifest>
+		<attribute name="Implementation-Title" value="org.joda.time"/>
+		<attribute name="Automatic-Module-Name" value="org.joda.time"/>
+		<attribute name="Bundle-License" value="Apache 2.0"/>
+		<attribute name="Package" value="org.joda..time"/>
+		<attribute name="Bundle-SymbolicName" value="${project.artifactId}"/>
+		<attribute name="Implementation-Version" value="${project.version}"/>
+		<attribute name="Specification-Vendor" value="Joda.org"/>
+		<attribute name="Bundle-ManifestVersion" value="2"/>
+		<attribute name="Specification-Title" value="Joda-Time"/>
+		<attribute name="Implementation-Vendor-Id" value="org.joda"/>
+		<attribute name="Bundle-Vendor" value="Joda.org"/>
+		<attribute name="Bundle-DocURL" value="https://www.joda.org/joda-time/"/>
+		<attribute name="Time-Zone-Database-Version" value="2024agtz"/>
+		<attribute name="Implementation-Vendor" value="Joda.org"/>
+		<attribute name="Export-Package"
+			value="org.joda.time;version=${project.version},org.joda.time.base;version=${project.version},org.joda.time.chrono;version=${project.version},org.joda.time.convert;version=${project.version},org.joda.time.field;version=${project.version},org.joda.time.format;version=${project.version},org.joda.time.tz;version=${project.version}"/>
+		<attribute name="Bundle-Name" value="Joda-Time"/>
+		<attribute name="Bundle-Version" value="${project.version}"/>
+		<attribute name="Extension-Name" value="joda-time"/>
+		<attribute name="Specification-Version" value="${project.spec.version}"/>
       </manifest>
     </jar>
   </target>

joda-time-fix-tests.patch

@@ -1,19 +0,0 @@
---- joda-time-2.9.9/src/test/java/org/joda/time/TestDateTimeZone.java	2017-03-23 14:33:18.000000000 +0100
-+++ joda-time-2.9.9/src/test/java/org/joda/time/TestDateTimeZone.java	2018-11-20 21:45:41.269188883 +0100
-@@ -20,6 +20,7 @@
- import java.io.FilePermission;
- import java.io.ObjectInputStream;
- import java.io.ObjectOutputStream;
-+import java.lang.Integer;
- import java.lang.reflect.Modifier;
- import java.security.AllPermission;
- import java.security.CodeSource;
-@@ -759,7 +760,7 @@
-         boolean jdk9 = true;
-         try {
-             String str = System.getProperty("java.version");
--            jdk9 = str.startsWith("9");
-+            jdk9 = (9 <= Integer.parseInt((str.trim().split("\\s+|-\\s*|\\.\\s*"))[0]));
-         } catch (Exception ex) {
-             jdk9 = false;
-         }

joda-time.changes

@@ -1,3 +1,92 @@
+-------------------------------------------------------------------
+Thu Sep  5 14:12:43 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
+
+- Upgrade to version 2.12.7
+  * Update time zone data to 2024agtz
+- Upgrade to version 2.12.6
+  * Enhance DateTimeZone.forID() to better match java.time. Fixes
+    #733, #717.
+  * Better error message in DateTimeFormat. Fixes #731.
+  * DateTimeZone data updated to version 2023dgtz.
+- Upgrade to version 2.12.5
+  * DateTimeZone data updated to version 2023cgtz.
+- Upgrade to version 2.12.4
+  * DateTimeZone data updated to version 2023bgtz.
+- Upgrade to version 2.12.3
+  * DateTimeZone data updated to version 2023agtz.
+- Upgrade to version 2.12.2
+  * DateTimeZone data updated to version 2022ggtz.
+- Upgrade to version 2.12.1
+  * Add/fix translations for iw, sq.
+  * DateTimeZone data updated to version 2022fgtz.
+- Upgrade to version 2.12.0
+  * Add translations for ca, el, eu, fi, hi, hu, in, iw, ms, nn,
+    ro, sk, sv, zh.
+  * DateTimeZone data updated to version 2022egtz.
+- Upgrade to version 2.11.2
+  * DateTimeZone data updated to version 2022dgtz.
+  * Switch LGTM to CodeQL.
+- Upgrade to version 2.11.1
+  * Update build scripts and fix static analysis warnings.
+  * Switch master to main.
+  * DateTimeZone data updated to version 2022cgtz.
+- Upgrade to version 2.11.0
+  * Change DateTimeZone to use
+    'org.joda.time.DateTimeZone.Timezone' instead of
+    'user.timezone'. This change causes Joda-Time to query
+    'TimeZone.getDefault()' in most cases. In most cases this
+    change will have no effect on application code, as
+    'user.timezone' will be picked up by 'TimeZone.getDefault()'
+    instead. If you specifically need to stop Joda-Time calling
+    'TimeZone.getDefault()' then you will need to change to use the
+    new system property 'org.joda.time.DateTimeZone.Timezone'.
+    Fixes #587.
+  * Avoid using == on objects. Fixes #581.
+  * DateTimeZone data updated to version 2022bgtz. This uses the
+    new global-tz project that reinstates all the data removed by
+    IANA's TZDB. See
+    https://github.com/JodaOrg/joda-time/issues/566
+- Upgrade to version 2.10.14
+  * DateTimeZone data updated to version 2022agtz. This uses the
+    new global-tz project that reinstates all the data removed by
+    IANA's TZDB. See
+    https://github.com/JodaOrg/joda-time/issues/566
+- Upgrade to version 2.10.13
+  * DateTimeZone data updated to version 2021efork. See
+    https://github.com/JodaOrg/joda-time/issues/566
+- Upgrade to version 2.10.12
+  * DateTimeZone data updated to version 2021bfork3. See
+    https://github.com/JodaOrg/joda-time/issues/566
+- Upgrade to version 2.10.11
+  * Defend against possible release of hugely damaging timezone
+    data. See https://github.com/JodaOrg/joda-time/issues/566
+- Upgrade to version 2.10.10
+  * DateTimeZone data updated to version 2021a.
+- Upgrade to version 2.10.9
+  * DateTimeZone data updated to version 2020e. Fix to time-zone
+    compiler.
+- Upgrade to version 2.10.8
+  * DateTimeZone data updated to version 2020d. Remove systemv and
+    pacificnew time zones as per TZDB changes.
+- Upgrade to version 2.10.7
+  * DateTimeZone data updated to version 2020c. Remove systemv and
+    pacificnew time zones as per TZDB changes.
+  * Better error message for year-month-day. Fixes #540.
+  * Fix localization for Russia. Fixes #533.
+- Upgrade to version 2.10.6
+  * DateTimeZone data updated to version 2020a.
+  * Add localization for Ukraine. Fixes #523.
+- Upgrade to version 2.10.5
+  * Updated Joda-Convert version.
+- Upgrade to version 2.10.4
+  * DateTimeZone data updated to version 2019c.
+- Upgrade to version 2.10.3
+  * DateTimeZone data updated to version 2019b.
+- Remove patch:
+  * joda-time-fix-tests.patch
+    + not needed anymore
+- Add JPMS and OSGI metadata to the manifest
+
 -------------------------------------------------------------------
 Wed Feb 21 13:51:02 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

joda-time.spec

@@ -16,9 +16,10 @@
 #
 
 
-%global tzversion tzdata2018i
+%global spec_version 2.12
+%global tzversion tzdata2024a
 Name:           joda-time
-Version:        2.10.1
+Version:        %{spec_version}.7
 Release:        0
 Summary:        Java date and time API
 License:        Apache-2.0
@@ -27,7 +28,6 @@ URL:            https://www.joda.org/joda-time/
 Source0:        https://github.com/JodaOrg/%{name}/archive/v%{version}.tar.gz
 Source1:        ftp://ftp.iana.org/tz/releases/%{tzversion}.tar.gz
 Source100:      %{name}-build.xml
-Patch0:         joda-time-fix-tests.patch
 BuildRequires:  ant
 BuildRequires:  dos2unix
 BuildRequires:  fdupes
@@ -54,7 +54,7 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q
-%patch -P 0 -p1
+
 dos2unix LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 cp %{SOURCE100} build.xml
 
@@ -67,21 +67,23 @@ tar -xzf %{SOURCE1} -C src/main/java/org/joda/time/tz/src/
 
 %build
 %{ant} \
+  -Dproject.version=%{version} \
+  -Dproject.spec.version=%{spec_version} \
   -Djoda-convert.jar=%{_javadir}/joda-convert.jar \
   clean jar javadoc
 
 %install
 # jars
-install -d -m 755 %{buildroot}%{_javadir}
+install -dm0755 %{buildroot}%{_javadir}
 # Don't install a versioned jar and symlink to it, instead install
 # the unversioned jar as per Java Packaging Guidelines
-install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 # poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -dm0755 %{buildroot}%{_mavenpomdir}
 %{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
 # javadoc
-install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
+install -dm0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}
 

tzdata2018i.tar.gz

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

tzdata2024a.tar.gz

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

v2.10.1.tar.gz

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

v2.12.7.tar.gz

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