Accepting request 1141954 from Java:packages
OBS-URL: https://build.opensuse.org/request/show/1141954 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant?expand=0&rev=93
This commit is contained in:
commit
f1c7591bf2
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 26 20:37:50 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Add forgotten univocity-parsers to
|
||||
%{_sysconfdir}/ant.d/junitlauncher (needed to run unit tests
|
||||
annotated with @CsvSource and @CsvFileSource)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 11 12:50:03 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ant-antlr
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2000-2009, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -48,7 +48,7 @@ Patch6: apache-ant-xml-apis.patch
|
||||
Patch7: reproducible-propertyfile-task.patch
|
||||
BuildRequires: antlr-bootstrap
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xml-commons-apis-bootstrap
|
||||
#!BuildIgnore: xml-commons-apis
|
||||
@ -521,10 +521,7 @@ do
|
||||
fi
|
||||
|
||||
#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}
|
||||
%{mvn_install_pom} 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
|
||||
@ -587,7 +584,7 @@ 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
|
||||
echo "junit5 hamcrest/core junit opentest4j univocity-parsers ant/ant-junitlauncher" > %{buildroot}%{_sysconfdir}/ant.d/junitlauncher
|
||||
%endif
|
||||
|
||||
%if %{with antlr}
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 26 20:37:50 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Add forgotten univocity-parsers to
|
||||
%{_sysconfdir}/ant.d/junitlauncher (needed to run unit tests
|
||||
annotated with @CsvSource and @CsvFileSource)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 11 12:50:03 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ant-junit
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2000-2009, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -48,7 +48,7 @@ Patch6: apache-ant-xml-apis.patch
|
||||
Patch7: reproducible-propertyfile-task.patch
|
||||
BuildRequires: antlr-bootstrap
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xml-commons-apis-bootstrap
|
||||
#!BuildIgnore: xml-commons-apis
|
||||
@ -521,10 +521,7 @@ do
|
||||
fi
|
||||
|
||||
#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}
|
||||
%{mvn_install_pom} 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
|
||||
@ -587,7 +584,7 @@ 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
|
||||
echo "junit5 hamcrest/core junit opentest4j univocity-parsers ant/ant-junitlauncher" > %{buildroot}%{_sysconfdir}/ant.d/junitlauncher
|
||||
%endif
|
||||
|
||||
%if %{with antlr}
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 26 20:37:50 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Add forgotten univocity-parsers to
|
||||
%{_sysconfdir}/ant.d/junitlauncher (needed to run unit tests
|
||||
annotated with @CsvSource and @CsvFileSource)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 11 12:50:03 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ant-junit5
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2000-2009, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -48,7 +48,7 @@ Patch6: apache-ant-xml-apis.patch
|
||||
Patch7: reproducible-propertyfile-task.patch
|
||||
BuildRequires: antlr-bootstrap
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xml-commons-apis-bootstrap
|
||||
#!BuildIgnore: xml-commons-apis
|
||||
@ -521,10 +521,7 @@ do
|
||||
fi
|
||||
|
||||
#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}
|
||||
%{mvn_install_pom} 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
|
||||
@ -587,7 +584,7 @@ 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
|
||||
echo "junit5 hamcrest/core junit opentest4j univocity-parsers ant/ant-junitlauncher" > %{buildroot}%{_sysconfdir}/ant.d/junitlauncher
|
||||
%endif
|
||||
|
||||
%if %{with antlr}
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 26 20:37:50 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>
|
||||
|
||||
- Add forgotten univocity-parsers to
|
||||
%{_sysconfdir}/ant.d/junitlauncher (needed to run unit tests
|
||||
annotated with @CsvSource and @CsvFileSource)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 11 12:50:03 UTC 2023 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
11
ant.spec
11
ant.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ant
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
# Copyright (c) 2000-2009, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -47,7 +47,7 @@ Patch6: apache-ant-xml-apis.patch
|
||||
Patch7: reproducible-propertyfile-task.patch
|
||||
BuildRequires: antlr-bootstrap
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-local >= 6
|
||||
BuildRequires: unzip
|
||||
BuildRequires: xml-commons-apis-bootstrap
|
||||
#!BuildIgnore: xml-commons-apis
|
||||
@ -520,10 +520,7 @@ do
|
||||
fi
|
||||
|
||||
#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}
|
||||
%{mvn_install_pom} 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
|
||||
@ -586,7 +583,7 @@ 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
|
||||
echo "junit5 hamcrest/core junit opentest4j univocity-parsers ant/ant-junitlauncher" > %{buildroot}%{_sysconfdir}/ant.d/junitlauncher
|
||||
%endif
|
||||
|
||||
%if %{with antlr}
|
||||
|
Loading…
Reference in New Issue
Block a user