Hello community, here is the log from the commit of package ant for openSUSE:Leap:15.2 checked in at 2020-02-05 07:28:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ant (Old) and /work/SRC/openSUSE:Leap:15.2/.ant.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant" Wed Feb 5 07:28:49 2020 rev:27 rq:764373 version:1.10.7 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ant/ant-antlr.changes 2020-01-15 14:46:54.705274388 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ant.new.26092/ant-antlr.changes 2020-02-05 07:28:50.182731979 +0100 @@ -1,0 +2,142 @@ +Tue Jan 14 07:03:37 UTC 2020 - Fridrich Strba <[email protected]> + +- Use xml-commons-apis-bootstrap as jar in classpath instead of + the common xml-apis jar, since we are forcing build against + the bootstrap package + +------------------------------------------------------------------- +Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 1.10.7 +- Modified patches: + * apache-ant-bootstrap.patch + * apache-ant-no-test-jar.patch + * apache-ant-xml-apis.patch + * reproducible-build-manifest.patch + + rediff +- Fix ant-xz.jar to be non-empty and split it from the ant-antlr + package + +------------------------------------------------------------------- +Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <[email protected]> + +- Build against the new compatibility packages log4j12/log4j12-mini + +------------------------------------------------------------------- +Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba <[email protected]> + +- Remove references to parent poms from all artifacts and do not + distribute the ant-parent, since we don't need it + +------------------------------------------------------------------- +Tue Apr 9 10:48:23 UTC 2019 - Fridrich Strba <[email protected]> + +- Require directly xerces-j2 and not its virtual provide + jaxp_parser_impl + +------------------------------------------------------------------- +Mon Mar 18 17:30:12 UTC 2019 - Jan Engelhardt <[email protected]> + +- Make "if" statements in build recipe POSIX sh compatible. + +------------------------------------------------------------------- +Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <[email protected]> + +- Create an ant-junit5 package to build junit5 optional tasks + when they become resolved +- Add a simple pom file for ant-bootstrap.jar + +------------------------------------------------------------------- +Fri Feb 8 07:26:44 UTC 2019 - Fridrich Strba <[email protected]> + +- Add compatibility links ant/ant*.jar for bootstrap build + +------------------------------------------------------------------- +Tue Feb 5 09:49:54 UTC 2019 - Fridrich Strba <[email protected]> + +- BuildRequire hamcrest for ant-junit and ant-antlr, since junit4 + depends strictly on hamcrest-core only. + +------------------------------------------------------------------- +Fri Feb 1 16:19:10 UTC 2019 - Fridrich Strba <[email protected]> + +- Build ant against xml-commons-apis-bootstrap and + xml-commons-resolver-bootstrap in order to break build cycle + +------------------------------------------------------------------- +Mon Dec 10 08:22:18 UTC 2018 - Fridrich Strba <[email protected]> + +- Don't build against a particular xml-apis/xml-resolver provider, + but against the generic virtual provider. This allows easier + bootstrapping. +- Added patch: + * apache-ant-xml-apis.patch + + look for the xml-apis.jar and xml-resolver.jar when composing + classpath; they are symlinks provided by several packages. + +------------------------------------------------------------------- +Mon Nov 26 08:07:13 UTC 2018 - Fridrich Strba <[email protected]> + +- Let ant-antlr provide ant-xz too, since it contains the + corresponding jar. + +------------------------------------------------------------------- +Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba <[email protected]> + +- Add aliases to some maven artifacts so that packages out there + resolve then correctly + +------------------------------------------------------------------- +Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <[email protected]> + +- Update to 1.10.5 [bsc#1113136] + * Same version as in 1.9.13 but with additional features and + requires Java8 or higher. + * Dropped patch to build with java8+ already fixed in this version + - apache-ant-1.9.9-sourcetarget.patch + * Refreshed patch: + - apache-ant-class-path-in-manifest.patch + +------------------------------------------------------------------- +Sun Oct 21 08:08:23 UTC 2018 - [email protected] + +- Add reproducible-build-manifest.patch: Use less detailed version + string for manifest's "Created-by" field (boo#1110024). + +------------------------------------------------------------------- +Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba <[email protected]> + +- Require javapackages-local in order to generate correctly the + maven requires and provides +- Install maven artifacts + +------------------------------------------------------------------- +Fri Aug 24 20:20:20 UTC 2018 - Jason Sikes <[email protected]> + +- Update to 1.9.13 + * Fixes a regression in the "get" task where redirects + from a HTTP resource to a HTTPS resource started throwing + an exception. + Bugzilla Report 62499 + + * the new allowFilesToEscapeDest didn't work when set to false and + archive entries contained relative paths with so many ".." + segnments that the resulting path would go beyond the file system + root. + Bugzilla Report 62502, bsc#1100053, CVE-2018-10886 + +------------------------------------------------------------------- +Tue May 15 05:02:22 UTC 2018 - [email protected] + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility +- Modified patch: + * apache-ant-1.9.9-sourcetarget.patch + - Build with source/target 8 + +------------------------------------------------------------------- +Fri Feb 23 10:24:31 UTC 2018 - [email protected] + +- fix build error for Leap 42.3 + +------------------------------------------------------------------- ant-junit.changes: same change New Changes file: --- /dev/null 2019-12-19 10:12:34.003146842 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ant.new.26092/ant-junit5.changes 2020-02-05 07:28:50.354732052 +0100 @@ -0,0 +1,765 @@ +------------------------------------------------------------------- +Tue Jan 14 07:03:37 UTC 2020 - Fridrich Strba <[email protected]> + +- Use xml-commons-apis-bootstrap as jar in classpath instead of + the common xml-apis jar, since we are forcing build against + the bootstrap package + +------------------------------------------------------------------- +Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 1.10.7 +- Modified patches: + * apache-ant-bootstrap.patch + * apache-ant-no-test-jar.patch + * apache-ant-xml-apis.patch + * reproducible-build-manifest.patch + + rediff +- Fix ant-xz.jar to be non-empty and split it from the ant-antlr + package + +------------------------------------------------------------------- +Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <[email protected]> + +- Build against the new compatibility packages log4j12/log4j12-mini + +------------------------------------------------------------------- +Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba <[email protected]> + +- Remove references to parent poms from all artifacts and do not + distribute the ant-parent, since we don't need it + +------------------------------------------------------------------- +Tue Apr 9 10:48:23 UTC 2019 - Fridrich Strba <[email protected]> + +- Require directly xerces-j2 and not its virtual provide + jaxp_parser_impl + +------------------------------------------------------------------- +Mon Mar 18 17:30:12 UTC 2019 - Jan Engelhardt <[email protected]> + +- Make "if" statements in build recipe POSIX sh compatible. + +------------------------------------------------------------------- +Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <[email protected]> + +- Create an ant-junit5 package to build junit5 optional tasks + when they become resolved +- Add a simple pom file for ant-bootstrap.jar + +------------------------------------------------------------------- +Fri Feb 8 07:26:44 UTC 2019 - Fridrich Strba <[email protected]> + +- Add compatibility links ant/ant*.jar for bootstrap build + +------------------------------------------------------------------- +Tue Feb 5 09:49:54 UTC 2019 - Fridrich Strba <[email protected]> + +- BuildRequire hamcrest for ant-junit and ant-antlr, since junit4 + depends strictly on hamcrest-core only. + +------------------------------------------------------------------- +Fri Feb 1 16:19:10 UTC 2019 - Fridrich Strba <[email protected]> + +- Build ant against xml-commons-apis-bootstrap and + xml-commons-resolver-bootstrap in order to break build cycle + +------------------------------------------------------------------- +Mon Dec 10 08:22:18 UTC 2018 - Fridrich Strba <[email protected]> + +- Don't build against a particular xml-apis/xml-resolver provider, + but against the generic virtual provider. This allows easier + bootstrapping. +- Added patch: + * apache-ant-xml-apis.patch + + look for the xml-apis.jar and xml-resolver.jar when composing + classpath; they are symlinks provided by several packages. + +------------------------------------------------------------------- +Mon Nov 26 08:07:13 UTC 2018 - Fridrich Strba <[email protected]> + +- Let ant-antlr provide ant-xz too, since it contains the + corresponding jar. + +------------------------------------------------------------------- +Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba <[email protected]> + +- Add aliases to some maven artifacts so that packages out there + resolve then correctly + +------------------------------------------------------------------- +Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <[email protected]> + +- Update to 1.10.5 [bsc#1113136] + * Same version as in 1.9.13 but with additional features and + requires Java8 or higher. + * Dropped patch to build with java8+ already fixed in this version + - apache-ant-1.9.9-sourcetarget.patch + * Refreshed patch: + - apache-ant-class-path-in-manifest.patch + +------------------------------------------------------------------- +Sun Oct 21 08:08:23 UTC 2018 - [email protected] + +- Add reproducible-build-manifest.patch: Use less detailed version + string for manifest's "Created-by" field (boo#1110024). + +------------------------------------------------------------------- +Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba <[email protected]> + +- Require javapackages-local in order to generate correctly the + maven requires and provides +- Install maven artifacts + +------------------------------------------------------------------- +Fri Aug 24 20:20:20 UTC 2018 - Jason Sikes <[email protected]> + +- Update to 1.9.13 + * Fixes a regression in the "get" task where redirects + from a HTTP resource to a HTTPS resource started throwing + an exception. + Bugzilla Report 62499 + + * the new allowFilesToEscapeDest didn't work when set to false and + archive entries contained relative paths with so many ".." + segnments that the resulting path would go beyond the file system + root. + Bugzilla Report 62502, bsc#1100053, CVE-2018-10886 + +------------------------------------------------------------------- +Tue May 15 05:02:22 UTC 2018 - [email protected] + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility +- Modified patch: + * apache-ant-1.9.9-sourcetarget.patch + - Build with source/target 8 + +------------------------------------------------------------------- +Fri Feb 23 10:24:31 UTC 2018 - [email protected] + +- fix build error for Leap 42.3 + +------------------------------------------------------------------- +Thu Feb 22 11:43:31 UTC 2018 - [email protected] + +- Add patch to run scripts with python3 if applicable bsc#1082202: + * ant-python3.patch + +------------------------------------------------------------------- +Thu Feb 22 11:26:23 UTC 2018 - [email protected] + +- Update to 1.9.10: + * Various fixes for java10 + * Small fixes all around +- Remove merged patch reproducible.patch + +------------------------------------------------------------------- +Sat Oct 28 16:17:19 UTC 2017 - [email protected] + +- Simply use find -delete over xargs. +- Make description neutral. + +------------------------------------------------------------------- +Tue Oct 24 11:26:36 UTC 2017 - [email protected] + +- Add reproducible-build-date.patch to allow to have fixed build dates + to make other packages build more reproducibly + +------------------------------------------------------------------- +Wed Oct 4 09:07:19 UTC 2017 - [email protected] + +- Remove dependency on java-1_5_0-gcj-compat-devel and build even + the bootstrap package with java source and target 1.6 + +------------------------------------------------------------------- +Fri Sep 29 07:06:59 UTC 2017 - [email protected] + +- Don't condition the maven defines on release version, but on + _maven_repository being defined + +------------------------------------------------------------------- +Thu Sep 14 05:39:48 UTC 2017 - [email protected] + +- Allow bootstrapping with something else then + java-1_5_0-gcj-compat, but still require + java-1_5_0-gcj-compat-devel +- Added patch: + * apache-ant-bootstrap.patch + - Add -sourcepath option to fix build breakages with Eclipse + Compiler for Java(tm) + +------------------------------------------------------------------- +Wed Sep 6 17:49:21 UTC 2017 - [email protected] + +- Added patch: + * apache-ant-1.9.9-sourcetarget.patch + + Change java source and target versions to 1.6 to allow build ++++ 568 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Leap:15.2/.ant.new.26092/ant-junit5.changes --- /work/SRC/openSUSE:Leap:15.2/ant/ant.changes 2020-01-15 14:46:54.869274510 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ant.new.26092/ant.changes 2020-02-05 07:28:50.434732086 +0100 @@ -2 +2 @@ -Thu Aug 16 12:59:11 UTC 2018 - [email protected] +Tue Jan 14 07:03:37 UTC 2020 - Fridrich Strba <[email protected]> @@ -4,3 +4,138 @@ -- Add security patch to handle malformed zip file paths bsc#1100053: - * apache-ant-unzip-path.patch - * CVE-2018-10886 +- Use xml-commons-apis-bootstrap as jar in classpath instead of + the common xml-apis jar, since we are forcing build against + the bootstrap package + +------------------------------------------------------------------- +Fri Nov 8 11:15:20 UTC 2019 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 1.10.7 +- Modified patches: + * apache-ant-bootstrap.patch + * apache-ant-no-test-jar.patch + * apache-ant-xml-apis.patch + * reproducible-build-manifest.patch + + rediff +- Fix ant-xz.jar to be non-empty and split it from the ant-antlr + package + +------------------------------------------------------------------- +Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <[email protected]> + +- Build against the new compatibility packages log4j12/log4j12-mini + +------------------------------------------------------------------- +Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba <[email protected]> + +- Remove references to parent poms from all artifacts and do not + distribute the ant-parent, since we don't need it + +------------------------------------------------------------------- +Tue Apr 9 10:48:23 UTC 2019 - Fridrich Strba <[email protected]> + +- Require directly xerces-j2 and not its virtual provide + jaxp_parser_impl + +------------------------------------------------------------------- +Mon Mar 18 17:30:12 UTC 2019 - Jan Engelhardt <[email protected]> + +- Make "if" statements in build recipe POSIX sh compatible. + +------------------------------------------------------------------- +Fri Feb 8 08:51:41 UTC 2019 - Fridrich Strba <[email protected]> + +- Create an ant-junit5 package to build junit5 optional tasks + when they become resolved +- Add a simple pom file for ant-bootstrap.jar + +------------------------------------------------------------------- +Fri Feb 8 07:26:44 UTC 2019 - Fridrich Strba <[email protected]> + +- Add compatibility links ant/ant*.jar for bootstrap build + +------------------------------------------------------------------- +Tue Feb 5 09:49:54 UTC 2019 - Fridrich Strba <[email protected]> + +- BuildRequire hamcrest for ant-junit and ant-antlr, since junit4 + depends strictly on hamcrest-core only. + +------------------------------------------------------------------- +Fri Feb 1 16:19:10 UTC 2019 - Fridrich Strba <[email protected]> + +- Build ant against xml-commons-apis-bootstrap and + xml-commons-resolver-bootstrap in order to break build cycle + +------------------------------------------------------------------- +Mon Dec 10 08:22:18 UTC 2018 - Fridrich Strba <[email protected]> + +- Don't build against a particular xml-apis/xml-resolver provider, + but against the generic virtual provider. This allows easier + bootstrapping. +- Added patch: + * apache-ant-xml-apis.patch + + look for the xml-apis.jar and xml-resolver.jar when composing + classpath; they are symlinks provided by several packages. + +------------------------------------------------------------------- +Mon Nov 26 08:07:13 UTC 2018 - Fridrich Strba <[email protected]> + +- Let ant-antlr provide ant-xz too, since it contains the + corresponding jar. + +------------------------------------------------------------------- +Wed Oct 31 10:20:23 UTC 2018 - Fridrich Strba <[email protected]> + +- Add aliases to some maven artifacts so that packages out there + resolve then correctly + +------------------------------------------------------------------- +Fri Oct 26 09:54:04 UTC 2018 - Pedro Monreal Gonzalez <[email protected]> + +- Update to 1.10.5 [bsc#1113136] + * Same version as in 1.9.13 but with additional features and + requires Java8 or higher. + * Dropped patch to build with java8+ already fixed in this version + - apache-ant-1.9.9-sourcetarget.patch + * Refreshed patch: + - apache-ant-class-path-in-manifest.patch + +------------------------------------------------------------------- +Sun Oct 21 08:08:23 UTC 2018 - [email protected] + +- Add reproducible-build-manifest.patch: Use less detailed version + string for manifest's "Created-by" field (boo#1110024). + +------------------------------------------------------------------- +Wed Oct 17 19:40:22 UTC 2018 - Fridrich Strba <[email protected]> + +- Require javapackages-local in order to generate correctly the + maven requires and provides +- Install maven artifacts + +------------------------------------------------------------------- +Fri Aug 24 20:20:20 UTC 2018 - Jason Sikes <[email protected]> + +- Update to 1.9.13 + * Fixes a regression in the "get" task where redirects + from a HTTP resource to a HTTPS resource started throwing + an exception. + Bugzilla Report 62499 + + * the new allowFilesToEscapeDest didn't work when set to false and + archive entries contained relative paths with so many ".." + segnments that the resulting path would go beyond the file system + root. + Bugzilla Report 62502, bsc#1100053, CVE-2018-10886 + +------------------------------------------------------------------- +Tue May 15 05:02:22 UTC 2018 - [email protected] + +- Build with source and target 8 to prepare for a possible removal + of 1.6 compatibility +- Modified patch: + * apache-ant-1.9.9-sourcetarget.patch + - Build with source/target 8 + +------------------------------------------------------------------- +Fri Feb 23 10:24:31 UTC 2018 - [email protected] + +- fix build error for Leap 42.3 Old: ---- apache-ant-1.9.10-src.tar.bz2 apache-ant-1.9.10-src.tar.bz2.asc apache-ant-1.9.9-sourcetarget.patch apache-ant-unzip-path.patch New: ---- ant-bootstrap.pom.in ant-junit5.changes ant-junit5.spec apache-ant-1.10.7-src.tar.bz2 apache-ant-1.10.7-src.tar.bz2.asc apache-ant-xml-apis.patch reproducible-build-manifest.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ ++++ 624 lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/ant/ant-antlr.spec ++++ and /work/SRC/openSUSE:Leap:15.2/.ant.new.26092/ant-antlr.spec ant-junit.spec: same change ++++++ ant-junit5.spec ++++++ ++++ 749 lines (skipped) ++++++ ant.spec ++++++ ++++ 625 lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/ant/ant.spec ++++ and /work/SRC/openSUSE:Leap:15.2/.ant.new.26092/ant.spec ++++++ ant-bootstrap.pom.in ++++++ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <url>http://ant.apache.org/</url> <groupId>org.apache.ant</groupId> <artifactId>ant-bootstrap</artifactId> <version>@VERSION@</version> </project> ++++++ ant.keyring ++++++ ++++ 1584 lines (skipped) ++++ between /work/SRC/openSUSE:Leap:15.2/ant/ant.keyring ++++ and /work/SRC/openSUSE:Leap:15.2/.ant.new.26092/ant.keyring ++++++ apache-ant-1.9.10-src.tar.bz2 -> apache-ant-1.10.7-src.tar.bz2 ++++++ ++++ 264066 lines of diff (skipped) ++++++ apache-ant-bootstrap.patch ++++++ --- /var/tmp/diff_new_pack.QqdeU0/_old 2020-02-05 07:28:54.474733786 +0100 +++ /var/tmp/diff_new_pack.QqdeU0/_new 2020-02-05 07:28:54.474733786 +0100 @@ -1,13 +1,11 @@ -Index: apache-ant-1.9.10/bootstrap.sh -=================================================================== ---- apache-ant-1.9.10.orig/bootstrap.sh -+++ apache-ant-1.9.10/bootstrap.sh -@@ -129,7 +129,7 @@ mkdir -p bin +--- apache-ant-1.10.7/bootstrap.sh 2019-09-01 08:14:10.000000000 +0200 ++++ apache-ant-1.10.7/bootstrap.sh 2019-10-12 12:34:23.892369973 +0200 +@@ -143,7 +143,7 @@ + echo ... Compiling Ant Classes with ${JAVAC_RELEASE_VERSION} + fi - echo ... Compiling Ant Classes - --"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \ -+"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} -sourcepath src/main ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \ +-"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} ${JAVAC_RELEASE_VERSION} \ ++"${JAVAC}" $BOOTJAVAC_OPTS -d ${CLASSDIR} -sourcepath src/main ${JAVAC_RELEASE_VERSION} \ + ${TOOLS}/bzip2/*.java ${TOOLS}/tar/*.java ${TOOLS}/zip/*.java \ ${TOOLS}/ant/util/regexp/RegexpMatcher.java \ ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \ - ${TOOLS}/ant/property/*.java \ ++++++ apache-ant-class-path-in-manifest.patch ++++++ --- /var/tmp/diff_new_pack.QqdeU0/_old 2020-02-05 07:28:54.482733790 +0100 +++ /var/tmp/diff_new_pack.QqdeU0/_new 2020-02-05 07:28:54.482733790 +0100 @@ -2,14 +2,12 @@ =================================================================== --- build.xml.orig +++ build.xml -@@ -724,10 +724,6 @@ - <include name="LICENSE.txt"/> - <include name="NOTICE.txt"/> +@@ -719,7 +719,7 @@ </metainf> -- <manifest> -- <attribute name="Class-Path" -- value="ant.jar xalan.jar"/> -- </manifest> + <manifest> + <attribute name="Main-Class" value="org.apache.tools.ant.Main"/> +- <attribute name="Class-Path" value="ant.jar xalan.jar"/> ++ <!-- <attribute name="Class-Path" value="ant.jar xalan.jar"/> --> + </manifest> </jar> - <macrodef name="optional-jar"> ++++++ apache-ant-no-test-jar.patch ++++++ --- /var/tmp/diff_new_pack.QqdeU0/_old 2020-02-05 07:28:54.486733792 +0100 +++ /var/tmp/diff_new_pack.QqdeU0/_new 2020-02-05 07:28:54.490733794 +0100 @@ -1,17 +1,11 @@ ---- - build.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: apache-ant-1.9.10/build.xml -=================================================================== ---- apache-ant-1.9.10.orig/build.xml -+++ apache-ant-1.9.10/build.xml -@@ -878,7 +878,7 @@ +--- apache-ant-1.10.7/build.xml 2019-09-01 08:14:10.000000000 +0200 ++++ apache-ant-1.10.7/build.xml 2019-10-12 12:30:11.014986025 +0200 +@@ -976,7 +976,7 @@ Create the essential distribution that can run Apache Ant =================================================================== --> -- <target name="dist-lite" depends="jars,test-jar" -+ <target name="dist-lite" depends="jars" +- <target name="dist-lite" depends="jars,test-jar,-ant-dist-warn-jdk9+" ++ <target name="dist-lite" depends="jars,-ant-dist-warn-jdk9+" description="--> creates a minimum distribution to run Apache Ant"> <mkdir dir="${dist.dir}"/> ++++++ apache-ant-xml-apis.patch ++++++ --- apache-ant-1.10.5/src/script/ant 2018-07-10 06:50:31.000000000 +0200 +++ apache-ant-1.10.5/src/script/ant 2018-12-10 09:12:59.451126724 +0100 @@ -206,7 +206,7 @@ # request optional jars and their dependencies via the OPT_JAR_LIST # variable if $rpm_mode && [ -x /usr/bin/build-classpath ]; then - LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher jaxp_parser_impl xml-commons-apis)" + LOCALCLASSPATH="$(/usr/bin/build-classpath ant ant-launcher)" # If no optional jars have been specified then build the default list if [ -z "$OPT_JAR_LIST" ]; then ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.QqdeU0/_old 2020-02-05 07:28:54.502733798 +0100 +++ /var/tmp/diff_new_pack.QqdeU0/_new 2020-02-05 07:28:54.502733798 +0100 @@ -8,8 +8,15 @@ cp ant.changes ant-antlr.changes sed "s/^%bcond_without bootstrap$/${EDIT_WARNING}%bcond_with bootstrap/; s/^%bcond_with junit/%bcond_without junit/; + s/^%bcond_without junit5/%bcond_with junit5/; s/^\(Name:.*\)$/\1-junit/; 0,/^Summary:.*/{s/^Summary:.*/Summary: Optional junit tasks for ant/}; " < ant.spec > ant-junit.spec cp ant.changes ant-junit.changes +sed "s/^%bcond_without bootstrap$/${EDIT_WARNING}%bcond_with bootstrap/; + s/^%bcond_with junit5/%bcond_without junit5/; + s/^\(Name:.*\)$/\1-junit5/; + 0,/^Summary:.*/{s/^Summary:.*/Summary: Optional junit tasks for ant/}; + " < ant.spec > ant-junit5.spec +cp ant.changes ant-junit5.changes ++++++ reproducible-build-manifest.patch ++++++ Use Java major version for manifest's Created-by No need of detailed version such java.vm.version. Java's jar command uses java.version when it fills the manifest's "Created-by" field, let's make ant do the same. Using a detailed version makes that every Java release triggers a new publication for ant-based applications, only because a line in manifest has changed - not because the binary or dependencies have changed. Using a less detailed version reduces these publications. Using a less detailed version also prevents more subtle problems such as in boo#1110024: noarch packages differ depending on the builder architecture, when Java vm version contains an architecture information (which is the case for openSUSE, though it's probably not relevant). -- --- a/src/main/org/apache/tools/ant/taskdefs/Manifest.java +++ b/src/main/org/apache/tools/ant/taskdefs/Manifest.java @@ -760,10 +760,7 @@ defManifest); } Manifest defaultManifest = new Manifest(new InputStreamReader(in, JAR_CHARSET)); - String version = System.getProperty("java.runtime.version"); - if (version == null) { - version = System.getProperty("java.vm.version"); - } + String version = System.getProperty("java.version"); Attribute createdBy = new Attribute("Created-By", version + " (" + System.getProperty("java.vm.vendor") + ")"); defaultManifest.getMainSection().storeAttribute(createdBy);
