From ee1ff4948796a2cb897b9bb49a6a023ff8f4ad580e12620649491408213a2861 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:30:04 +0000 Subject: [PATCH 1/3] Accepting request 1114379 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114379 OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=41 --- plexus-containers.spec | 12 ++---------- plexus-metadata-generator.spec | 7 +------ 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/plexus-containers.spec b/plexus-containers.spec index eae5fa0..0999ed9 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -63,12 +63,6 @@ Group: Development/Libraries/Java %package container-default Summary: Default Container from %{name} Group: Development/Libraries/Java -Requires: mvn(com.google.guava:guava) -Requires: mvn(org.apache.xbean:xbean-reflect) -Requires: mvn(org.codehaus.plexus:plexus-classworlds) -Requires: mvn(org.codehaus.plexus:plexus-utils) -Requires: mvn(org.ow2.asm:asm) -Requires: mvn(org.ow2.asm:asm-commons) %description container-default %{summary}. @@ -128,9 +122,7 @@ mkdir -p plexus-component-annotations/src/test/java %build for i in plexus-component-annotations plexus-container-default; do pushd ${i} - %pom_remove_parent . - %pom_xpath_inject "pom:project" "org.codehaus.plexus%{version}" . - ant \ + %{ant} \ %if %{without tests} -Dtest.skip=true \ %endif @@ -151,7 +143,7 @@ ln -sf ../%{name}/plexus-component-annotations.jar %{buildroot}%{_javadir}/plexu # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} for i in plexus-component-annotations plexus-container-default; do - install -pm 0644 ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom + %{mvn_install_pom} ${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/${i}.pom done %add_maven_depmap %{name}/plexus-component-annotations.pom %{name}/plexus-component-annotations.jar -f component-annotations %add_maven_depmap %{name}/plexus-container-default.pom %{name}/plexus-container-default.jar -f container-default -a org.codehaus.plexus:containers-component-api diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec index 54915f0..cd88f46 100644 --- a/plexus-metadata-generator.spec +++ b/plexus-metadata-generator.spec @@ -135,11 +135,6 @@ rm -rf plexus-%{comp_name}/src/main/resources/META-INF/maven %pom_remove_dep :maven-model plexus-%{comp_name} %pom_remove_dep :maven-plugin-api plexus-%{comp_name} -%pom_remove_parent plexus-%{comp_name} -%pom_xpath_inject "pom:project" " - org.codehaus.plexus - %{version} -" plexus-%{comp_name} %pom_xpath_set "pom:project/pom:artifactId" %{name} plexus-%{comp_name} %build @@ -158,7 +153,7 @@ install -dm 0755 %{buildroot}%{_javadir} install -pm 0644 plexus-%{comp_name}/target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir} -install -pm 0644 plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} plexus-%{comp_name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} From b24dae97e62adf8ac9521797a79011f0954bdf8b02217aa295dc11a0f2897cd4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 14:45:27 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=42 --- plexus-component-metadata.spec | 4 ++-- plexus-containers.spec | 2 +- plexus-metadata-generator.changes | 5 +++++ plexus-metadata-generator.spec | 6 +++--- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec index 947b51e..5bd3273 100644 --- a/plexus-component-metadata.spec +++ b/plexus-component-metadata.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package plexus-component-metadata # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/plexus-containers.spec b/plexus-containers.spec index 0999ed9..c8a5187 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-containers # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/plexus-metadata-generator.changes b/plexus-metadata-generator.changes index b0b4081..4861605 100644 --- a/plexus-metadata-generator.changes +++ b/plexus-metadata-generator.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 14:45:18 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Fri May 20 12:13:42 UTC 2022 - Fridrich Strba diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec index cd88f46..e456993 100644 --- a/plexus-metadata-generator.spec +++ b/plexus-metadata-generator.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-metadata-generator # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -88,9 +88,9 @@ build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-com build-jar-repository -s lib hamcrest/core xbean/xbean-reflect %endif -%patch1 -p1 +%patch -P 1 -p1 -%patch1000 -p1 +%patch -P 1000 -p1 cp %{SOURCE1} . cp %{SOURCE2} . From 8dcf9b670fcc887890d2d5f6a04abbfd518b6b7be093cb91f1d36dc655629f29 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 14:46:43 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=43 --- plexus-component-metadata.changes | 5 +++++ plexus-containers.changes | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/plexus-component-metadata.changes b/plexus-component-metadata.changes index 245a16a..b9d34cc 100644 --- a/plexus-component-metadata.changes +++ b/plexus-component-metadata.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 14:46:35 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Sun Mar 20 17:45:24 UTC 2022 - Fridrich Strba diff --git a/plexus-containers.changes b/plexus-containers.changes index e2c9fdf..562e304 100644 --- a/plexus-containers.changes +++ b/plexus-containers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 14:46:18 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Thu May 4 12:06:52 UTC 2023 - Dominique Leuenberger