From 4e4b500359b8140ef22c157ca3baf267ecf855cfd7c7d55cac7b5c53e3231b94 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Apr 2024 17:37:48 +0000 Subject: [PATCH] Accepting request 1164198 from Java:packages:test Depend on plexus-xml OBS-URL: https://build.opensuse.org/request/show/1164198 OBS-URL: https://build.opensuse.org/package/show/Java:packages/modello?expand=0&rev=36 --- modello-maven-plugin.changes | 6 ++++++ modello-maven-plugin.spec | 2 ++ modello.changes | 6 ++++++ modello.spec | 7 ++++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modello-maven-plugin.changes b/modello-maven-plugin.changes index e581d94..200fa7a 100644 --- a/modello-maven-plugin.changes +++ b/modello-maven-plugin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:32:17 UTC 2024 - Fridrich Strba + +- Add dependency on plexus-xml where relevant + * this will be needed for smooth upgrade to plexus-utils 4.0.0 + ------------------------------------------------------------------- Wed Feb 21 22:14:06 UTC 2024 - Fridrich Strba diff --git a/modello-maven-plugin.spec b/modello-maven-plugin.spec index 0e9ba9f..469603a 100644 --- a/modello-maven-plugin.spec +++ b/modello-maven-plugin.spec @@ -90,6 +90,8 @@ cp -p %{SOURCE1} LICENSE %pom_remove_dep :sisu-guice modello-core %pom_add_dep com.google.inject:guice modello-core +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core + %pom_remove_dep :jackson-bom %pom_disable_module modello-plugin-jackson modello-plugins diff --git a/modello.changes b/modello.changes index f25d313..f326c25 100644 --- a/modello.changes +++ b/modello.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:32:12 UTC 2024 - Fridrich Strba + +- Add dependency on plexus-xml where relevant + * this will be needed for smooth upgrade to plexus-utils 4.0.0 + ------------------------------------------------------------------- Wed Feb 21 22:14:06 UTC 2024 - Fridrich Strba diff --git a/modello.spec b/modello.spec index fa65ddc..e9de335 100644 --- a/modello.spec +++ b/modello.spec @@ -41,6 +41,7 @@ BuildRequires: plexus-classworlds BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils +BuildRequires: plexus-xml BuildRequires: sisu-plexus BuildRequires: unzip Requires: aopalliance @@ -52,6 +53,7 @@ Requires: plexus-build-api Requires: plexus-classworlds Requires: plexus-containers-component-annotations Requires: plexus-utils +Requires: plexus-xml Requires: sisu-inject Requires: sisu-plexus BuildArch: noarch @@ -85,6 +87,8 @@ cp -p %{SOURCE1} LICENSE %pom_remove_dep :sisu-guice modello-core %pom_add_dep com.google.inject:guice modello-core +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 modello-core + %pom_remove_dep :jackson-bom %pom_disable_module modello-plugin-jackson modello-plugins @@ -117,6 +121,7 @@ build-jar-repository -s lib \ plexus/cli \ plexus/plexus-build-api \ plexus/utils \ + plexus/xml \ plexus-containers/plexus-component-annotations \ plexus-metadata-generator \ qdox @@ -166,7 +171,7 @@ done %fdupes -s %{buildroot}%{_javadocdir} # script -%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/plexus-build-api:guava %{name} true +%jpackage_script org.codehaus.modello.ModelloCli "" "" modello:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:guava %{name} true %files -f .mfiles %license LICENSE