From c3aeb898874de0a862a870ad44733128e821c89d5de47832b41ade254453e17a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 30 Sep 2019 08:09:52 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=144 --- ant-antlr.changes | 6 ++++++ ant-antlr.spec | 4 +--- ant-junit.changes | 6 ++++++ ant-junit.spec | 4 +--- ant-junit5.changes | 6 ++++++ ant-junit5.spec | 4 +--- ant.changes | 6 ++++++ ant.spec | 4 +--- 8 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index 339c74f..519e346 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba + +- 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 diff --git a/ant-antlr.spec b/ant-antlr.spec index 55f0ed7..c39e12b 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -483,6 +483,7 @@ do fi #install pom + %pom_remove_parent src/etc/poms/${jarname}/pom.xml 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 @@ -498,9 +499,6 @@ do done %if %{with bootstrap} -#ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat diff --git a/ant-junit.changes b/ant-junit.changes index 339c74f..519e346 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba + +- 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 diff --git a/ant-junit.spec b/ant-junit.spec index 9c204a1..b18c46a 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -483,6 +483,7 @@ do fi #install pom + %pom_remove_parent src/etc/poms/${jarname}/pom.xml 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 @@ -498,9 +499,6 @@ do done %if %{with bootstrap} -#ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat diff --git a/ant-junit5.changes b/ant-junit5.changes index 339c74f..519e346 100644 --- a/ant-junit5.changes +++ b/ant-junit5.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba + +- 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 diff --git a/ant-junit5.spec b/ant-junit5.spec index c7a61c5..8c33c74 100644 --- a/ant-junit5.spec +++ b/ant-junit5.spec @@ -483,6 +483,7 @@ do fi #install pom + %pom_remove_parent src/etc/poms/${jarname}/pom.xml 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 @@ -498,9 +499,6 @@ do done %if %{with bootstrap} -#ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat diff --git a/ant.changes b/ant.changes index 339c74f..519e346 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba + +- 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 diff --git a/ant.spec b/ant.spec index 419b2d5..a1e8d33 100644 --- a/ant.spec +++ b/ant.spec @@ -482,6 +482,7 @@ do fi #install pom + %pom_remove_parent src/etc/poms/${jarname}/pom.xml 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 @@ -497,9 +498,6 @@ do done %if %{with bootstrap} -#ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom -%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat From 33def1831c1f789f19ec9d72c197ef77992b84070a6a846c5715f1f3690893e8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 30 Sep 2019 08:17:40 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=145 --- ant-antlr.spec | 4 +++- ant-junit.spec | 4 +++- ant-junit5.spec | 4 +++- ant.spec | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ant-antlr.spec b/ant-antlr.spec index c39e12b..2e1e026 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -483,7 +483,9 @@ do fi #install pom - %pom_remove_parent src/etc/poms/${jarname}/pom.xml + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi 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 diff --git a/ant-junit.spec b/ant-junit.spec index b18c46a..d7c7ff0 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -483,7 +483,9 @@ do fi #install pom - %pom_remove_parent src/etc/poms/${jarname}/pom.xml + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi 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 diff --git a/ant-junit5.spec b/ant-junit5.spec index 8c33c74..2342e88 100644 --- a/ant-junit5.spec +++ b/ant-junit5.spec @@ -483,7 +483,9 @@ do fi #install pom - %pom_remove_parent src/etc/poms/${jarname}/pom.xml + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi 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 diff --git a/ant.spec b/ant.spec index a1e8d33..936f945 100644 --- a/ant.spec +++ b/ant.spec @@ -482,7 +482,9 @@ do fi #install pom - %pom_remove_parent src/etc/poms/${jarname}/pom.xml + if [ "$jarname" != ant-bootstrap ]; then + %pom_remove_parent src/etc/poms/${jarname}/pom.xml + fi 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 From 8e3918b45d1d60e62e77f6e63523b23c321287ea925aec87b62174738dba9c10 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 1 Oct 2019 08:36:31 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=146 --- ant-antlr.changes | 5 +++++ ant-antlr.spec | 8 ++++---- ant-junit.changes | 5 +++++ ant-junit.spec | 8 ++++---- ant-junit5.changes | 5 +++++ ant-junit5.spec | 8 ++++---- ant.changes | 5 +++++ ant.spec | 8 ++++---- 8 files changed, 36 insertions(+), 16 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index 519e346..482b789 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba + +- Build against the new compatibility packages log4j12/log4j12-mini + ------------------------------------------------------------------- Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba diff --git a/ant-antlr.spec b/ant-antlr.spec index 2e1e026..e72ff69 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -230,8 +230,8 @@ This package contains optional apache bcel tasks for Apache Ant. Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: log4j-mini -Requires: log4j +BuildRequires: log4j12-mini +Requires: log4j12 %requires_eq ant Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -380,7 +380,7 @@ 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 +build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver %endif # Fix file-not-utf8 rpmlint warning @@ -553,7 +553,7 @@ echo "xml-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/a echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel -echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j +echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2 diff --git a/ant-junit.changes b/ant-junit.changes index 519e346..482b789 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba + +- Build against the new compatibility packages log4j12/log4j12-mini + ------------------------------------------------------------------- Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba diff --git a/ant-junit.spec b/ant-junit.spec index d7c7ff0..4d9c426 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -230,8 +230,8 @@ This package contains optional apache bcel tasks for Apache Ant. Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: log4j-mini -Requires: log4j +BuildRequires: log4j12-mini +Requires: log4j12 %requires_eq ant Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -380,7 +380,7 @@ 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 +build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver %endif # Fix file-not-utf8 rpmlint warning @@ -553,7 +553,7 @@ echo "xml-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/a echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel -echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j +echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2 diff --git a/ant-junit5.changes b/ant-junit5.changes index 519e346..482b789 100644 --- a/ant-junit5.changes +++ b/ant-junit5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba + +- Build against the new compatibility packages log4j12/log4j12-mini + ------------------------------------------------------------------- Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba diff --git a/ant-junit5.spec b/ant-junit5.spec index 2342e88..ecbe9af 100644 --- a/ant-junit5.spec +++ b/ant-junit5.spec @@ -230,8 +230,8 @@ This package contains optional apache bcel tasks for Apache Ant. Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: log4j-mini -Requires: log4j +BuildRequires: log4j12-mini +Requires: log4j12 %requires_eq ant Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -380,7 +380,7 @@ 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 +build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver %endif # Fix file-not-utf8 rpmlint warning @@ -553,7 +553,7 @@ echo "xml-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/a echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel -echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j +echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2 diff --git a/ant.changes b/ant.changes index 519e346..482b789 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba + +- Build against the new compatibility packages log4j12/log4j12-mini + ------------------------------------------------------------------- Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba diff --git a/ant.spec b/ant.spec index 936f945..dd09934 100644 --- a/ant.spec +++ b/ant.spec @@ -229,8 +229,8 @@ This package contains optional apache bcel tasks for Apache Ant. Summary: Optional apache log4j tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: log4j-mini -Requires: log4j +BuildRequires: log4j12-mini +Requires: log4j12 %requires_eq ant Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -379,7 +379,7 @@ 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 +build-jar-repository -s -p lib/optional xerces-j2 xml-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j12/log4j-12 oro regexp bsf commons-logging commons-net jsch xalan-j2 xalan-j2-serializer xml-resolver %endif # Fix file-not-utf8 rpmlint warning @@ -552,7 +552,7 @@ echo "xml-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/a echo "jakarta-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging echo "jakarta-commons-net ant/ant-commons-net" > %{buildroot}%{_sysconfdir}/ant.d/commons-net echo "bcel ant/ant-apache-bcel" > %{buildroot}%{_sysconfdir}/ant.d/apache-bcel -echo "log4j ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j +echo "log4j12/log4j-12 ant/ant-apache-log4j" > %{buildroot}%{_sysconfdir}/ant.d/apache-log4j echo "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2