From 6bf7c0512d23c712cf929b749514baaa292e047b0271cc93a32e38152f7a80fd Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 2 Apr 2024 17:37:02 +0000
Subject: [PATCH] Accepting request 1164202 from Java:packages:test

Depend on plexus-xml

OBS-URL: https://build.opensuse.org/request/show/1164202
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=54
---
 tycho.changes |  6 ++++++
 tycho.spec    | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/tycho.changes b/tycho.changes
index 6589d31..d3ddd76 100644
--- a/tycho.changes
+++ b/tycho.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr  2 17:35:47 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Add dependency on plexus-xml where relevant
+  * this will be needed for smooth upgrade to plexus-utils 4.0.0
+
 -------------------------------------------------------------------
 Thu Feb 29 17:36:22 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/tycho.spec b/tycho.spec
index 495fb27..34d7b88 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -107,6 +107,7 @@ BuildRequires:  mvn(org.codehaus.plexus:plexus-compiler-manager)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-xml)
 BuildRequires:  mvn(org.eclipse.jdt:ecj)
 BuildRequires:  mvn(org.eclipse.sisu:org.eclipse.sisu.plexus)
 BuildRequires:  mvn(org.fedoraproject.xmvn:xmvn-api)
@@ -272,6 +273,25 @@ done
 %pom_disable_module tycho-testing-harness
 %pom_remove_dep -r :::test
 
+for i in \
+    tycho-artifactcomparator \
+    tycho-compiler-plugin \
+    tycho-core \
+    tycho-metadata-model \
+    tycho-pomgenerator-plugin \
+    tycho-source-plugin \
+    tycho-testing-harness; do
+  %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 ${i}
+done
+
+for i in \
+    tycho-buildtimestamp-jgit \
+    tycho-custom-bundle-plugin \
+    tycho-pomless \
+    tycho-source-feature-plugin; do
+  %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 tycho-extras/${i}
+done
+
 # Bootstrap Build
 %if %{with bootstrap}