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 \