From e5a6ebd7e43dacb873eab57594d9a562c636cc5864033c787e63b9b0c8eef9bb Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Apr 2024 17:39:00 +0000 Subject: [PATCH] Accepting request 1164195 from Java:packages:test Depend on plexus-xml OBS-URL: https://build.opensuse.org/request/show/1164195 OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-plugin-tools?expand=0&rev=53 --- maven-plugin-plugin-bootstrap.changes | 6 +++++ maven-plugin-plugin-bootstrap.spec | 36 ++++++++++++++++----------- maven-plugin-plugin.changes | 6 +++++ maven-plugin-plugin.spec | 5 ++++ maven-plugin-tools.changes | 6 +++++ maven-plugin-tools.spec | 6 +++++ 6 files changed, 50 insertions(+), 15 deletions(-) diff --git a/maven-plugin-plugin-bootstrap.changes b/maven-plugin-plugin-bootstrap.changes index db170ed..38b6ca7 100644 --- a/maven-plugin-plugin-bootstrap.changes +++ b/maven-plugin-plugin-bootstrap.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:29:22 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:39:44 UTC 2024 - Fridrich Strba diff --git a/maven-plugin-plugin-bootstrap.spec b/maven-plugin-plugin-bootstrap.spec index 7203186..c1359ba 100644 --- a/maven-plugin-plugin-bootstrap.spec +++ b/maven-plugin-plugin-bootstrap.spec @@ -42,6 +42,7 @@ BuildRequires: maven-resolver-api BuildRequires: plexus-build-api BuildRequires: plexus-utils BuildRequires: plexus-velocity +BuildRequires: plexus-xml BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: unzip @@ -72,6 +73,10 @@ artifact metadata and a generic help goal. # Remove test dependencies because tests are skipped anyways. %pom_xpath_remove "pom:dependency[pom:scope='test']" +for i in maven-plugin-report-plugin maven-plugin-tools-annotations maven-plugin-tools-api maven-plugin-tools-generators maven-script; do + %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i} +done + %pom_remove_dep org.junit:junit-bom %pom_remove_dep :maven-plugin-tools-ant maven-plugin-plugin %pom_remove_dep :maven-plugin-tools-beanshell maven-plugin-plugin @@ -81,27 +86,28 @@ artifact metadata and a generic help goal. %build mkdir -p lib build-jar-repository -s lib \ - maven/maven-artifact \ - maven/maven-core \ - maven/maven-model \ - maven/maven-plugin-api \ - maven/maven-repository-metadata \ - maven/maven-settings \ - maven-plugin-tools/maven-plugin-annotations \ - maven-plugin-tools/maven-plugin-tools-api \ - maven-plugin-tools/maven-plugin-tools-generators \ + maven/maven-artifact \ + maven/maven-core \ + maven/maven-model \ + maven/maven-plugin-api \ + maven/maven-repository-metadata \ + maven/maven-settings \ + maven-plugin-tools/maven-plugin-annotations \ + maven-plugin-tools/maven-plugin-tools-api \ + maven-plugin-tools/maven-plugin-tools-generators \ maven-resolver/maven-resolver-api \ - org.eclipse.sisu.inject \ - org.eclipse.sisu.plexus \ + org.eclipse.sisu.inject \ + org.eclipse.sisu.plexus \ plexus/plexus-build-api \ - plexus/utils \ - plexus-velocity/plexus-velocity + plexus/utils \ + plexus/xml \ + plexus-velocity/plexus-velocity %{mvn_file} :%{artifactId} %{base_name}/%{artifactId} pushd %{artifactId} %{ant} \ - -Dtest.skip=true \ - jar + -Dtest.skip=true \ + jar popd %{mvn_artifact} pom.xml %{mvn_artifact} %{artifactId}/pom.xml %{artifactId}/target/%{artifactId}-%{version}.jar diff --git a/maven-plugin-plugin.changes b/maven-plugin-plugin.changes index 7ef6269..ed0eafd 100644 --- a/maven-plugin-plugin.changes +++ b/maven-plugin-plugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:29:28 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:39:45 UTC 2024 - Fridrich Strba diff --git a/maven-plugin-plugin.spec b/maven-plugin-plugin.spec index 4c9b1be..6bbd1d9 100644 --- a/maven-plugin-plugin.spec +++ b/maven-plugin-plugin.spec @@ -45,6 +45,7 @@ BuildRequires: mvn(org.apache.maven:maven-plugin-api) BuildRequires: mvn(org.apache.maven:maven-repository-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.codehaus.plexus:plexus-velocity) +BuildRequires: mvn(org.codehaus.plexus:plexus-xml) BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) Obsoletes: %{name}-bootstrap @@ -81,6 +82,10 @@ API documentation for %{name}. # Remove test dependencies because tests are skipped anyways. %pom_xpath_remove "pom:dependency[pom:scope='test']" +for i in maven-plugin-report-plugin maven-plugin-tools-annotations maven-plugin-tools-api maven-plugin-tools-generators maven-script; do + %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i} +done + %pom_remove_dep org.junit:junit-bom %pom_remove_dep :maven-plugin-tools-ant maven-plugin-plugin %pom_remove_dep :maven-plugin-tools-beanshell maven-plugin-plugin diff --git a/maven-plugin-tools.changes b/maven-plugin-tools.changes index 9de94a0..e3657b2 100644 --- a/maven-plugin-tools.changes +++ b/maven-plugin-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:29:34 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:39:46 UTC 2024 - Fridrich Strba diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 1cc333f..12055ef 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -49,6 +49,7 @@ BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-languages BuildRequires: plexus-utils BuildRequires: plexus-velocity +BuildRequires: plexus-xml BuildRequires: qdox BuildRequires: sisu-inject BuildRequires: sisu-plexus @@ -160,6 +161,10 @@ API documentation for %{name}. %pom_remove_dep net.sf.jtidy:jtidy maven-plugin-tools-generators +for i in maven-plugin-report-plugin maven-plugin-tools-annotations maven-plugin-tools-api maven-plugin-tools-generators maven-script; do + %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i} +done + %build mkdir -p lib build-jar-repository -s lib \ @@ -189,6 +194,7 @@ build-jar-repository -s lib \ plexus-containers/plexus-component-annotations \ plexus-languages/plexus-java \ plexus/utils \ + plexus/xml \ plexus-velocity/plexus-velocity \ qdox \ slf4j/api \