diff --git a/tycho.spec b/tycho.spec index a4552e6..abf75cc 100644 --- a/tycho.spec +++ b/tycho.spec @@ -246,6 +246,7 @@ tar -xf %{SOURCE10} pushd bootstrap 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 \ usr/lib/eclipse/plugins/org.eclipse.osgi_*.jar ; do xmvn -o install:install-file -Dfile=$f -Dpackaging=jar -DgroupId=org.eclipse.tycho -Dmaven.repo.local=$(pwd)/../.m2 \ -DartifactId=$(echo $(basename $f) | cut -d_ -f1) -Dversion=$(echo "${f%.jar}" | cut -d_ -f2) @@ -281,6 +282,7 @@ jar uf boot/tycho-maven-plugin.jar META-INF/plexus/components.xml # Create XMvn metadata for the new JARs and POMs by customizing system Tycho metadata. sed -i -e 's/xmlns=".*"//' boot/tycho-metadata.xml %pom_xpath_remove -f "metadata/artifacts/artifact[artifactId='org.eclipse.osgi']" boot/tycho-metadata.xml +%pom_xpath_remove -f "metadata/artifacts/artifact[artifactId='org.eclipse.osgi.util']" boot/tycho-metadata.xml %pom_xpath_remove -f "metadata/artifacts/artifact[artifactId='org.eclipse.osgi.services']" boot/tycho-metadata.xml %pom_xpath_remove -f "metadata/artifacts/artifact[artifactId='org.eclipse.osgi.compatibility.state']" boot/tycho-metadata.xml sed -i ' @@ -337,6 +339,7 @@ cp %{SOURCE3} %{SOURCE5} . %if %{with bootstrap} # Install our own copy of OSGi runtime when bootstrapping to avoid external dep on Eclipse for b in org.eclipse.osgi \ + org.eclipse.osgi.util \ org.eclipse.osgi.services \ org.eclipse.osgi.compatibility.state ; do osgiJarPath=$(find .m2/org/eclipse/tycho/$b/*/ -name "*.jar")