diff --git a/.gitignore b/.gitignore index 3fc2da8..910d22a 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ maven-repo.tar.xz /.project /eclipse-bootstrap.tar.xz /fedoraproject-p2-*.tar.xz +/eclipse-bootstrap-neon.tar.xz diff --git a/sources b/sources index 56e68e8..3ac6ac9 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 9d9d533b4adff029b92564d393fab84c fedoraproject-p2-4e1319.tar.xz -0a14e091316e0a467f94c7821b9e21e6 org.eclipse.tycho-tycho-0.23.0.tar.xz -cd436a0741267ce86e97184cfee608e9 eclipse-bootstrap.tar.xz +ed271eb952e0f1ecb826e012f46e89b5 org.eclipse.tycho-tycho-0.25.0.tar.xz +cd138887effcd44e7fad58290ca9db76 eclipse-bootstrap-neon.tar.xz diff --git a/tycho-bootstrap.sh b/tycho-bootstrap.sh index cf5c3ff..63af775 100755 --- a/tycho-bootstrap.sh +++ b/tycho-bootstrap.sh @@ -3,9 +3,9 @@ . $(pwd)/tycho-scripts.sh eclipse_bootstrap=$1 -preV='0.23.0' -v='0.23.0-SNAPSHOT' -osgiV='3.10.100.v20150602-1500' +preV='0.25.0' +v='0.25.0-SNAPSHOT' +osgiV='3.11.0.v20160419-1000' fp2V='0.0.1-SNAPSHOT' bundles=() bundles[0]='tycho-bundles/org.eclipse.tycho.embedder.shared' @@ -88,7 +88,9 @@ popd # Run the build on this maven reactor project for proj in ${reactorprojs[@]} ; do isolateProject ${proj} - xmvn -o -f "${proj}/pom.xml" -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.test.skip=true clean install + xmvn -o -f "${proj}/pom.xml" -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.test.skip=true \ + -Dmaven.compiler.source=1.7 -Dmaven.compiler.target=1.7 \ + clean install unifyProject ${proj} done diff --git a/tycho-eclipse-neon.patch b/tycho-eclipse-neon.patch new file mode 100644 index 0000000..15923c8 --- /dev/null +++ b/tycho-eclipse-neon.patch @@ -0,0 +1,23 @@ +--- tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java.orig 2016-04-20 12:22:19.317665808 +0100 ++++ tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockServiceImpl.java 2016-04-20 12:24:38.059763976 +0100 +@@ -12,9 +12,11 @@ + package org.eclipse.tycho.core.locking; + + import java.io.File; ++import java.util.concurrent.atomic.AtomicBoolean; + + import org.codehaus.plexus.component.annotations.Component; + import org.eclipse.osgi.internal.framework.EquinoxContainer; ++import org.eclipse.osgi.internal.framework.EquinoxConfiguration.ConfigValues; + import org.eclipse.osgi.internal.location.BasicLocation; + import org.eclipse.osgi.service.datalocation.Location; + import org.eclipse.tycho.locking.facade.FileLockService; +@@ -26,7 +28,7 @@ + private Location anyLocation; + + public FileLockServiceImpl() { +- anyLocation = new BasicLocation(null, null, false, null, new EquinoxContainer(null).getConfiguration()); ++ anyLocation = new BasicLocation(null, null, false, null, new ConfigValues(null), new EquinoxContainer(null), new AtomicBoolean(false)); + } + + /* diff --git a/tycho-fix-bootstrap-build.patch b/tycho-fix-bootstrap-build.patch index 93fd723..bd3f3d4 100644 --- a/tycho-fix-bootstrap-build.patch +++ b/tycho-fix-bootstrap-build.patch @@ -22,15 +22,12 @@ diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml index 4c0c304..bfa9030 100644 --- a/tycho-compiler-jdt/pom.xml +++ b/tycho-compiler-jdt/pom.xml -@@ -25,10 +25,19 @@ - +@@ -23,8 +23,17 @@ -- + - org.codehaus.plexus - plexus-component-metadata -- -+ + org.codehaus.plexus + plexus-component-metadata + 1.5.5 @@ -42,10 +39,9 @@ index 4c0c304..bfa9030 100644 + + + -+ + - diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml index 923405d..33ce36d 100644 --- a/tycho-compiler-plugin/pom.xml @@ -170,8 +166,8 @@ index e52cf18..bcd8c91 100644 --- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml +++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml @@ -52,17 +52,6 @@ - tycho-packaging-plugin ${project.version} + maven-plugin - - org.eclipse.tycho diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch index b422b29..2e2bd8d 100644 --- a/tycho-fix-build.patch +++ b/tycho-fix-build.patch @@ -5,8 +5,6 @@ Subject: [PATCH] Fix the Tycho build to work on Fedora. Minor fixes of limited scope needed to have Tycho building on Fedora. -Remove org.eclipse.equinox.concurrent until present in Fedora Eclipse. - Tycho upstream currently depends upon 0.15.0 when building 0.16.0-SNAPSHOT, which doesn't have reactor plugin version checking. In Fedora we depend on the previously built version which has that version @@ -20,29 +18,13 @@ Update to using maven-surefire 2.18. Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 --- - .../META-INF/MANIFEST.MF | 2 +- .../eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java | 2 +- .../src/main/java/org/eclipse/tycho/test/util/HttpServer.java | 8 ++++++-- - .../tycho-bundles-external/tycho-bundles-external.product | 1 - - .../tycho-standalone-p2-director/p2 Director.product | 1 - .../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++- .../eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java | 2 +- .../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------ 8 files changed, 17 insertions(+), 14 deletions(-) -diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF -index 4243cfd..eca4c01 100644 ---- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF -+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF -@@ -9,7 +9,7 @@ Fragment-Host: org.eclipse.tycho.p2.maven.repository - Require-Bundle: org.junit, - org.eclipse.equinox.p2.publisher, - org.eclipse.equinox.ds, -- org.mockito -+ org.mockito.mockito-core - Import-Package: org.eclipse.tycho.locking.facade, - org.eclipse.tycho.repository.local.testutil, - org.eclipse.tycho.repository.streaming.testutil, diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java index 7afa13e..82962f9 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java @@ -82,30 +64,6 @@ index 6e65627..eefc753 100644 connector.setPort(port); jetty.addConnector(connector); -diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product -index 814afe1..0dc0980 100644 ---- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product -+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product -@@ -43,7 +43,6 @@ - - - -- - - - -diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product -index 771d4f7..eabd0d9 100644 ---- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product -+++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product -@@ -42,7 +42,6 @@ - - - -- - - - diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java index b00c344..bc05c2d 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java diff --git a/tycho-fix-surefire.patch b/tycho-fix-surefire.patch index 1676d28..c428cee 100644 --- a/tycho-fix-surefire.patch +++ b/tycho-fix-surefire.patch @@ -157,7 +157,7 @@ index 991edc1..83732d5 100644 +++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF @@ -5,9 +5,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2", Eclipse-AutoStart: true - Bundle-Version: 0.23.0 + Bundle-Version: 0.25.0 Bundle-ClassPath: ., - jars/surefire-booter-2.17.jar, - jars/surefire-api-2.17.jar, @@ -319,10 +319,10 @@ index 9f1e332..62a16fb 100644 List defaultExcludes = Arrays.asList("**/*$*"); @@ -879,8 +899,8 @@ public class TestMojo extends AbstractMojo { } else { - includeList = defaultIncludes; + excludeList = defaultExcludes; } -- DirectoryScanner scanner = new DirectoryScanner(testClassesDirectory, includeList, excludes != null ? excludes -- : defaultExcludes, Collections. emptyList()); +- DirectoryScanner scanner = new DirectoryScanner(testClassesDirectory, includeList, excludeList, +- Collections. emptyList()); + DirectoryScanner scanner = new DirectoryScanner(testClassesDirectory, + new TestListResolver(includeList, excludes != null ? excludes : defaultExcludes)); DefaultScanResult scanResult = scanner.scan(); diff --git a/tycho-port-to-jetty-9.3.0.patch b/tycho-port-to-jetty-9.3.0.patch deleted file mode 100644 index 328d51b..0000000 --- a/tycho-port-to-jetty-9.3.0.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/AbstractMonitorServlet.java~ 2015-03-29 16:42:21.976690003 +0200 -+++ tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/AbstractMonitorServlet.java 2015-03-29 16:48:04.996306637 +0200 -@@ -21,8 +21,6 @@ - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletResponse; - --import org.eclipse.jetty.server.Request; -- - public abstract class AbstractMonitorServlet extends GenericServlet { - - private static final long serialVersionUID = -7271350776954812609L; -@@ -42,7 +40,7 @@ - HttpServletRequest req = (HttpServletRequest) request; - HttpServletResponse res = (HttpServletResponse) response; - -- String uri = ((Request) req).getUri().toString(); -+ String uri = req.getRequestURI(); - if (!uri.endsWith(".sha1") && !uri.endsWith(".md5")) { - accessedUrls.add(uri); - } -@@ -51,7 +49,7 @@ - } - - protected void addUri(HttpServletRequest req) { -- String uri = ((Request) req).getUri().toString(); -+ String uri = req.getRequestURI(); - if (!accessedUrls.contains(uri)) { - accessedUrls.add(uri); - } diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index 4fad1c0..4daf2a9 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -82,7 +82,7 @@ diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/ index 1d3a029..2ec5c59 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java -@@ -12,12 +12,19 @@ package org.eclipse.tycho.p2.remote; +@@ -12,14 +12,18 @@ package org.eclipse.tycho.p2.remote; import java.io.File; import java.io.IOException; @@ -91,9 +91,8 @@ index 1d3a029..2ec5c59 100644 +import java.net.URL; import org.eclipse.core.runtime.IProgressMonitor; -+import org.eclipse.core.runtime.IStatus; -+import org.eclipse.core.runtime.Status; -+import org.eclipse.equinox.internal.p2.repository.Activator; + import org.eclipse.core.runtime.IStatus; + import org.eclipse.core.runtime.Status; import org.eclipse.equinox.internal.p2.repository.CacheManager; +import org.eclipse.equinox.internal.p2.repository.Messages; import org.eclipse.equinox.internal.p2.repository.Transport; @@ -101,15 +100,15 @@ index 1d3a029..2ec5c59 100644 +import org.eclipse.osgi.util.NLS; import org.eclipse.tycho.core.shared.MavenContext; import org.eclipse.tycho.core.shared.MavenLogger; - + import org.eclipse.tycho.p2.impl.Activator; @@ -48,6 +55,13 @@ class RemoteRepositoryCacheManager extends CacheManager { @Override - public File createCache(URI repositoryLocation, String prefix, IProgressMonitor monitor) throws IOException, - ProvisionException { + public File createCache(URI repositoryLocation, String prefix, IProgressMonitor monitor) + throws IOException, ProvisionException { + try { + new URL(repositoryLocation.toASCIIString()); + } catch (MalformedURLException e) { -+ throw new ProvisionException(new Status(IStatus.ERROR, Activator.ID, ++ throw new ProvisionException(new Status(IStatus.ERROR, org.eclipse.equinox.internal.p2.repository.Activator.ID, + ProvisionException.REPOSITORY_NOT_FOUND, NLS.bind(Messages.CacheManager_CannotLoadNonUrlLocation, + repositoryLocation), null)); + } @@ -144,7 +143,7 @@ index c614e15..d6ae1af 100644 logger.warn("Target location type '" + locationDefinition.getTypeDescription() + "' is not supported"); @@ -278,8 +284,13 @@ public final class TargetDefinitionResolver { - loadedRepositories = new ArrayList(); + loadedRepositories = new ArrayList<>(); for (Repository repository : locationDefinition.getRepositories()) { - repositoryIdManager.addMapping(repository.getId(), repository.getLocation()); - loadedRepositories.add(loadRepository(repository)); @@ -212,7 +211,7 @@ index 41fb4c6..75b25ac 100644 import org.eclipse.equinox.p2.query.IQueryResult; import org.eclipse.equinox.p2.query.QueryUtil; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepositoryManager; -@@ -272,9 +275,43 @@ public class TargetPlatformFactoryImpl implements TargetPlatformFactory { +@@ -273,9 +276,43 @@ public class TargetPlatformFactoryImpl implements TargetPlatformFactory { metadataRepositories.add(localMetadataRepository); } @@ -259,8 +258,8 @@ index 41fb4c6..75b25ac 100644 } result.addAll(pomDependenciesContent.gatherMavenInstallableUnits()); -@@ -322,7 +359,7 @@ public class TargetPlatformFactoryImpl implements TargetPlatformFactory { - List allRemoteArtifactRepositories = new ArrayList(); +@@ -329,7 +366,7 @@ public class TargetPlatformFactoryImpl implements TargetPlatformFactory { + List allRemoteArtifactRepositories = new ArrayList<>(); for (MavenRepositoryLocation location : completeRepositories) { - if (!offline || URIUtil.isFileURI(location.getURL())) { @@ -352,9 +351,9 @@ index 7c99168..28ad59f 100644 --- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product +++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product @@ -77,6 +77,7 @@ - + + diff --git a/tycho.spec b/tycho.spec index d02de95..f7024f9 100644 --- a/tycho.spec +++ b/tycho.spec @@ -8,16 +8,16 @@ # This basically uses javac + xmvn to build only the Tycho components # required to perform a full Tycho build # Most common usage : A library (in Fedora) used by Tycho's runtime broke API -%global tycho_bootstrap 0 +%global tycho_bootstrap 1 # Set 'eclipse_bootstrap' if Eclipse from buildroot cannot help build Tycho # This basically provides a location for usage of pre-bundled Eclipse # Possible uses : Need to build Tycho before Eclipse in fresh buildroot -%global eclipse_bootstrap 0 +%global eclipse_bootstrap 1 # When building version under development (non-release) # %%global snap -SNAPSHOT %global snap %{nil} -%global git_tag tycho-0.23.0 +%global git_tag tycho-0.25.0 %global fp_p2_sha 4e1319 %global fp_p2_version 0.0.1 @@ -26,8 +26,8 @@ %define __requires_exclude osgi* Name: %{?scl_prefix}tycho -Version: 0.23.0 -Release: 17%{?dist} +Version: 0.25.0 +Release: 1%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven # license file is missing but all files having some licensing information are ASL 2.0 @@ -42,9 +42,10 @@ Source1: EmptyMojo.java Source2: tycho-scripts.sh Source3: tycho-bootstrap.sh Source4: tycho-debundle.sh -# Fedora Eclipse bundles (needed when Eclipse not present) to build Tycho +# Fedora Eclipse bundles needed to build Tycho when Eclipse is not present +# or when the Eclipse that is present is not compatible %if %{eclipse_bootstrap} -Source5: eclipse-bootstrap.tar.xz +Source5: eclipse-bootstrap-neon.tar.xz %endif # Eclipse Plugin Project supporting filesystem as p2 repository # https://github.com/rgrunber/fedoraproject-p2 @@ -60,14 +61,14 @@ Patch3: %{pkg_name}-use-custom-resolver.patch Patch4: %{pkg_name}-maven-delegation.patch # Additional changes needed just for bootstrap build Patch5: %{pkg_name}-fix-bootstrap-build.patch -Patch6: %{pkg_name}-port-to-jetty-9.3.0.patch # Accepted upstream: https://git.eclipse.org/r/49897 Patch7: %{pkg_name}-port-to-plexus-archiver-3.0.1.patch Patch8: tycho-maven-archiver-3.0.1.patch +Patch9: tycho-eclipse-neon.patch BuildArch: noarch -BuildRequires: java-devel >= 1:1.8 +BuildRequires: java-devel BuildRequires: maven-local >= 4.2.0 BuildRequires: maven-clean-plugin BuildRequires: maven-dependency-plugin @@ -100,7 +101,7 @@ BuildRequires: sac BuildRequires: sat4j BuildRequires: xz-java %else -BuildRequires: eclipse-platform +BuildRequires: eclipse-platform >= 4.6.0 %endif BuildRequires: jetty-http BuildRequires: jetty-util @@ -118,7 +119,7 @@ Requires: maven-verifier Requires: objectweb-asm Requires: ecj %if ! %{eclipse_bootstrap} -Requires: eclipse-platform +Requires: eclipse-platform >= 4.6.0 %endif # Tycho always tries to resolve all build plugins, even if they are @@ -176,9 +177,9 @@ tar -xf %{SOURCE6} %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch6 -p0 %patch7 -p0 %patch8 -p0 +%patch9 -p0 find tycho-core -iname '*html' -delete @@ -202,9 +203,6 @@ sed -i '/^ org.ow2.asm:asm-all -%pom_xpath_set "pom:dependency[pom:artifactId='asm-debug-all']/pom:artifactId" "asm-all" tycho-artifactcomparator - # we don't have org.apache.commons:commons-compress:jar:sources %pom_xpath_remove "pom:dependency[pom:classifier='sources' and pom:artifactId='commons-compress']" tycho-p2/tycho-p2-director-plugin @@ -218,12 +216,25 @@ done # Fix bundle names sed -i -e 's/org\.hamcrest/org.hamcrest.core/' tycho-bundles/pom.xml -sed -i -e 's/org\.mockito/org.mockito.mockito-core/' tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF +sed -i -e 's/org\.mockito/org.mockito.mockito-core/' \ + tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF \ + tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF # Bootstrap Build %if %{eclipse_bootstrap} +# Unpack a compatible version of Eclipse we can use to build against tar -xf %{SOURCE5} ln -s lib64 bootstrap/usr/lib +# Install OSGi bundles into local repo to override any incompatible system version +# that may be already installed +pushd bootstrap +for f in usr/lib64/eclipse/plugins/org.eclipse.osgi.compatibility.state_*.jar \ + usr/lib64/eclipse/plugins/org.eclipse.osgi.services_*.jar \ + usr/lib64/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) +done +popd %endif %if %{tycho_bootstrap} @@ -373,36 +384,28 @@ install -pm 755 %{SOURCE7} $RPM_BUILD_ROOT%{_javadir}-utils/ %if %{eclipse_bootstrap} # org.eclipse.osgi -osgiJarPath=`find ".m2/org" -name "org.eclipse.osgi_*.jar"` - -# http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/tree/externalpoms/org.eclipse.osgi.pom -echo ' - - 4.0.0 - org.eclipse.osgi - org.eclipse.osgi - 3.10.100.v20150602-1500 -' > JPP.tycho-osgi.pom +osgiJarPath=$(find .m2/org/eclipse/tycho/org.eclipse.osgi/*/ -name "*.jar") +osgiPomPath=$(find .m2/org/eclipse/tycho/org.eclipse.osgi/*/ -name "*.pom") -install -pm 644 JPP.tycho-osgi.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.pom -install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/tycho/osgi.jar -%add_maven_depmap JPP.tycho-osgi.pom tycho/osgi.jar -a "org.eclipse.tycho:org.eclipse.osgi" +install -pm 644 $osgiPomPath $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.pom +install -m 644 -T $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/tycho/osgi.jar +%add_maven_depmap JPP.tycho-osgi.pom tycho/osgi.jar -a "org.eclipse.osgi:org.eclipse.osgi" # org.eclipse.osgi.compatibility.state -osgiStateJarPath=`find ".m2/org" -name "org.eclipse.osgi.compatibility.state_*.jar"` - -# http://git.eclipse.org/c/linuxtools/org.eclipse.linuxtools.eclipse-build.git/tree/externalpoms/org.eclipse.osgi.compatibility.state.pom -echo ' - - 4.0.0 - org.eclipse.osgi - org.eclipse.osgi.compatibility.state - 1.0.100.v20150602-1500 -' > JPP.tycho-osgi.compatibility.state.pom - -install -pm 644 JPP.tycho-osgi.compatibility.state.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.compatibility.state.pom -install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/tycho/osgi.compatibility.state.jar -%add_maven_depmap JPP.tycho-osgi.compatibility.state.pom tycho/osgi.compatibility.state.jar -a "org.eclipse.tycho:org.eclipse.osgi.compatibility.state" +osgiStateJarPath=$(find .m2/org/eclipse/tycho/org.eclipse.osgi.compatibility.state/*/ -name "*.jar") +osgiStatePomPath=$(find .m2/org/eclipse/tycho/org.eclipse.osgi.compatibility.state/*/ -name "*.pom") + +install -pm 644 $osgiStatePomPath $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.compatibility.state.pom +install -m 644 -T $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/tycho/osgi.compatibility.state.jar +%add_maven_depmap JPP.tycho-osgi.compatibility.state.pom tycho/osgi.compatibility.state.jar -a "org.eclipse.osgi:org.eclipse.osgi.compatibility.state" + +# org.eclipse.osgi.services +osgiServJarPath=$(find .m2/org/eclipse/tycho/org.eclipse.osgi.services/*/ -name "*.jar") +osgiServPomPath=$(find .m2/org/eclipse/tycho/org.eclipse.osgi.services/*/ -name "*.pom") + +install -pm 644 $osgiServPomPath $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.services.pom +install -m 644 -T $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/tycho/osgi.services.jar +%add_maven_depmap JPP.tycho-osgi.services.pom tycho/osgi.services.jar -a "org.eclipse.osgi:org.eclipse.osgi.services" %endif # Symlink XMvn P2 plugin with all dependencies so that it can be loaded by XMvn @@ -425,6 +428,10 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li %{_javadocdir}/tycho %changelog +* Wed Apr 20 2016 Mat Booth - 0.25.0-1 +- Update to latest upstream release +- Full bootstrap mode due to incompatibility with Eclipse Mars + * Thu Apr 14 2016 Mat Booth - 0.23.0-17 - Fix build against new maven-archiver, which removed some deprecated methods that tycho was using