Hello community, here is the log from the commit of package joda-time for openSUSE:Factory checked in at 2019-02-28 21:38:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/joda-time (Old) and /work/SRC/openSUSE:Factory/.joda-time.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "joda-time" Thu Feb 28 21:38:52 2019 rev:14 rq:672971 version:2.10.1 Changes: -------- --- /work/SRC/openSUSE:Factory/joda-time/joda-time.changes 2017-09-20 17:11:43.037778919 +0200 +++ /work/SRC/openSUSE:Factory/.joda-time.new.28833/joda-time.changes 2019-02-28 21:38:53.633630929 +0100 @@ -1,0 +2,92 @@ +Wed Feb 6 12:28:46 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to version 2.10.1 + * Fix time-zone compiler for Namibia. Fixes #485. + * Fix time-zone compiler for Tokyo. + * Handle negative SAVE values in tzdb. + * Add Instant.EPOCH. See #472. + * Clarify negative durations. See #465. + * Add Instant.ofEpochMilli(). Add Instant.ofEpochSecond(). + Fixes #458. + * Add automatic module name for Java SE 9. + * Add Kazakh language translations. Fixes #446 + * Avoid double addition when using lenient chronology. Fixes #432. + * Clarify Period.fieldDifference() Javadoc. + * Clarify Instant.withMillis() Javadoc. Fixes jodaorg.github.io#5 + * Add ZoneInfoProvider() constructor. + * Optimise release process. + * DateTimeZone data updated to version 2017b. + * Handle plus/minus of Integer.MIN_VALUE/MAX_VALUE months + correctly. Fixes #418. + * Clarify time fields are based on the local time-line. + Fixes #415. + * Fix spelling mistakes. Fixes #412. + * Fix DateTimePrinterInternalPinter that outputs data twice. + Fixes #409. + * Support conversion of old TimeZone where name has digits other + than ASCII [#381] + * Add Norwegian period translations [#378] + * Add Duration.dividedBy(long,RoundingMode) [#69, #379] + * Fixed bug where clock read twice when comparing two nulls in + DateTimeComparator [#404] + * Fixed minor issues with historic time-zone data [#373] + * Fix bug in time-zone binary search [#332, #386] The fix in + v2.9.2 caused problems when the time-zone being parsed was not + the last element in the input string. New approach uses a + different approach to the problem. + * Update tests for JDK 9 [#394] + * Close buffered reader correctly in zone info compiler [#396] + * Handle locale correctly zone info compiler [#397] + * Loading time-zone provider now occurs in a privileged block + [#327, #375] + * Make DateTimeUtils.SYSTEM_MILLIS_PROVIDER public [#357] + * Fix bug when adding months at the maximum limits of integer + [#361] + * Add Turkish period translations [#364] + * Fix bug in time-zone binary search [#332] + * Minor fixes to code internals [#339, #326, #344, #350, #343] + * Better document behaviour [#325] + * Fix bug introduced by Long.MIN_VALUE and Long.MAX_VALUE changes + [#328] + * Faster parsing of time-zone identifiers [#282] + * Added Interval.parseWithOffset(String) [#299, #296] Provides a + way to parse the fixed offset in an interval string + * Add DateTimeFormatter methods for StringBuilder [#298] + * Add Russian period translations [#320] + * Add Italian period translations [#312] + * Add Czech period translations [#313] + * Clarify that PeriodFormatterBuilder is in an invalid state once + built [#309] + * Allow DateTime and Interval to refer to values at Long.MIN_VALUE + and Long.MAX_VALUE [#297, #190] A DateTime may be created with + any millisecond value, however at the very edges there may be + some undesirable effects, for example always using UTC instead + of the time-zone + * Better error message for malformed tzdb files [#319] + * Better error message for interval constructor [#321] + * Fixed to handle JDK 8u60 [#288, #291] Without this fix, + formatting a time-zone will print "+00:00" instead of "GMT" for + the GMT time-zone + * Fix parsing of basic form ISO style where year has unnecessary + plus sign [#86] For example, +20151030 will now be correctly + parsed as year 2015. + * Fix overflow bug in intervals [#315] +- Removed patches: + * joda-time-1.6-sourcetarget.patch + + correct source and target levels specified in the ant + build.xml file + * joda-time-use-system-junit.patch + + not needed any more, since we are not running tests for the + while +- Added patch: + + joda-time-fix-tests.patch + + fix java version parsing for versions > 9 +- DateTimeZone data updated to version 2018i +- Add build.xml file to allow build with ant + +------------------------------------------------------------------- +Mon Nov 19 17:20:45 UTC 2018 - Fridrich Strba <[email protected]> + +- Add maven pom file and register joda-time as a maven artifact + +------------------------------------------------------------------- Old: ---- joda-time-1.6-sourcetarget.patch joda-time-1.6-src.tar.gz joda-time-use-system-junit.patch tzdata2010h.tar.gz New: ---- joda-time-build.xml joda-time-fix-tests.patch tzdata2018i.tar.gz v2.10.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ joda-time.spec ++++++ --- /var/tmp/diff_new_pack.hnQxVN/_old 2019-02-28 21:38:54.409630685 +0100 +++ /var/tmp/diff_new_pack.hnQxVN/_new 2019-02-28 21:38:54.409630685 +0100 @@ -1,7 +1,7 @@ # # spec file for package joda-time # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,30 +12,27 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define tzversion tzdata2010h +%global tzversion tzdata2018i Name: joda-time -Version: 1.6 +Version: 2.10.1 Release: 0 Summary: Java date and time API -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; License: Apache-2.0 -Group: Development/Libraries -Url: http://joda-time.sourceforge.net/index.html -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz -Source1: ftp://elsie.nci.nih.gov/pub/%{tzversion}.tar.gz -Patch0: joda-time-use-system-junit.patch -Patch1: joda-time-1.6-sourcetarget.patch +Group: Development/Libraries/Java +URL: http://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 -BuildRequires: java-devel > 1.5.0 -BuildRequires: javapackages-tools -BuildRequires: junit -Requires: java > 1.5.0 -Requires: javapackages-tools +BuildRequires: javapackages-local +BuildRequires: joda-convert BuildArch: noarch %description @@ -50,51 +47,56 @@ %package javadoc Summary: Javadocs for %{name} -# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; -Group: Documentation -Requires: %{name} = %{version}-%{release} -Requires: javapackages-tools +Group: Documentation/HTML %description javadoc This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-%{version}-src +%setup -q %patch0 -p1 -%patch1 -p1 +dos2unix LICENSE.txt NOTICE.txt RELEASE-NOTES.txt +cp %{SOURCE100} build.xml # all java binaries must be removed from the sources find . -name '*.jar' -exec rm -f '{}' \; -find . -name '*.class' -exec rm -f '{}' \; - -# prove that these binaries aren't used in building joda-time -rm -rf src/testdata/ # replace internal tzdata -rm -f src/java/org/joda/time/tz/src/* -tar -xzf %{SOURCE1} -C src/java/org/joda/time/tz/src/ +rm -f src/main/java/org/joda/time/tz/src/* +tar -xzf %{SOURCE1} -C src/main/java/org/joda/time/tz/src/ + +%pom_remove_plugin :maven-enforcer-plugin + +%pom_xpath_set pom:project/pom:properties/pom:maven.compiler.source "1.6" +%pom_xpath_set pom:project/pom:properties/pom:maven.compiler.target "1.6" +%pom_xpath_set pom:project/pom:properties/pom:maven.compiler.compilerVersion "1.6" %build -ant -Dcompile.source=1.6 -Dcompile.target=1.6 -ant -Dcompile.source=1.6 -Dcompile.target=1.6 javadoc +%{ant} \ + -Djoda-convert.jar=%{_javadir}/joda-convert.jar \ + clean jar javadoc %install # jars install -d -m 755 %{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 build/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar - -# javadocs -install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -a build/docs/* %{buildroot}%{_javadocdir}/%{name} -%fdupes -s %{buildroot}%{_javadocdir}/%{name} - -%files -%doc LICENSE.txt RELEASE-NOTES.txt ToDo.txt -%{_javadir}/%{name}.jar +install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +# poms +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ +%fdupes -s %{buildroot}%{_javadocdir} + +%files -f .mfiles +%license LICENSE.txt NOTICE.txt +%doc RELEASE-NOTES.txt %files javadoc -%doc %{_javadocdir}/%{name} +%license LICENSE.txt NOTICE.txt +%{_javadocdir}/%{name} %changelog ++++++ joda-time-build.xml ++++++ <?xml version="1.0" encoding="UTF-8"?> <project name="joda-time" default="package" basedir="."> <!-- ====================================================================== --> <!-- Build environment properties --> <!-- ====================================================================== --> <property file="build.properties"/> <property name="build.finalName" value="joda-time-2.10.1"/> <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="."/> <property name="build.resourceDir.1" value="src/main/java"/> <property name="source.tz" value="${build.srcDir.0}/org/joda/time/tz/src"/> <property name="build.tz" value="${build.outputDir}/org/joda/time/tz/data"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> <property name="repo.local" value="${user.home}/.m2/repository"/> <property name="compiler.source" value="1.6"/> <property name="compiler.target" value="${compiler.source}"/> <property name="joda-convert.jar" value="lib/joda-convert.jar"/> <!-- ====================================================================== --> <!-- Defining classpaths --> <!-- ====================================================================== --> <path id="build.classpath"> <pathelement location="${joda-convert.jar}"/> </path> <!-- ====================================================================== --> <!-- Cleaning up target --> <!-- ====================================================================== --> <target name="clean" description="Clean the output directory"> <delete dir="${build.dir}"/> </target> <!-- ====================================================================== --> <!-- Compilation target --> <!-- ====================================================================== --> <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> <javac destdir="${build.outputDir}" nowarn="false" debug="true" optimize="false" deprecation="true" target="${compiler.target}" verbose="false" fork="false" source="${compiler.source}"> <src> <pathelement location="${build.srcDir.0}"/> </src> <classpath refid="build.classpath"/> </javac> <mkdir dir="${build.outputDir}/META-INF"/> <copy todir="${build.outputDir}/META-INF"> <fileset dir="${build.resourceDir.0}"> <include name="LICENSE.txt"/> <include name="NOTICE.txt"/> </fileset> </copy> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir.1}"> <include name="**/*.properties"/> </fileset> </copy> </target> <!-- ====================================================================== --> <!-- Timezone data compilation target --> <!-- ====================================================================== --> <target name="compile-tzdb" depends="compile" description="Compile timezone data files"> <!-- Invoke the newly built ZoneInfoCompiler to compile the zoneinfo data files --> <mkdir dir="${build.outputDir}/org/joda/time/tz/data"/> <java classname="org.joda.time.tz.ZoneInfoCompiler" fork="true" failonerror="true"> <classpath path="${build.outputDir}"/> <!-- Override default provider since data directory doesn't exist yet --> <sysproperty key="org.joda.time.DateTimeZone.Provider" value="org.joda.time.tz.UTCProvider"/> <!-- Specify source and destination directories --> <arg value="-src"/> <arg value="${build.srcDir.0}/org/joda/time/tz/src"/> <arg value="-dst"/> <arg line="${build.outputDir}/org/joda/time/tz/data"/> <!-- Specify all the data files to compile --> <arg value="africa"/> <arg value="antarctica"/> <arg value="asia"/> <arg value="australasia"/> <arg value="europe"/> <arg value="northamerica"/> <arg value="southamerica"/> <arg value="pacificnew"/> <arg value="etcetera"/> <arg value="backward"/> <arg value="systemv"/> </java> </target> <!-- ====================================================================== --> <!-- Javadoc target --> <!-- ====================================================================== --> <target name="javadoc" description="Generates the Javadoc of the application"> <javadoc sourcepath="${build.srcDir.0}" packagenames="*" destdir="${reporting.outputDirectory}/apidocs" access="protected" source="${compiler.source}" verbose="false" version="true" use="true" author="true" splitindex="false" nodeprecated="false" nodeprecatedlist="false" notree="false" noindex="false" nohelp="false" nonavbar="false" serialwarn="false" linksource="false" breakiterator="false"> <group title="User packages"/> <group title="Implementation packages"/> <classpath refid="build.classpath"/> </javadoc> </target> <!-- ====================================================================== --> <!-- Package target --> <!-- ====================================================================== --> <target name="package" depends="compile-tzdb" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" basedir="${build.outputDir}" manifest="src/conf/MANIFEST.MF" excludes="**/package.html"> <manifest> </manifest> </jar> </target> <!-- ====================================================================== --> <!-- A dummy target for the package named after the type it creates --> <!-- ====================================================================== --> <target name="jar" depends="package" description="Builds the jar for the application"/> </project> ++++++ joda-time-fix-tests.patch ++++++ --- 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; }
