From 0f4e1721ba5815b45507b497915df293be861ac29b79fa4e528ecc068eec06e3 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 11 May 2022 11:41:37 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=29 --- fakepom.xml | 8 ++++++++ tycho.changes | 5 +++++ tycho.spec | 2 ++ 3 files changed, 15 insertions(+) create mode 100644 fakepom.xml diff --git a/fakepom.xml b/fakepom.xml new file mode 100644 index 0000000..c6eb9c1 --- /dev/null +++ b/fakepom.xml @@ -0,0 +1,8 @@ + + + 4.0.0 + rt.equinox.framework + org.eclipse.equinox.framework + 4.14.0-SNAPSHOT + pom + diff --git a/tycho.changes b/tycho.changes index 8fb4b20..6fbf50e 100644 --- a/tycho.changes +++ b/tycho.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 11 11:40:55 UTC 2022 - Fridrich Strba + +- Fix bootstrapping with new version of maven-install-plugin + ------------------------------------------------------------------- Mon Apr 11 19:51:41 UTC 2022 - Fridrich Strba diff --git a/tycho.spec b/tycho.spec index 87d1d34..29c17db 100644 --- a/tycho.spec +++ b/tycho.spec @@ -135,6 +135,7 @@ Name: tycho # or when the Eclipse that is present is not compatible %if %{with bootstrap} Source10: eclipse-bootstrap-2019-12.tar.xz +Source11: fakepom.xml %endif %if %{with junit5} BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform) @@ -273,6 +274,7 @@ tar -xf %{SOURCE10} # Install OSGi bundles into local repo to override any incompatible system version # that may be already installed pushd bootstrap +xmvn -o install:install-file -Dfile=%{SOURCE11} -DpomFile=%{SOURCE11} for f in usr/lib/eclipse/plugins/org.eclipse.osgi.compatibility.state_*.jar \ usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar \ usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar \ From 82918fd81d881df6ae60a7ef52005a2ac2157753fdec886264a52088c1ba8161 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 11 May 2022 11:53:26 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=30 --- tycho.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho.spec b/tycho.spec index 29c17db..c95fe60 100644 --- a/tycho.spec +++ b/tycho.spec @@ -274,7 +274,7 @@ tar -xf %{SOURCE10} # Install OSGi bundles into local repo to override any incompatible system version # that may be already installed pushd bootstrap -xmvn -o install:install-file -Dfile=%{SOURCE11} -DpomFile=%{SOURCE11} +xmvn -o install:install-file -Dfile=%{SOURCE11} -DpomFile=%{SOURCE11} -Dmaven.repo.local=$(pwd)/../.m2 for f in usr/lib/eclipse/plugins/org.eclipse.osgi.compatibility.state_*.jar \ usr/lib/eclipse/plugins/org.eclipse.osgi.services_*.jar \ usr/lib/eclipse/plugins/org.eclipse.osgi.util_*.jar \ From eca6466b19bf53748e56cf46b637162a2dcb9477bd080d452208e934d949fd7e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 12 May 2022 06:18:30 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=31 --- tycho.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tycho.spec b/tycho.spec index c95fe60..88c0a67 100644 --- a/tycho.spec +++ b/tycho.spec @@ -384,6 +384,8 @@ for b in org.eclipse.osgi \ org.eclipse.osgi.compatibility.state ; do osgiJarPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.jar") osgiPomPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.pom") + %pom_remove_parent $osgiPomPath + %pom_xpath_set "pom:project/pom:groupId" "org.eclipse.tycho" $osgiPomPath %{mvn_artifact} $osgiPomPath $osgiJarPath done %endif