From a6b5c1f373936a2aead9098c956db40104e4861835536d859876479d1c3044fd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 11 May 2020 08:32:03 +0000 Subject: [PATCH] Accepting request 800825 from home:pmonrealgonzalez:branches:Java:packages - Add rhino to the ant-apache-bsf optional tasks [bsc#1134001] - Remove jakarta-commons-* dependencies [bsc#1133997] * Use apache-commons-logging and apache-commons-net in optional tasks - Add rhino to the ant-apache-bsf optional tasks [bsc#1134001] - Remove jakarta-commons-* dependencies [bsc#1133997] * Use apache-commons-logging and apache-commons-net in optional tasks - Add rhino to the ant-apache-bsf optional tasks [bsc#1134001] - Remove jakarta-commons-* dependencies [bsc#1133997] * Use apache-commons-logging and apache-commons-net in optional tasks - Add rhino to the ant-apache-bsf optional tasks [bsc#1134001] - Remove jakarta-commons-* dependencies [bsc#1133997] * Use apache-commons-logging and apache-commons-net in optional tasks OBS-URL: https://build.opensuse.org/request/show/800825 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=157 --- ant-antlr.changes | 11 +++++++++++ ant-antlr.spec | 14 +++++++------- ant-junit.changes | 11 +++++++++++ ant-junit.spec | 14 +++++++------- ant-junit5.changes | 11 +++++++++++ ant-junit5.spec | 14 +++++++------- ant.changes | 11 +++++++++++ ant.spec | 14 +++++++------- 8 files changed, 72 insertions(+), 28 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index befad86..df8d7f9 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed May 6 16:49:40 UTC 2020 - Pedro Monreal Gonzalez + +- Add rhino to the ant-apache-bsf optional tasks [bsc#1134001] + +------------------------------------------------------------------- +Wed May 6 16:45:22 UTC 2020 - Pedro Monreal Gonzalez + +- Remove jakarta-commons-* dependencies [bsc#1133997] + * Use apache-commons-logging and apache-commons-net in optional tasks + ------------------------------------------------------------------- Tue Jan 14 07:03:37 UTC 2020 - Fridrich Strba diff --git a/ant-antlr.spec b/ant-antlr.spec index b12f36d..d54c73e 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -185,8 +185,8 @@ This package contains optional apache resolver tasks for Apache Ant. Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: jakarta-commons-logging -Requires: jakarta-commons-logging +BuildRequires: apache-commons-logging +Requires: apache-commons-logging %requires_eq ant %description -n ant-commons-logging @@ -198,8 +198,8 @@ This package contains optional commons logging tasks for Apache Ant. Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: jakarta-commons-net -Requires: jakarta-commons-net +BuildRequires: apache-commons-net +Requires: apache-commons-net %requires_eq ant %description -n ant-commons-net @@ -573,10 +573,10 @@ echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > %{buildroot %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 +echo "rhino bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf echo "xml-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver -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 "apache-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging +echo "apache-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 "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 diff --git a/ant-junit.changes b/ant-junit.changes index befad86..df8d7f9 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed May 6 16:49:40 UTC 2020 - Pedro Monreal Gonzalez + +- Add rhino to the ant-apache-bsf optional tasks [bsc#1134001] + +------------------------------------------------------------------- +Wed May 6 16:45:22 UTC 2020 - Pedro Monreal Gonzalez + +- Remove jakarta-commons-* dependencies [bsc#1133997] + * Use apache-commons-logging and apache-commons-net in optional tasks + ------------------------------------------------------------------- Tue Jan 14 07:03:37 UTC 2020 - Fridrich Strba diff --git a/ant-junit.spec b/ant-junit.spec index 650977f..d6e1a71 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -185,8 +185,8 @@ This package contains optional apache resolver tasks for Apache Ant. Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: jakarta-commons-logging -Requires: jakarta-commons-logging +BuildRequires: apache-commons-logging +Requires: apache-commons-logging %requires_eq ant %description -n ant-commons-logging @@ -198,8 +198,8 @@ This package contains optional commons logging tasks for Apache Ant. Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: jakarta-commons-net -Requires: jakarta-commons-net +BuildRequires: apache-commons-net +Requires: apache-commons-net %requires_eq ant %description -n ant-commons-net @@ -573,10 +573,10 @@ echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > %{buildroot %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 +echo "rhino bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf echo "xml-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver -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 "apache-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging +echo "apache-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 "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 diff --git a/ant-junit5.changes b/ant-junit5.changes index befad86..df8d7f9 100644 --- a/ant-junit5.changes +++ b/ant-junit5.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed May 6 16:49:40 UTC 2020 - Pedro Monreal Gonzalez + +- Add rhino to the ant-apache-bsf optional tasks [bsc#1134001] + +------------------------------------------------------------------- +Wed May 6 16:45:22 UTC 2020 - Pedro Monreal Gonzalez + +- Remove jakarta-commons-* dependencies [bsc#1133997] + * Use apache-commons-logging and apache-commons-net in optional tasks + ------------------------------------------------------------------- Tue Jan 14 07:03:37 UTC 2020 - Fridrich Strba diff --git a/ant-junit5.spec b/ant-junit5.spec index 45410da..dbebea0 100644 --- a/ant-junit5.spec +++ b/ant-junit5.spec @@ -185,8 +185,8 @@ This package contains optional apache resolver tasks for Apache Ant. Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: jakarta-commons-logging -Requires: jakarta-commons-logging +BuildRequires: apache-commons-logging +Requires: apache-commons-logging %requires_eq ant %description -n ant-commons-logging @@ -198,8 +198,8 @@ This package contains optional commons logging tasks for Apache Ant. Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: jakarta-commons-net -Requires: jakarta-commons-net +BuildRequires: apache-commons-net +Requires: apache-commons-net %requires_eq ant %description -n ant-commons-net @@ -573,10 +573,10 @@ echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > %{buildroot %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 +echo "rhino bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf echo "xml-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver -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 "apache-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging +echo "apache-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 "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 diff --git a/ant.changes b/ant.changes index befad86..df8d7f9 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed May 6 16:49:40 UTC 2020 - Pedro Monreal Gonzalez + +- Add rhino to the ant-apache-bsf optional tasks [bsc#1134001] + +------------------------------------------------------------------- +Wed May 6 16:45:22 UTC 2020 - Pedro Monreal Gonzalez + +- Remove jakarta-commons-* dependencies [bsc#1133997] + * Use apache-commons-logging and apache-commons-net in optional tasks + ------------------------------------------------------------------- Tue Jan 14 07:03:37 UTC 2020 - Fridrich Strba diff --git a/ant.spec b/ant.spec index 90868dd..92d85dc 100644 --- a/ant.spec +++ b/ant.spec @@ -184,8 +184,8 @@ This package contains optional apache resolver tasks for Apache Ant. Summary: Optional commons logging tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: jakarta-commons-logging -Requires: jakarta-commons-logging +BuildRequires: apache-commons-logging +Requires: apache-commons-logging %requires_eq ant %description -n ant-commons-logging @@ -197,8 +197,8 @@ This package contains optional commons logging tasks for Apache Ant. Summary: Optional commons net tasks for ant License: Apache-2.0 Group: Development/Tools/Building -BuildRequires: jakarta-commons-net -Requires: jakarta-commons-net +BuildRequires: apache-commons-net +Requires: apache-commons-net %requires_eq ant %description -n ant-commons-net @@ -572,10 +572,10 @@ echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > %{buildroot %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 +echo "rhino bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf echo "xml-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver -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 "apache-commons-logging ant/ant-commons-logging" > %{buildroot}%{_sysconfdir}/ant.d/commons-logging +echo "apache-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 "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