Hello community, here is the log from the commit of package apache-commons-validator for openSUSE:Factory checked in at 2019-01-24 14:12:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache-commons-validator (Old) and /work/SRC/openSUSE:Factory/.apache-commons-validator.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-commons-validator" Thu Jan 24 14:12:29 2019 rev:7 rq:667630 version:1.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/apache-commons-validator/apache-commons-validator.changes 2018-07-07 21:58:35.951302364 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-validator.new.28833/apache-commons-validator.changes 2019-01-24 14:12:29.379426541 +0100 @@ -1,0 +2,30 @@ +Fri Dec 21 20:53:20 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Build against commons-digester >= 1.8 +- Removed patch: + * commons-validator-1.5.0-digester.patch + + building against commons-digester >= 1.8, this patch is + superfluous + +------------------------------------------------------------------- +Fri Dec 21 13:56:05 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Update to 1.5.0 +- Install the maven pom file +- Removed patch: + * commons-validator-1.3.1-crosslink.patch + + not needed +- Added patch: + * commons-validator-1.5.0-digester.patch + + fix build with older versions of commons-digester +- Modified patches: + * commons-validator-1.3.1-srcencoding.patch -> + commons-validator-1.5.0-srcencoding.patch + + specify encoding utf-8 for javac and javadoc invocation + instead of escaping characters + * commons-validator-1.3.1-locale.patch -> + commons-validator-1.5.0-locale.patch + + Adapt the patch to the 1.5.0 context + + Add the sysproperty to the junit task + +------------------------------------------------------------------- Old: ---- commons-validator-1.3.1-crosslink.patch commons-validator-1.3.1-locale.patch commons-validator-1.3.1-src.tar.gz commons-validator-1.3.1-srcencoding.patch New: ---- commons-validator-1.5.0-locale.patch commons-validator-1.5.0-src.tar.gz commons-validator-1.5.0-srcencoding.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache-commons-validator.spec ++++++ --- /var/tmp/diff_new_pack.UHpbHJ/_old 2019-01-24 14:12:29.987425839 +0100 +++ /var/tmp/diff_new_pack.UHpbHJ/_new 2019-01-24 14:12:29.991425835 +0100 @@ -1,7 +1,7 @@ # # spec file for package apache-commons-validator # -# Copyright (c) 2018 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,36 +12,37 @@ # 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 short_name commons-validator Name: apache-%{short_name} -Version: 1.3.1 +Version: 1.5.0 Release: 0 Summary: Apache Commons Validator License: Apache-2.0 Group: Development/Libraries/Java -Url: http://commons.apache.org/commons/ -Source0: %{short_name}-%{version}-src.tar.gz -Patch0: commons-validator-1.3.1-crosslink.patch -# https://issues.apache.org/jira/browse/VALIDATOR-303 -Patch1: commons-validator-1.3.1-srcencoding.patch -Patch2: commons-validator-1.3.1-locale.patch +URL: http://commons.apache.org/commons/ +Source0: http://archive.apache.org/dist/commons/validator/source/%{short_name}-%{version}-src.tar.gz +Patch0: commons-validator-1.5.0-srcencoding.patch +Patch1: commons-validator-1.5.0-locale.patch BuildRequires: ant -BuildRequires: apache-commons-beanutils -BuildRequires: apache-commons-collections -BuildRequires: apache-commons-logging +BuildRequires: ant-junit +BuildRequires: commons-beanutils +BuildRequires: commons-collections +BuildRequires: commons-digester >= 1.8 +BuildRequires: commons-logging BuildRequires: fdupes -BuildRequires: jakarta-commons-digester BuildRequires: java-devel >= 1.8 +BuildRequires: javapackages-local BuildRequires: junit BuildRequires: oro -Requires: apache-commons-beanutils >= 1.5 -Requires: apache-commons-collections -Requires: apache-commons-logging >= 1.0.2 -Requires: jakarta-commons-digester >= 1.3 +Requires: apache-commons-parent +Requires: commons-beanutils >= 1.5 +Requires: commons-collections +Requires: commons-digester >= 1.8 +Requires: commons-logging >= 1.0.2 Requires: oro >= 2.0.6 Provides: %{short_name} = %{version}-%{release} Obsoletes: %{short_name} < %{version}-%{release} @@ -64,7 +65,7 @@ %package javadoc Summary: Javadoc for jakarta-commons-validator -Group: Development/Libraries/Java +Group: Documentation/HTML Requires(pre): coreutils %description javadoc @@ -83,16 +84,11 @@ %setup -q -n %{short_name}-%{version}-src %patch0 -p1 %patch1 -p1 -%patch2 -p1 sed -i 's/\r//' LICENSE.txt sed -i 's/\r//' RELEASE-NOTES.txt sed -i 's/\r//' NOTICE.txt -# use textui instead of awtui (not available in junit4+) -sed -i 's:junit.awtui.TestRunner.main:junit.textui.TestRunner.main:g' \ - src/test/org/apache/commons/validator/*java - %build export CLASSPATH=$(build-classpath \ commons-collections \ @@ -100,7 +96,7 @@ commons-digester \ commons-beanutils \ junit \ - jakarta-oro ) + oro ) ant \ -Dcompile.source=8 -Dcompile.target=8 \ -Dskip.download=true -Dbuild.sysclasspath=first \ @@ -113,7 +109,7 @@ commons-digester \ commons-beanutils \ junit \ - jakarta-oro ) + oro ) ant \ -Dcompile.source=8 -Dcompile.target=8 \ -Dant.build.javac.source=8 -Dant.build.javac.target=8 \ @@ -121,24 +117,26 @@ test %install - # jars install -d -m 0755 %{buildroot}%{_javadir} -install -pm 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar +install -pm 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar ln -s %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar - +# pom +install -d -m 0755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom %{name}.jar -a org.apache.commons:%{short_name} # javadoc install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api*/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir}/%{name}/ -%files -%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt -%{_javadir}/%{name}.jar +%files -f .mfiles +%license LICENSE.txt +%doc NOTICE.txt RELEASE-NOTES.txt %{_javadir}/%{short_name}.jar %files javadoc -%doc LICENSE.txt +%license LICENSE.txt %doc %{_javadocdir}/%{name} %changelog ++++++ commons-validator-1.3.1-locale.patch -> commons-validator-1.5.0-locale.patch ++++++ --- /work/SRC/openSUSE:Factory/apache-commons-validator/commons-validator-1.3.1-locale.patch 2017-10-09 19:48:50.997925709 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-validator.new.28833/commons-validator-1.5.0-locale.patch 2019-01-24 14:12:29.427426485 +0100 @@ -1,60 +1,70 @@ ---- commons-validator-1.3.1-src/build.xml 2006-11-28 23:31:49.000000000 +0100 -+++ commons-validator-1.3.1-src/build.xml 2017-10-09 11:28:48.651572868 +0200 -@@ -108,6 +108,23 @@ - <!-- Download lib dir --> - <property name="download.lib.dir" value="lib"/> - -+<!-- ========== Test Java Version ========================================= --> -+ -+ <condition property="isJava9"> -+ <not> -+ <or> -+ <equals arg1="${ant.java.version}" arg2="1.1"/> -+ <equals arg1="${ant.java.version}" arg2="1.2"/> -+ <equals arg1="${ant.java.version}" arg2="1.3"/> -+ <equals arg1="${ant.java.version}" arg2="1.4"/> -+ <equals arg1="${ant.java.version}" arg2="1.5"/> -+ <equals arg1="${ant.java.version}" arg2="1.6"/> -+ <equals arg1="${ant.java.version}" arg2="1.7"/> -+ <equals arg1="${ant.java.version}" arg2="1.8"/> -+ </or> -+ </not> -+ </condition> -+ - <!-- ========== Compiler Defaults ========================================= --> - - -@@ -421,7 +438,7 @@ - </target> - - -- <target name="test" depends="compile.tests,test.main,test.routines" -+ <target name="test" depends="compile.tests,test.main,test.routines,test.routines.java9" - description="Run all unit test cases"> - </target> - -@@ -436,11 +453,22 @@ - </target> - - <target name="test.routines" depends="compile.tests" -- description="Run routines unit test cases"> -- <echo message="Running routines tests ..."/> -+ description="Run routines unit test cases" unless="isJava9"> -+ <echo message="Running routines tests ..."/> -+ <java classname="${test.runner}" fork="yes" -+ failonerror="${test.failonerror}"> -+ <arg value="org.apache.commons.validator.routines.RoutinesTestSuite"/> -+ <classpath refid="test.classpath"/> -+ </java> -+ </target> -+ -+ <target name="test.routines.java9" depends="compile.tests" -+ description="Run routines unit test cases with Java 9+" if="isJava9"> -+ <echo message="Running routines tests with Java 9+ ..."/> - <java classname="${test.runner}" fork="yes" - failonerror="${test.failonerror}"> - <arg value="org.apache.commons.validator.routines.RoutinesTestSuite"/> -+ <sysproperty key="java.locale.providers" value="COMPAT,SPI"/> - <classpath refid="test.classpath"/> - </java> - </target> +--- commons-validator-1.5.0-src/build.xml 2015-11-19 00:52:34.000000000 +0100 ++++ commons-validator-1.5.0-src/build.xml 2018-12-21 14:54:10.838397098 +0100 +@@ -109,6 +109,23 @@ + <!-- Download lib dir --> + <property name="download.lib.dir" value="lib"/> + ++<!-- ========== Test Java Version ========================================= --> ++ ++ <condition property="isJava9"> ++ <not> ++ <or> ++ <equals arg1="${ant.java.version}" arg2="1.1"/> ++ <equals arg1="${ant.java.version}" arg2="1.2"/> ++ <equals arg1="${ant.java.version}" arg2="1.3"/> ++ <equals arg1="${ant.java.version}" arg2="1.4"/> ++ <equals arg1="${ant.java.version}" arg2="1.5"/> ++ <equals arg1="${ant.java.version}" arg2="1.6"/> ++ <equals arg1="${ant.java.version}" arg2="1.7"/> ++ <equals arg1="${ant.java.version}" arg2="1.8"/> ++ </or> ++ </not> ++ </condition> ++ + <!-- ========== Compiler Defaults ========================================= --> + + +@@ -323,7 +340,7 @@ + </target> + + +- <target name="test" depends="compile.tests,test.main,test.checkdigit,test.routines" ++ <target name="test" depends="compile.tests,test.main,test.checkdigit,test.routines,test.routines.java9" + description="Run all unit test cases"> + </target> + +@@ -364,7 +381,25 @@ + </target> + + <target name="test.routines" depends="compile.tests" +- description="Run routines unit test cases"> ++ description="Run routines unit test cases" unless="isJava9"> ++ <echo message="Running routines tests ..."/> ++ ++ <junit fork="yes" forkmode="once" printsummary="yes" ++ haltonfailure="${test.failonerror}" ++ failureproperty="main.test.failed" showoutput="true"> ++ <classpath refid="test.classpath"/> ++ <formatter type="plain"/> ++ <batchtest todir="${test.results.dir}"> ++ <fileset dir="${test.home}/java"> ++ <include name="org/apache/commons/validator/routines/*Test.java" /> ++ <exclude name="**/Abstract*Test.java" /> ++ </fileset> ++ </batchtest> ++ </junit> ++ </target> ++ ++ <target name="test.routines.java9" depends="compile.tests" ++ description="Run routines unit test cases with Java 9+" if="isJava9"> + <echo message="Running routines tests ..."/> + + <junit fork="yes" forkmode="once" printsummary="yes" +@@ -372,6 +407,7 @@ + failureproperty="main.test.failed" showoutput="true"> + <classpath refid="test.classpath"/> + <formatter type="plain"/> ++ <sysproperty key="java.locale.providers" value="COMPAT,SPI"/> + <batchtest todir="${test.results.dir}"> + <fileset dir="${test.home}/java"> + <include name="org/apache/commons/validator/routines/*Test.java" /> ++++++ commons-validator-1.3.1-src.tar.gz -> commons-validator-1.5.0-src.tar.gz ++++++ ++++ 70306 lines of diff (skipped) ++++++ commons-validator-1.3.1-srcencoding.patch -> commons-validator-1.5.0-srcencoding.patch ++++++ --- /work/SRC/openSUSE:Factory/apache-commons-validator/commons-validator-1.3.1-srcencoding.patch 2014-06-30 22:49:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache-commons-validator.new.28833/commons-validator-1.5.0-srcencoding.patch 2019-01-24 14:12:29.479426425 +0100 @@ -1,12 +1,51 @@ -diff -up commons-validator-1.3.1-src/src/test/org/apache/commons/validator/EmailTest.java~ commons-validator-1.3.1-src/src/test/org/apache/commons/validator/EmailTest.java ---- commons-validator-1.3.1-src/src/test/org/apache/commons/validator/EmailTest.java~ 2006-11-29 00:31:49.000000000 +0200 -+++ commons-validator-1.3.1-src/src/test/org/apache/commons/validator/EmailTest.java 2012-01-14 12:40:40.709092267 +0200 -@@ -385,7 +385,7 @@ public class EmailTest extends TestCommo - new TestPair("abigail@", false), - new TestPair("@example.com", false), - new TestPair("phrase: abig...@example.com abig...@example.com ;", false), -- new TestPair("invalid�c...@example.com", false) -+ new TestPair("invalid\u00a3c...@example.com", false) - }; - - /** +--- commons-validator-1.5.0-src/build.xml 2015-11-19 00:52:34.000000000 +0100 ++++ commons-validator-1.5.0-src/build.xml 2018-12-21 10:48:58.650031637 +0100 +@@ -209,6 +209,7 @@ + description="Compile shareable components"> + <javac srcdir="${source.home}" + destdir="${build.home}/classes" ++ encoding="utf-8" + source="${compile.source}" + target="${compile.target}" + debug="${compile.debug}" +@@ -247,8 +248,10 @@ + + <target name="javadoc" depends="compile" + description="Create component Javadoc documentation"> +- <!--javadoc sourcepath="${source.home}" ++ <javadoc sourcepath="${source.home}" + destdir="${dist.home}/docs/apidocs" ++ encoding="utf-8" ++ source="${compile.source}" + packagenames="org.apache.commons.*" + author="true" + private="true" +@@ -256,7 +259,7 @@ + doctitle="<h1>${component.title} (Version ${component.version})</h1>" + windowtitle="${component.title} (Version ${component.version})" + bottom="Copyright (c) 2001-2004 Apache Software Foundation" +- classpathref="compile.classpath" / --> ++ classpathref="compile.classpath"/> + </target> + + +@@ -312,6 +315,9 @@ + description="Compile unit test cases"> + <javac srcdir="${test.home}/java" + destdir="${build.home}/tests" ++ encoding="utf-8" ++ source="${compile.source}" ++ target="${compile.target}" + debug="${compile.debug}" + deprecation="${compile.deprecation}" + optimize="${compile.optimize}"> +@@ -394,6 +400,9 @@ + description="Compile example application"> + <javac srcdir="${example.home}" + destdir="${build.home}/example" ++ encoding="utf-8" ++ source="${compile.source}" ++ target="${compile.target}" + debug="${compile.debug}" + deprecation="${compile.deprecation}" + optimize="${compile.optimize}">