From d0cbc1c9829d2c8290656e529a5d3347bce718a9206713308d5ff13fe431a06a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:05:34 +0000 Subject: [PATCH 1/2] Accepting request 1114347 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114347 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=179 --- ant-antlr.spec | 7 ++----- ant-junit.spec | 7 ++----- ant-junit5.spec | 7 ++----- ant.spec | 7 ++----- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/ant-antlr.spec b/ant-antlr.spec index 1546032..12db883 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -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 diff --git a/ant-junit.spec b/ant-junit.spec index 08fd0a4..9d91b99 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -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 diff --git a/ant-junit5.spec b/ant-junit5.spec index 618be54..6f472a5 100644 --- a/ant-junit5.spec +++ b/ant-junit5.spec @@ -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 diff --git a/ant.spec b/ant.spec index 481fd7b..4231e25 100644 --- a/ant.spec +++ b/ant.spec @@ -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 From d090dfb4ad47a009eb57afe9cae7591995aa25cb7a16c7b6ceb1bebdfa0e7a3e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sat, 27 Jan 2024 12:29:29 +0000 Subject: [PATCH 2/2] Accepting request 1141811 from home:urbic:branches:Java:packages - Add forgotten univocity-parsers to %{_sysconfdir}/ant.d/junitlauncher (needed to run unit tests annotated with @CsvSource and @CsvFileSource) - Add forgotten univocity-parsers to %{_sysconfdir}/ant.d/junitlauncher (needed to run unit tests annotated with @CsvSource and @CsvFileSource) - Add forgotten univocity-parsers to %{_sysconfdir}/ant.d/junitlauncher (needed to run unit tests annotated with @CsvSource and @CsvFileSource) - Add forgotten univocity-parsers to %{_sysconfdir}/ant.d/junitlauncher (needed to run unit tests annotated with @CsvSource and @CsvFileSource) OBS-URL: https://build.opensuse.org/request/show/1141811 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=180 --- ant-antlr.changes | 7 +++++++ ant-antlr.spec | 6 +++--- ant-junit.changes | 7 +++++++ ant-junit.spec | 6 +++--- ant-junit5.changes | 7 +++++++ ant-junit5.spec | 6 +++--- ant.changes | 7 +++++++ ant.spec | 6 +++--- 8 files changed, 40 insertions(+), 12 deletions(-) diff --git a/ant-antlr.changes b/ant-antlr.changes index f71e277..ff17c56 100644 --- a/ant-antlr.changes +++ b/ant-antlr.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 26 20:37:50 UTC 2024 - Anton Shvetz + +- 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 diff --git a/ant-antlr.spec b/ant-antlr.spec index 12db883..2bf42dd 100644 --- a/ant-antlr.spec +++ b/ant-antlr.spec @@ -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 @@ -521,7 +521,7 @@ do fi #install pom - %mvn_install_pom 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 @@ -584,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} diff --git a/ant-junit.changes b/ant-junit.changes index f71e277..ff17c56 100644 --- a/ant-junit.changes +++ b/ant-junit.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 26 20:37:50 UTC 2024 - Anton Shvetz + +- 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 diff --git a/ant-junit.spec b/ant-junit.spec index 9d91b99..0b0fa61 100644 --- a/ant-junit.spec +++ b/ant-junit.spec @@ -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 @@ -521,7 +521,7 @@ do fi #install pom - %mvn_install_pom 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 @@ -584,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} diff --git a/ant-junit5.changes b/ant-junit5.changes index f71e277..ff17c56 100644 --- a/ant-junit5.changes +++ b/ant-junit5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 26 20:37:50 UTC 2024 - Anton Shvetz + +- 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 diff --git a/ant-junit5.spec b/ant-junit5.spec index 6f472a5..fd35091 100644 --- a/ant-junit5.spec +++ b/ant-junit5.spec @@ -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 @@ -521,7 +521,7 @@ do fi #install pom - %mvn_install_pom 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 @@ -584,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} diff --git a/ant.changes b/ant.changes index f71e277..ff17c56 100644 --- a/ant.changes +++ b/ant.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Jan 26 20:37:50 UTC 2024 - Anton Shvetz + +- 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 diff --git a/ant.spec b/ant.spec index 4231e25..30f68c7 100644 --- a/ant.spec +++ b/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 @@ -520,7 +520,7 @@ do fi #install pom - %mvn_install_pom 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 @@ -583,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}