diff --git a/maven.changes b/maven.changes index c43f5c9..d12b05f 100644 --- a/maven.changes +++ b/maven.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:21:14 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 15:10:43 UTC 2024 - Fridrich Strba diff --git a/maven.spec b/maven.spec index 378d3bd..97ae4b4 100644 --- a/maven.spec +++ b/maven.spec @@ -80,6 +80,7 @@ BuildRequires: plexus-interpolation BuildRequires: plexus-metadata-generator BuildRequires: plexus-sec-dispatcher >= 2.0 BuildRequires: plexus-utils +BuildRequires: plexus-xml BuildRequires: qdox BuildRequires: sisu-inject BuildRequires: sisu-plexus @@ -149,6 +150,7 @@ Requires: plexus-containers-component-annotations Requires: plexus-interpolation Requires: plexus-sec-dispatcher Requires: plexus-utils +Requires: plexus-xml Requires: sisu-inject Requires: sisu-plexus Requires: slf4j @@ -216,6 +218,11 @@ sed -i "s/distributionName=.*/distributionName=Apache\ Maven/" `find -name build %pom_xpath_remove pom:parent/pom:relativePath +for i in maven-compat maven-core maven-embedder maven-model maven-model-builder maven-plugin-api maven-resolver-provider maven-settings-builder +do + %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 $i +done + %{mvn_alias} :maven-resolver-provider :maven-aether-provider %build @@ -247,6 +254,7 @@ build-jar-repository -s lib \ plexus/plexus-cipher \ plexus/plexus-sec-dispatcher \ plexus/utils \ + plexus/xml \ qdox \ slf4j/api \ slf4j/simple \ @@ -322,6 +330,7 @@ build-jar-repository -p %{buildroot}%{homedir}/lib \ plexus/interpolation \ plexus/plexus-sec-dispatcher \ plexus/utils \ + plexus/xml \ plexus-containers/plexus-component-annotations \ slf4j/api \ slf4j/jcl-over-slf4j