From 928aeeed5da02d8bd30328663c096f782113bb5f5debce2f2a8a7e5612885cf8 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Apr 2024 17:38:12 +0000 Subject: [PATCH] Accepting request 1164199 from Java:packages:test Depend on plexus-xml OBS-URL: https://build.opensuse.org/request/show/1164199 OBS-URL: https://build.opensuse.org/package/show/Java:packages/plexus-containers?expand=0&rev=45 --- plexus-component-metadata.changes | 6 ++++++ plexus-component-metadata.spec | 4 ++++ plexus-containers.changes | 6 ++++++ plexus-containers.spec | 8 ++++++-- plexus-metadata-generator.changes | 6 ++++++ plexus-metadata-generator.spec | 11 ++++++++--- 6 files changed, 36 insertions(+), 5 deletions(-) diff --git a/plexus-component-metadata.changes b/plexus-component-metadata.changes index b9d34cc..30abf91 100644 --- a/plexus-component-metadata.changes +++ b/plexus-component-metadata.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:33:04 UTC 2024 - Fridrich Strba + +- Add dependency on plexus-xml where relevant + * this will be needed for smooth upgrade to plexus-utils 4.0.0 + ------------------------------------------------------------------- Tue Feb 20 14:46:35 UTC 2024 - Fridrich Strba diff --git a/plexus-component-metadata.spec b/plexus-component-metadata.spec index 5bd3273..c209d34 100644 --- a/plexus-component-metadata.spec +++ b/plexus-component-metadata.spec @@ -44,6 +44,7 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations) BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) +BuildRequires: mvn(org.codehaus.plexus:plexus-xml) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.jdom:jdom2) BuildRequires: mvn(org.ow2.asm:asm) >= 7 @@ -87,6 +88,9 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata + # Generate OSGI info %pom_xpath_inject "pom:project" " bundle diff --git a/plexus-containers.changes b/plexus-containers.changes index 562e304..bdc03fc 100644 --- a/plexus-containers.changes +++ b/plexus-containers.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:33:09 UTC 2024 - Fridrich Strba + +- Add dependency on plexus-xml where relevant + * this will be needed for smooth upgrade to plexus-utils 4.0.0 + ------------------------------------------------------------------- Tue Feb 20 14:46:18 UTC 2024 - Fridrich Strba diff --git a/plexus-containers.spec b/plexus-containers.spec index c8a5187..fdb2bde 100644 --- a/plexus-containers.spec +++ b/plexus-containers.spec @@ -35,10 +35,11 @@ Source100: %{name}-build.tar.xz BuildRequires: ant BuildRequires: fdupes BuildRequires: guava -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: junit BuildRequires: plexus-classworlds BuildRequires: plexus-utils +BuildRequires: plexus-xml BuildRequires: xbean BuildArch: noarch %if %{with tests} @@ -78,7 +79,7 @@ Group: Documentation/HTML %setup -q -n %{name}-%{name}-%{version} -a100 mkdir -p lib -build-jar-repository -s lib plexus/classworlds plexus/utils guava/guava junit xbean/xbean-reflect +build-jar-repository -s lib plexus/classworlds plexus/utils plexus/xml guava/guava junit xbean/xbean-reflect %if %{with tests} build-jar-repository -s lib objectweb-asm/asm objectweb-asm/asm-commons hamcrest/core %endif @@ -97,6 +98,9 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-component-metadata + # Generate OSGI info %pom_xpath_inject "pom:project" " bundle diff --git a/plexus-metadata-generator.changes b/plexus-metadata-generator.changes index 4861605..a6769ad 100644 --- a/plexus-metadata-generator.changes +++ b/plexus-metadata-generator.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:33:15 UTC 2024 - Fridrich Strba + +- Add dependency on plexus-xml where relevant + * this will be needed for smooth upgrade to plexus-utils 4.0.0 + ------------------------------------------------------------------- Tue Feb 20 14:45:18 UTC 2024 - Fridrich Strba diff --git a/plexus-metadata-generator.spec b/plexus-metadata-generator.spec index e456993..8692ec5 100644 --- a/plexus-metadata-generator.spec +++ b/plexus-metadata-generator.spec @@ -39,7 +39,7 @@ Patch1000: %{name}-nomojo.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: fdupes -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildRequires: jdom2 BuildRequires: junit BuildRequires: objectweb-asm >= 7 @@ -48,6 +48,7 @@ BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-containers-container-default BuildRequires: plexus-utils +BuildRequires: plexus-xml BuildRequires: qdox >= 2 BuildRequires: xbean Requires: apache-commons-cli @@ -58,6 +59,7 @@ Requires: plexus-cli Requires: plexus-containers-component-annotations = %{version} Requires: plexus-containers-container-default = %{version} Requires: plexus-utils +Requires: plexus-xml Requires: qdox >= 2 Requires: xbean BuildArch: noarch @@ -83,7 +85,7 @@ Group: Documentation/HTML %setup -q -n %{base_name}-%{base_name}-%{version} -a100 mkdir -p lib -build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils jdom2/jdom2 commons-cli qdox plexus/cli +build-jar-repository -s lib %{base_name} objectweb-asm/asm objectweb-asm/asm-commons plexus/classworlds plexus/utils plexus/xml jdom2/jdom2 commons-cli qdox plexus/cli %if %{with tests} build-jar-repository -s lib hamcrest/core xbean/xbean-reflect %endif @@ -106,6 +108,9 @@ rm -rf plexus-container-default/src/test/java/org/codehaus/plexus/hierarchy %pom_add_dep org.ow2.asm:asm:5.0.3:runtime plexus-container-default %pom_add_dep org.ow2.asm:asm-commons:5.0.3:runtime plexus-container-default +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-container-default +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 plexus-%{comp_name} + # Generate OSGI info %pom_xpath_inject "pom:project" " bundle @@ -160,7 +165,7 @@ install -dm 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr plexus-%{comp_name}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name} +%jpackage_script org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli "" "" %{name}:%{base_name}/plexus-container-default:%{base_name}/plexus-component-annotations:objectweb-asm/asm:plexus-classworlds:plexus/utils:plexus/xml:jdom2/jdom2:commons-cli:qdox:plexus/cli:guava/guava:xbean/xbean-reflect %{name} %files -f .mfiles %license LICENSE-2.0.txt LICENSE.MIT