pool/ant
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 734252 from Java:packages

Browse Source 
build against the new log4j12/log4j12-mini packages

OBS-URL: https://build.opensuse.org/request/show/734252
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=79
This commit is contained in:
Dominique Leuenberger 2019-10-03 14:15:10 +00:00 committed by Git OBS Bridge
commit c4d5398ef1
8 changed files with 72 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ant-antlr.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against the new compatibility packages log4j12/log4j12-mini
-------------------------------------------------------------------
Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com> Tue Apr 9 10:48:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>

14
ant-antlr.spec
View File

@ -230,8 +230,8 @@ This package contains optional apache bcel tasks for Apache Ant.
Summary: Optional apache log4j tasks for ant Summary: Optional apache log4j tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
BuildRequires: log4j-mini BuildRequires: log4j12-mini
Requires: log4j Requires: log4j12
%requires_eq ant %requires_eq ant
Provides: ant-jakarta-log4j = %{version} Provides: ant-jakarta-log4j = %{version}
Obsoletes: ant-jakarta-log4j < %{version} Obsoletes: ant-jakarta-log4j < %{version}
@ -380,7 +380,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
%endif %endif
%if %{with antlr} %if %{with antlr}
# we need to build junit in antlr, but we remove it later # 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 %endif
# Fix file-not-utf8 rpmlint warning # Fix file-not-utf8 rpmlint warning
@ -483,6 +483,9 @@ do
fi fi
#install pom #install pom
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} install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
if [ "$jarname" = ant-launcher ]; then if [ "$jarname" = ant-launcher ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
@ -498,9 +501,6 @@ do
done done
%if %{with bootstrap} %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 # scripts: remove dos and os/2 scripts
rm -f src/script/*.bat rm -f src/script/*.bat
@ -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-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 "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 "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 "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp 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 echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2

11
ant-junit.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against the new compatibility packages log4j12/log4j12-mini
-------------------------------------------------------------------
Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com> Tue Apr 9 10:48:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>

14
ant-junit.spec
View File

@ -230,8 +230,8 @@ This package contains optional apache bcel tasks for Apache Ant.
Summary: Optional apache log4j tasks for ant Summary: Optional apache log4j tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
BuildRequires: log4j-mini BuildRequires: log4j12-mini
Requires: log4j Requires: log4j12
%requires_eq ant %requires_eq ant
Provides: ant-jakarta-log4j = %{version} Provides: ant-jakarta-log4j = %{version}
Obsoletes: ant-jakarta-log4j < %{version} Obsoletes: ant-jakarta-log4j < %{version}
@ -380,7 +380,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
%endif %endif
%if %{with antlr} %if %{with antlr}
# we need to build junit in antlr, but we remove it later # 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 %endif
# Fix file-not-utf8 rpmlint warning # Fix file-not-utf8 rpmlint warning
@ -483,6 +483,9 @@ do
fi fi
#install pom #install pom
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} install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
if [ "$jarname" = ant-launcher ]; then if [ "$jarname" = ant-launcher ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
@ -498,9 +501,6 @@ do
done done
%if %{with bootstrap} %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 # scripts: remove dos and os/2 scripts
rm -f src/script/*.bat rm -f src/script/*.bat
@ -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-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 "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 "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 "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp 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 echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2

11
ant-junit5.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against the new compatibility packages log4j12/log4j12-mini
-------------------------------------------------------------------
Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com> Tue Apr 9 10:48:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>

14
ant-junit5.spec
View File

@ -230,8 +230,8 @@ This package contains optional apache bcel tasks for Apache Ant.
Summary: Optional apache log4j tasks for ant Summary: Optional apache log4j tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
BuildRequires: log4j-mini BuildRequires: log4j12-mini
Requires: log4j Requires: log4j12
%requires_eq ant %requires_eq ant
Provides: ant-jakarta-log4j = %{version} Provides: ant-jakarta-log4j = %{version}
Obsoletes: ant-jakarta-log4j < %{version} Obsoletes: ant-jakarta-log4j < %{version}
@ -380,7 +380,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
%endif %endif
%if %{with antlr} %if %{with antlr}
# we need to build junit in antlr, but we remove it later # 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 %endif
# Fix file-not-utf8 rpmlint warning # Fix file-not-utf8 rpmlint warning
@ -483,6 +483,9 @@ do
fi fi
#install pom #install pom
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} install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
if [ "$jarname" = ant-launcher ]; then if [ "$jarname" = ant-launcher ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
@ -498,9 +501,6 @@ do
done done
%if %{with bootstrap} %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 # scripts: remove dos and os/2 scripts
rm -f src/script/*.bat rm -f src/script/*.bat
@ -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-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 "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 "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 "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp 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 echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2

11
ant.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Tue Oct 1 08:34:33 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Build against the new compatibility packages log4j12/log4j12-mini
-------------------------------------------------------------------
Mon Sep 30 08:08:49 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com> Tue Apr 9 10:48:23 UTC 2019 - Fridrich Strba <fstrba@suse.com>

14
ant.spec
View File

@ -229,8 +229,8 @@ This package contains optional apache bcel tasks for Apache Ant.
Summary: Optional apache log4j tasks for ant Summary: Optional apache log4j tasks for ant
License: Apache-2.0 License: Apache-2.0
Group: Development/Tools/Building Group: Development/Tools/Building
BuildRequires: log4j-mini BuildRequires: log4j12-mini
Requires: log4j Requires: log4j12
%requires_eq ant %requires_eq ant
Provides: ant-jakarta-log4j = %{version} Provides: ant-jakarta-log4j = %{version}
Obsoletes: ant-jakarta-log4j < %{version} Obsoletes: ant-jakarta-log4j < %{version}
@ -379,7 +379,7 @@ build-jar-repository -s -p lib/optional junit5 opentest4j
%endif %endif
%if %{with antlr} %if %{with antlr}
# we need to build junit in antlr, but we remove it later # 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 %endif
# Fix file-not-utf8 rpmlint warning # Fix file-not-utf8 rpmlint warning
@ -482,6 +482,9 @@ do
fi fi
#install pom #install pom
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} install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname}
if [ "$jarname" = ant-launcher ]; then if [ "$jarname" = ant-launcher ]; then
%add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher %add_maven_depmap ${pomname} ${destname}${jarname}.jar -a ant:ant-launcher
@ -497,9 +500,6 @@ do
done done
%if %{with bootstrap} %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 # scripts: remove dos and os/2 scripts
rm -f src/script/*.bat rm -f src/script/*.bat
@ -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-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 "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 "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 "oro ant/ant-apache-oro" > %{buildroot}%{_sysconfdir}/ant.d/apache-oro
echo "regexp ant/ant-apache-regexp" > %{buildroot}%{_sysconfdir}/ant.d/apache-regexp 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 echo "xalan-j2 ant/ant-apache-xalan2" > %{buildroot}%{_sysconfdir}/ant.d/apache-xalan2