Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2019-03-01 20:25:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant (Old) and /work/SRC/openSUSE:Factory/.ant.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant" Fri Mar 1 20:25:15 2019 rev:76 rq:679454 version:1.10.5 Changes: -------- --- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2019-02-11 21:16:06.383377991 +0100 +++ /work/SRC/openSUSE:Factory/.ant.new.28833/ant-antlr.changes 2019-03-01 20:25:18.274070475 +0100 @@ -1,0 +2,7 @@ +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 + +------------------------------------------------------------------- ant-junit.changes: same change New Changes file: --- /dev/null 2018-10-29 14:05:42.522318975 +0100 +++ /work/SRC/openSUSE:Factory/.ant.new.28833/ant-junit5.changes 2019-03-01 20:25:18.554070410 +0100 @@ -0,0 +1,723 @@ +------------------------------------------------------------------- +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 + with jdk9 +- For non-boostrap builds require java-devel >= 1.6 + +------------------------------------------------------------------- +Fri Jun 9 09:05:31 UTC 2017 - [email protected] + +- Do not generate poms on ant core packages to reduce deps and + allow bootstrap + +------------------------------------------------------------------- +Wed May 31 13:35:49 UTC 2017 - [email protected] + +- Fix bootstrap to avoid new cycle bsc#1041966 + +------------------------------------------------------------------- +Fri May 19 08:08:28 UTC 2017 - [email protected] + +- Disable javadoc completely it is on the web in much better form +- Remove if0 conditions +- Remove patch apache-ant-old-gcj-build.patch for sle11 and unused +- Fix build with split javapackages-tools + +------------------------------------------------------------------- +Mon May 8 20:05:59 UTC 2017 - [email protected] + +- Version bump to 1.9.9: + * Read WHATSNEW file for full changelist + +------------------------------------------------------------------- +Mon May 8 07:43:51 UTC 2017 - [email protected] + +- Add reproducible.patch to allow reproducible builds of ant itself + and packages built with ant like jcodings + +------------------------------------------------------------------- +Mon Feb 20 10:12:01 UTC 2017 - [email protected] + +- Revert the previous change as it broke the build of most java + software stack + +------------------------------------------------------------------- +Mon Feb 13 15:54:30 UTC 2017 - [email protected] ++++ 526 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:Factory/.ant.new.28833/ant-junit5.changes --- /work/SRC/openSUSE:Factory/ant/ant.changes 2019-02-11 21:16:06.487377936 +0100 +++ /work/SRC/openSUSE:Factory/.ant.new.28833/ant.changes 2019-03-01 20:25:18.654070387 +0100 @@ -1,0 +2,7 @@ +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 + +------------------------------------------------------------------- New: ---- ant-bootstrap.pom.in ant-junit5.changes ant-junit5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.GDHbj6/_old 2019-03-01 20:25:19.462070197 +0100 +++ /var/tmp/diff_new_pack.GDHbj6/_new 2019-03-01 20:25:19.462070197 +0100 @@ -22,6 +22,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! ##### %bcond_with bootstrap %bcond_with junit +%bcond_with junit5 %bcond_without antlr Name: ant-antlr Version: 1.10.5 @@ -32,6 +33,7 @@ URL: http://ant.apache.org/ Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 Source1: apache-ant-1.8.ant.conf +Source10: ant-bootstrap.pom.in Source1000: pre_checkin.sh Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc Source1002: ant.keyring @@ -55,7 +57,7 @@ %if !%{with bootstrap} BuildRequires: javapackages-local %endif -%if %{with junit} || %{with antlr} +%if %{with junit} || %{with antlr} || %{with junit5} BuildRequires: ant = %{version} BuildRequires: hamcrest BuildRequires: junit @@ -64,6 +66,10 @@ %if %{with antlr} BuildRequires: xerces-j2 %endif +%if %{with junit5} +BuildRequires: apiguardian +BuildRequires: junit5 +%endif %if 0%{?suse_version} > 1320 BuildRequires: strip-nondeterminism %endif @@ -91,11 +97,20 @@ Requires: junit4 %requires_eq ant %endif +%if %{with junit5} +Requires: junit5 +%requires_eq ant +%endif %if %{with junit} %description Apache Ant is a Java-based build tool. This package contains optional JUnit tasks for Apache Ant. +%elif %{with junit5} +%description +Apache Ant is a Java-based build tool. + +This package contains optional JUnit5 tasks for Apache Ant. %else %description Apache Ant is a Java-based build tool. In theory, it is kind of like @@ -357,9 +372,12 @@ %endif #install jars -%if %{with junit} +%if %{with junit} || %{with junit5} build-jar-repository -s -p lib/optional junit4 %endif +%if %{with junit5} +build-jar-repository -s -p lib/optional junit5 opentest4j +%endif %if %{with antlr} # we need to build junit in antlr, but we remove it later build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver @@ -375,7 +393,7 @@ %build export OPT_JAR_LIST=: -%if %{with antlr} || %{with junit} +%if %{with antlr} || %{with junit} || %{with junit5} ant -Dbuild.sysclasspath=first jars test-jar #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. @@ -398,11 +416,18 @@ install -d -m 755 %{buildroot}%{_javadir}/ant install -d -m 755 %{buildroot}%{_mavenpomdir} -%if ! %{with junit} -rm build/lib/ant-junit*.jar +%if %{without junit} && %{without junit5} + rm build/lib/ant-junit*.jar %else -# remove all others -for i in build/lib/ant-*.jar ; do + %if %{without junit} + rm build/lib/ant-junit.jar + rm build/lib/ant-junit4.jar + %else + # empty in this scenario + rm build/lib/ant-junitlauncher.jar + %endif + # remove all others + for i in build/lib/ant-*.jar ; do case $i in */ant-junit*) ;; @@ -410,7 +435,7 @@ rm -v $i ;; esac -done + done %endif for jar in build/lib/*.jar @@ -452,12 +477,19 @@ ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar #bootstrap does not have a pom - [ $jarname == ant-bootstrap ] && continue + if [ $jarname == ant-bootstrap ]; then + mkdir -p src/etc/poms/${jarname} + sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml + fi #install pom install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} if [ $jarname == ant-launcher ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher + elif [ $jarname == ant-jmf ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf + elif [ $jarname == ant-swing ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing elif [ $jarname == ant ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant else @@ -510,6 +542,10 @@ echo "junit4 ant/ant-junit4" > %{buildroot}%{_sysconfdir}/ant.d/junit4 %endif +%if %{with junit5} +echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > %{buildroot}%{_sysconfdir}/ant.d/junitlauncher +%endif + %if %{with antlr} echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf @@ -549,15 +585,13 @@ done popd -%files +%files -f .mfiles %license LICENSE NOTICE %doc KEYS README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun -%{_javadir}/%{name}.jar %{_javadir}/%{name}/%{name}.jar -%{_javadir}/%{name}-launcher.jar %{_javadir}/%{name}/%{name}-launcher.jar %{_javadir}/%{name}-bootstrap.jar %{_javadir}/%{name}/%{name}-bootstrap.jar @@ -580,16 +614,6 @@ %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -%{_mavenpomdir}/JPP-ant-launcher.pom -%{_mavenpomdir}/JPP-ant-parent.pom -%{_mavenpomdir}/JPP-ant.pom -%if %{defined _maven_repository} -%config(noreplace) %{_mavendepmapfragdir}/ant -%else -%{_datadir}/maven-metadata/ant.xml -%endif -%dir %{_mavenpomdir} - %endif %if %{with antlr} @@ -610,36 +634,29 @@ %endif %if %{with junit} -%files -%{_javadir}/ant/ant-junit*.jar +%files -f .mfiles %{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit %config(noreplace) %{_sysconfdir}/ant.d/junit4 %{ant_home}%{_sysconfdir}/junit-frames.xsl %{ant_home}%{_sysconfdir}/junit-noframes.xsl -%{_mavenpomdir}/JPP.ant-ant-junit*.pom -%if %{defined _maven_repository} -%config(noreplace) %{_mavendepmapfragdir}/ant-junit -%else -%{_datadir}/maven-metadata/ant-junit.xml %endif -%dir %{_mavenpomdir} + +%if %{with junit5} +%files -f .mfiles +%{ant_home}/lib/ant-junitlauncher.jar +%config(noreplace) %{_sysconfdir}/ant.d/junitlauncher %endif ### Basic ant subpackages %if %{with bootstrap} -%files -n ant-jmf -%{_javadir}/ant/ant-jmf.jar +%files -n ant-jmf -f .mfiles-jmf %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_mavenpomdir}/JPP.ant-ant-jmf.pom -%files -n ant-swing -%{_javadir}/ant/ant-swing.jar +%files -n ant-swing -f .mfiles-swing %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -%{_mavenpomdir}/JPP.ant-ant-swing.pom -%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755) ++++++ ant-junit.spec ++++++ --- /var/tmp/diff_new_pack.GDHbj6/_old 2019-03-01 20:25:19.478070194 +0100 +++ /var/tmp/diff_new_pack.GDHbj6/_new 2019-03-01 20:25:19.482070193 +0100 @@ -22,6 +22,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! ##### %bcond_with bootstrap %bcond_without junit +%bcond_with junit5 %bcond_with antlr Name: ant-junit Version: 1.10.5 @@ -32,6 +33,7 @@ URL: http://ant.apache.org/ Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 Source1: apache-ant-1.8.ant.conf +Source10: ant-bootstrap.pom.in Source1000: pre_checkin.sh Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc Source1002: ant.keyring @@ -55,7 +57,7 @@ %if !%{with bootstrap} BuildRequires: javapackages-local %endif -%if %{with junit} || %{with antlr} +%if %{with junit} || %{with antlr} || %{with junit5} BuildRequires: ant = %{version} BuildRequires: hamcrest BuildRequires: junit @@ -64,6 +66,10 @@ %if %{with antlr} BuildRequires: xerces-j2 %endif +%if %{with junit5} +BuildRequires: apiguardian +BuildRequires: junit5 +%endif %if 0%{?suse_version} > 1320 BuildRequires: strip-nondeterminism %endif @@ -91,11 +97,20 @@ Requires: junit4 %requires_eq ant %endif +%if %{with junit5} +Requires: junit5 +%requires_eq ant +%endif %if %{with junit} %description Apache Ant is a Java-based build tool. This package contains optional JUnit tasks for Apache Ant. +%elif %{with junit5} +%description +Apache Ant is a Java-based build tool. + +This package contains optional JUnit5 tasks for Apache Ant. %else %description Apache Ant is a Java-based build tool. In theory, it is kind of like @@ -357,9 +372,12 @@ %endif #install jars -%if %{with junit} +%if %{with junit} || %{with junit5} build-jar-repository -s -p lib/optional junit4 %endif +%if %{with junit5} +build-jar-repository -s -p lib/optional junit5 opentest4j +%endif %if %{with antlr} # we need to build junit in antlr, but we remove it later build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver @@ -375,7 +393,7 @@ %build export OPT_JAR_LIST=: -%if %{with antlr} || %{with junit} +%if %{with antlr} || %{with junit} || %{with junit5} ant -Dbuild.sysclasspath=first jars test-jar #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. @@ -398,11 +416,18 @@ install -d -m 755 %{buildroot}%{_javadir}/ant install -d -m 755 %{buildroot}%{_mavenpomdir} -%if ! %{with junit} -rm build/lib/ant-junit*.jar +%if %{without junit} && %{without junit5} + rm build/lib/ant-junit*.jar %else -# remove all others -for i in build/lib/ant-*.jar ; do + %if %{without junit} + rm build/lib/ant-junit.jar + rm build/lib/ant-junit4.jar + %else + # empty in this scenario + rm build/lib/ant-junitlauncher.jar + %endif + # remove all others + for i in build/lib/ant-*.jar ; do case $i in */ant-junit*) ;; @@ -410,7 +435,7 @@ rm -v $i ;; esac -done + done %endif for jar in build/lib/*.jar @@ -452,12 +477,19 @@ ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar #bootstrap does not have a pom - [ $jarname == ant-bootstrap ] && continue + if [ $jarname == ant-bootstrap ]; then + mkdir -p src/etc/poms/${jarname} + sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml + fi #install pom install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} if [ $jarname == ant-launcher ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher + elif [ $jarname == ant-jmf ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf + elif [ $jarname == ant-swing ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing elif [ $jarname == ant ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant else @@ -510,6 +542,10 @@ echo "junit4 ant/ant-junit4" > %{buildroot}%{_sysconfdir}/ant.d/junit4 %endif +%if %{with junit5} +echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > %{buildroot}%{_sysconfdir}/ant.d/junitlauncher +%endif + %if %{with antlr} echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf @@ -549,15 +585,13 @@ done popd -%files +%files -f .mfiles %license LICENSE NOTICE %doc KEYS README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun -%{_javadir}/%{name}.jar %{_javadir}/%{name}/%{name}.jar -%{_javadir}/%{name}-launcher.jar %{_javadir}/%{name}/%{name}-launcher.jar %{_javadir}/%{name}-bootstrap.jar %{_javadir}/%{name}/%{name}-bootstrap.jar @@ -580,16 +614,6 @@ %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -%{_mavenpomdir}/JPP-ant-launcher.pom -%{_mavenpomdir}/JPP-ant-parent.pom -%{_mavenpomdir}/JPP-ant.pom -%if %{defined _maven_repository} -%config(noreplace) %{_mavendepmapfragdir}/ant -%else -%{_datadir}/maven-metadata/ant.xml -%endif -%dir %{_mavenpomdir} - %endif %if %{with antlr} @@ -610,36 +634,29 @@ %endif %if %{with junit} -%files -%{_javadir}/ant/ant-junit*.jar +%files -f .mfiles %{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit %config(noreplace) %{_sysconfdir}/ant.d/junit4 %{ant_home}%{_sysconfdir}/junit-frames.xsl %{ant_home}%{_sysconfdir}/junit-noframes.xsl -%{_mavenpomdir}/JPP.ant-ant-junit*.pom -%if %{defined _maven_repository} -%config(noreplace) %{_mavendepmapfragdir}/ant-junit -%else -%{_datadir}/maven-metadata/ant-junit.xml %endif -%dir %{_mavenpomdir} + +%if %{with junit5} +%files -f .mfiles +%{ant_home}/lib/ant-junitlauncher.jar +%config(noreplace) %{_sysconfdir}/ant.d/junitlauncher %endif ### Basic ant subpackages %if %{with bootstrap} -%files -n ant-jmf -%{_javadir}/ant/ant-jmf.jar +%files -n ant-jmf -f .mfiles-jmf %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_mavenpomdir}/JPP.ant-ant-jmf.pom -%files -n ant-swing -%{_javadir}/ant/ant-swing.jar +%files -n ant-swing -f .mfiles-swing %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -%{_mavenpomdir}/JPP.ant-ant-swing.pom -%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755) ++++++ ant-junit5.spec ++++++ ++++ 766 lines (skipped) ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.GDHbj6/_old 2019-03-01 20:25:19.514070185 +0100 +++ /var/tmp/diff_new_pack.GDHbj6/_new 2019-03-01 20:25:19.518070184 +0100 @@ -21,6 +21,7 @@ %global major_version 1.9 %bcond_without bootstrap %bcond_with junit +%bcond_with junit5 %bcond_with antlr Name: ant Version: 1.10.5 @@ -31,6 +32,7 @@ URL: http://ant.apache.org/ Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2 Source1: apache-ant-1.8.ant.conf +Source10: ant-bootstrap.pom.in Source1000: pre_checkin.sh Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc Source1002: ant.keyring @@ -54,7 +56,7 @@ %if !%{with bootstrap} BuildRequires: javapackages-local %endif -%if %{with junit} || %{with antlr} +%if %{with junit} || %{with antlr} || %{with junit5} BuildRequires: ant = %{version} BuildRequires: hamcrest BuildRequires: junit @@ -63,6 +65,10 @@ %if %{with antlr} BuildRequires: xerces-j2 %endif +%if %{with junit5} +BuildRequires: apiguardian +BuildRequires: junit5 +%endif %if 0%{?suse_version} > 1320 BuildRequires: strip-nondeterminism %endif @@ -90,11 +96,20 @@ Requires: junit4 %requires_eq ant %endif +%if %{with junit5} +Requires: junit5 +%requires_eq ant +%endif %if %{with junit} %description Apache Ant is a Java-based build tool. This package contains optional JUnit tasks for Apache Ant. +%elif %{with junit5} +%description +Apache Ant is a Java-based build tool. + +This package contains optional JUnit5 tasks for Apache Ant. %else %description Apache Ant is a Java-based build tool. In theory, it is kind of like @@ -356,9 +371,12 @@ %endif #install jars -%if %{with junit} +%if %{with junit} || %{with junit5} build-jar-repository -s -p lib/optional junit4 %endif +%if %{with junit5} +build-jar-repository -s -p lib/optional junit5 opentest4j +%endif %if %{with antlr} # we need to build junit in antlr, but we remove it later build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver @@ -374,7 +392,7 @@ %build export OPT_JAR_LIST=: -%if %{with antlr} || %{with junit} +%if %{with antlr} || %{with junit} || %{with junit5} ant -Dbuild.sysclasspath=first jars test-jar #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. @@ -397,11 +415,18 @@ install -d -m 755 %{buildroot}%{_javadir}/ant install -d -m 755 %{buildroot}%{_mavenpomdir} -%if ! %{with junit} -rm build/lib/ant-junit*.jar +%if %{without junit} && %{without junit5} + rm build/lib/ant-junit*.jar %else -# remove all others -for i in build/lib/ant-*.jar ; do + %if %{without junit} + rm build/lib/ant-junit.jar + rm build/lib/ant-junit4.jar + %else + # empty in this scenario + rm build/lib/ant-junitlauncher.jar + %endif + # remove all others + for i in build/lib/ant-*.jar ; do case $i in */ant-junit*) ;; @@ -409,7 +434,7 @@ rm -v $i ;; esac -done + done %endif for jar in build/lib/*.jar @@ -451,12 +476,19 @@ ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar #bootstrap does not have a pom - [ $jarname == ant-bootstrap ] && continue + if [ $jarname == ant-bootstrap ]; then + mkdir -p src/etc/poms/${jarname} + sed -e "s#@VERSION@#%{version}#g" < %{SOURCE10} > src/etc/poms/${jarname}/pom.xml + fi #install pom install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} if [ $jarname == ant-launcher ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher + elif [ $jarname == ant-jmf ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -f jmf + elif [ $jarname == ant-swing ]; then + %add_maven_depmap ${pomname} ${destname}${jarname}.jar -f swing elif [ $jarname == ant ]; then %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a org.apache.ant:ant-nodeps,apache:ant,ant:ant else @@ -509,6 +541,10 @@ echo "junit4 ant/ant-junit4" > %{buildroot}%{_sysconfdir}/ant.d/junit4 %endif +%if %{with junit5} +echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > %{buildroot}%{_sysconfdir}/ant.d/junitlauncher +%endif + %if %{with antlr} echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf @@ -548,15 +584,13 @@ done popd -%files +%files -f .mfiles %license LICENSE NOTICE %doc KEYS README WHATSNEW %config(noreplace) %{_sysconfdir}/%{name}.conf %attr(0755,root,root) %{_bindir}/ant %attr(0755,root,root) %{_bindir}/antRun -%{_javadir}/%{name}.jar %{_javadir}/%{name}/%{name}.jar -%{_javadir}/%{name}-launcher.jar %{_javadir}/%{name}/%{name}-launcher.jar %{_javadir}/%{name}-bootstrap.jar %{_javadir}/%{name}/%{name}-bootstrap.jar @@ -579,16 +613,6 @@ %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -%{_mavenpomdir}/JPP-ant-launcher.pom -%{_mavenpomdir}/JPP-ant-parent.pom -%{_mavenpomdir}/JPP-ant.pom -%if %{defined _maven_repository} -%config(noreplace) %{_mavendepmapfragdir}/ant -%else -%{_datadir}/maven-metadata/ant.xml -%endif -%dir %{_mavenpomdir} - %endif %if %{with antlr} @@ -609,36 +633,29 @@ %endif %if %{with junit} -%files -%{_javadir}/ant/ant-junit*.jar +%files -f .mfiles %{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit %config(noreplace) %{_sysconfdir}/ant.d/junit4 %{ant_home}%{_sysconfdir}/junit-frames.xsl %{ant_home}%{_sysconfdir}/junit-noframes.xsl -%{_mavenpomdir}/JPP.ant-ant-junit*.pom -%if %{defined _maven_repository} -%config(noreplace) %{_mavendepmapfragdir}/ant-junit -%else -%{_datadir}/maven-metadata/ant-junit.xml %endif -%dir %{_mavenpomdir} + +%if %{with junit5} +%files -f .mfiles +%{ant_home}/lib/ant-junitlauncher.jar +%config(noreplace) %{_sysconfdir}/ant.d/junitlauncher %endif ### Basic ant subpackages %if %{with bootstrap} -%files -n ant-jmf -%{_javadir}/ant/ant-jmf.jar +%files -n ant-jmf -f .mfiles-jmf %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_mavenpomdir}/JPP.ant-ant-jmf.pom -%files -n ant-swing -%{_javadir}/ant/ant-swing.jar +%files -n ant-swing -f .mfiles-swing %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -%{_mavenpomdir}/JPP.ant-ant-swing.pom -%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755) ++++++ 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> ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.GDHbj6/_old 2019-03-01 20:25:19.634070157 +0100 +++ /var/tmp/diff_new_pack.GDHbj6/_new 2019-03-01 20:25:19.634070157 +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
