diff --git a/.gitignore b/.gitignore index 37c1546..f58f829 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /maven-repo.tar.bz2 /tycho-0.10.0.tar.xz +maven-repo.tar.xz +tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz diff --git a/make_bootstrap_repo.sh b/make_bootstrap_repo.sh index e411248..4a7cf5c 100755 --- a/make_bootstrap_repo.sh +++ b/make_bootstrap_repo.sh @@ -1,8 +1,8 @@ #!/bin/bash rm -rf $(pwd)/.m2 -export TYCHO_TARGET_PLATFORM=/usr/lib64/eclipse +export TYCHO_TARGET_PLATFORM=/usr/lib/eclipse -mvn-local -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.debug=true -X -Dmaven.test.skip install || exit +mvn-local -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.debug=true -X -Dmaven.test.skip -Dsite.generation=true clean install 1>log1.txt 2>log2.txt || exit tar caf maven-repo.tar.xz .m2 diff --git a/sources b/sources index 56f3740..61ccbc8 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -2605877260f5930c43aac4d92cc2e5ff maven-repo.tar.bz2 +cca75e3e09dbc187e2314413c1e3f02f maven-repo.tar.xz +4a3986b897468bb77c43b812a952ecca tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz diff --git a/tycho-0001-Remove-tycho-testing-harness.patch b/tycho-0001-Remove-tycho-testing-harness.patch new file mode 100644 index 0000000..b43daac --- /dev/null +++ b/tycho-0001-Remove-tycho-testing-harness.patch @@ -0,0 +1,27 @@ +From e95346302691d7f1ca18b95d2f1d32de53204d26 Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky +Date: Tue, 27 Sep 2011 17:16:42 +0200 +Subject: [PATCH 1/3] Remove tycho-testing-harness + +It needs maven2 parts to build, but we need depmap for other parts of +tycho. Thus we disable it for now and this is not a big deal because we +are not running tests anyway (yet). +--- + pom.xml | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/pom.xml b/pom.xml +index b36df6d..3a3e97c 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -371,7 +371,6 @@ + tycho-metadata-model + tycho-embedder-api + tycho-core +- tycho-testing-harness + tycho-equinox-launching + + tycho-compiler-jdt +-- +1.7.8.4 + diff --git a/tycho-0002-Fix-Build-Issues.patch b/tycho-0002-Fix-Build-Issues.patch new file mode 100644 index 0000000..29a8889 --- /dev/null +++ b/tycho-0002-Fix-Build-Issues.patch @@ -0,0 +1,145 @@ +From f2800e23dc59b2f476d7f6ac178122937993c2d4 Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Thu, 27 Oct 2011 11:00:19 -0400 +Subject: [PATCH 2/3] Fix Build Issues. + +--- + tycho-compiler-plugin/pom.xml | 2 +- + .../eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------ + tycho-p2/tycho-p2-plugin/pom.xml | 2 +- + .../META-INF/MANIFEST.MF | 3 ++- + tycho-surefire/tycho-surefire-plugin/pom.xml | 8 ++++---- + 5 files changed, 14 insertions(+), 13 deletions(-) + +diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml +index 4413b1f..e6c7371 100644 +--- a/tycho-compiler-plugin/pom.xml ++++ b/tycho-compiler-plugin/pom.xml +@@ -59,7 +59,7 @@ + + org.eclipse.tycho + tycho-compiler-jdt +- ${project.version} ++ ${tychoBootstrapVersion} + + + +diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java +index f249506..0821f63 100644 +--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java ++++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java +@@ -19,7 +19,7 @@ import org.osgi.framework.Version; + public class OsgiManifest { + + private String location; +- private Headers headers; ++ private Headers headers; + + // cache for parsed values of commonly used headers + private String bundleSymbolicName; +@@ -54,7 +54,7 @@ public class OsgiManifest { + } + + private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException { +- String value = headers.get(headerKey); ++ String value = (String)headers.get(headerKey); + if (value == null) { + throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found"); + } +@@ -76,12 +76,12 @@ public class OsgiManifest { + && "dir".equals(bundleShapeElements[0].getValue()); + } + +- public Headers getHeaders() { ++ public Headers getHeaders() { + return headers; + } + + public String getValue(String key) { +- return headers.get(key); ++ return (String)headers.get(key); + } + + public String getBundleSymbolicName() { +@@ -113,7 +113,7 @@ public class OsgiManifest { + } + + private ManifestElement[] parseHeader(String key) { +- String value = headers.get(key); ++ String value = (String)headers.get(key); + if (value == null) { + return null; + } +@@ -126,7 +126,7 @@ public class OsgiManifest { + + private ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException { + try { +- return ManifestElement.parseHeader(key, headers.get(key)); ++ return ManifestElement.parseHeader(key, (String)headers.get(key)); + } catch (BundleException e) { + throw new OsgiManifestParserException(location, e); + } +diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml +index 66f7548..887abef 100644 +--- a/tycho-p2/tycho-p2-plugin/pom.xml ++++ b/tycho-p2/tycho-p2-plugin/pom.xml +@@ -43,7 +43,7 @@ + + org.eclipse.tycho + tycho-equinox-launching +- ${project.version} ++ ${tychoBootstrapVersion} + + + org.eclipse.tycho +diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF +index c00b525..136f75c 100644 +--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF ++++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF +@@ -1,7 +1,8 @@ + Manifest-Version: 1.0 + Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2", + org.eclipse.ui.workbench;bundle-version="3.2.2";resolution:=optional, +- org.eclipse.core.runtime;bundle-version="3.2.0" ++ org.eclipse.core.runtime;bundle-version="3.2.0", ++ org.eclipse.ui;bundle-version="3.2.2" + Eclipse-AutoStart: true + Bundle-ClassPath: ., + jars/surefire-booter-2.10.jar, +diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml +index 9f91eeb..eff0159 100644 +--- a/tycho-surefire/tycho-surefire-plugin/pom.xml ++++ b/tycho-surefire/tycho-surefire-plugin/pom.xml +@@ -42,25 +42,25 @@ + + org.eclipse.tycho + tycho-equinox-launching +- ${project.version} ++ ${tychoBootstrapVersion} + + + + org.eclipse.tycho + org.eclipse.tycho.surefire.osgibooter +- ${project.version} ++ ${tychoBootstrapVersion} + runtime + + + org.eclipse.tycho + org.eclipse.tycho.surefire.junit +- ${project.version} ++ ${tychoBootstrapVersion} + runtime + + + org.eclipse.tycho + org.eclipse.tycho.surefire.junit4 +- ${project.version} ++ ${tychoBootstrapVersion} + runtime + + +-- +1.7.8.4 + diff --git a/tycho-0003-Jetty8-Update.patch b/tycho-0003-Jetty8-Update.patch new file mode 100644 index 0000000..b1fe287 --- /dev/null +++ b/tycho-0003-Jetty8-Update.patch @@ -0,0 +1,240 @@ +From 4bdd0a7f867c38a528b05b2a7dc138f1ed5e0539 Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Wed, 1 Feb 2012 10:15:41 -0500 +Subject: [PATCH 3/3] Update from Jetty 6 (org.mortbay) to Jetty 8 + (org.eclipse.jetty). + +--- + .../META-INF/MANIFEST.MF | 9 +++- + .../tycho/test/util/AbstractMonitorServlet.java | 3 +- + .../org/eclipse/tycho/test/util/HttpServer.java | 40 +++++++++++--------- + .../test/TYCHO279HttpProxy/ProxySupportTest.java | 10 ++-- + .../org/eclipse/tycho/test/util/HttpServer.java | 37 ++++++++++-------- + .../eclipse/tycho/test/util/UpdateSiteUtil.java | 10 ++-- + 6 files changed, 60 insertions(+), 49 deletions(-) + +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF +index 810371f..2739aab 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF +@@ -6,10 +6,13 @@ Bundle-Version: 0.14.0.qualifier + Bundle-RequiredExecutionEnvironment: J2SE-1.5 + Fragment-Host: org.eclipse.tycho.p2.resolver.impl + Require-Bundle: org.junit4, +- org.mortbay.jetty.server;bundle-version="6.1.23", +- org.mortbay.jetty.util;bundle-version="6.1.23", + javax.servlet;bundle-version="2.5.0", + org.eclipse.equinox.ds, +- org.eclipse.equinox.p2.transport.ecf ++ org.eclipse.equinox.p2.transport.ecf, ++ org.eclipse.jetty.http, ++ org.eclipse.jetty.security, ++ org.eclipse.jetty.server, ++ org.eclipse.jetty.servlet, ++ org.eclipse.jetty.util + Bundle-ActivationPolicy: lazy + Bundle-Vendor: %providerName +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/test/util/AbstractMonitorServlet.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/test/util/AbstractMonitorServlet.java +index 23d2bbe..93f2c8f 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/test/util/AbstractMonitorServlet.java ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/test/util/AbstractMonitorServlet.java +@@ -21,7 +21,8 @@ import javax.servlet.ServletResponse; + import javax.servlet.http.HttpServletRequest; + import javax.servlet.http.HttpServletResponse; + +-import org.mortbay.jetty.Request; ++import org.eclipse.jetty.server.Request; ++import org.eclipse.jetty.http.HttpURI; + + public abstract class AbstractMonitorServlet extends GenericServlet { + +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/test/util/HttpServer.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/test/util/HttpServer.java +index e3aa59c..957c5cf 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/test/util/HttpServer.java ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/test/util/HttpServer.java +@@ -17,15 +17,16 @@ import java.util.List; + import java.util.Map; + import java.util.Random; + +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.bio.SocketConnector; +-import org.mortbay.jetty.security.Constraint; +-import org.mortbay.jetty.security.ConstraintMapping; +-import org.mortbay.jetty.security.HashUserRealm; +-import org.mortbay.jetty.security.Password; +-import org.mortbay.jetty.servlet.Context; +-import org.mortbay.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.bio.SocketConnector; ++import org.eclipse.jetty.util.security.Constraint; ++import org.eclipse.jetty.security.ConstraintMapping; ++import org.eclipse.jetty.security.HashLoginService; ++import org.eclipse.jetty.security.ConstraintSecurityHandler; ++import org.eclipse.jetty.util.security.Password; ++import org.eclipse.jetty.servlet.ServletContextHandler; ++import org.eclipse.jetty.servlet.ServletHolder; + + public class HttpServer { + private static final int BIND_ATTEMPTS = 20; +@@ -34,13 +35,13 @@ public class HttpServer { + + private final Server server; + +- private final Context context; ++ private final ServletContextHandler context; + + private final int port; + + private final Map servers = new HashMap(); + +- private HttpServer(int port, Server server, Context context) { ++ private HttpServer(int port, Server server, ServletContextHandler context) { + this.port = port; + this.server = server; + this.context = context; +@@ -72,12 +73,12 @@ public class HttpServer { + server.addConnector(connector); + server.start(); + +- Context context; ++ ServletContextHandler context; + if (username != null) { +- context = new Context(server, "/", Context.SESSIONS | Context.SECURITY); ++ context = new ServletContextHandler(server, "/", ServletContextHandler.SESSIONS | ServletContextHandler.SECURITY); + +- HashUserRealm userRealm = new HashUserRealm("default"); +- userRealm.put(username, new Password(password)); ++ HashLoginService userRealm = new HashLoginService("default"); ++ userRealm.putUser(username, new Password(password), null); + + Constraint constraint = new Constraint(Constraint.__BASIC_AUTH, Constraint.ANY_ROLE); + constraint.setAuthenticate(true); +@@ -86,11 +87,14 @@ public class HttpServer { + constraintMapping.setPathSpec("/*"); + constraintMapping.setConstraint(constraint); + +- context.getSecurityHandler().setUserRealm(userRealm); ++ ConstraintSecurityHandler csh = new ConstraintSecurityHandler(); ++ csh.setConstraintMappings(new ConstraintMapping[] { constraintMapping }); ++ context.getSecurityHandler().setLoginService(userRealm); + context.getSecurityHandler().setAuthMethod(Constraint.__BASIC_AUTH); +- context.getSecurityHandler().setConstraintMappings(new ConstraintMapping[] { constraintMapping }); ++ context.setSecurityHandler(csh); ++ + } else { +- context = new Context(server, "/", 0); ++ context = new ServletContextHandler(server, "/", 0); + } + context.start(); + +diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO279HttpProxy/ProxySupportTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO279HttpProxy/ProxySupportTest.java +index f697ea3..a567c40 100644 +--- a/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO279HttpProxy/ProxySupportTest.java ++++ b/tycho-its/src/test/java/org/eclipse/tycho/test/TYCHO279HttpProxy/ProxySupportTest.java +@@ -35,11 +35,11 @@ import org.eclipse.tycho.test.AbstractTychoIntegrationTest; + import org.junit.After; + import org.junit.Before; + import org.junit.Test; +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.bio.SocketConnector; +-import org.mortbay.jetty.servlet.Context; +-import org.mortbay.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.bio.SocketConnector; ++import org.eclipse.jetty.servlet.ServletContextHandler; ++import org.eclipse.jetty.servlet.ServletHolder; + import org.sonatype.jettytestsuite.ProxyServer; + import org.sonatype.jettytestsuite.proxy.FileServerServlet; + import org.sonatype.jettytestsuite.proxy.MonitorableProxyServlet; +diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/util/HttpServer.java b/tycho-its/src/test/java/org/eclipse/tycho/test/util/HttpServer.java +index 452e6ee..f6cd7e1 100644 +--- a/tycho-its/src/test/java/org/eclipse/tycho/test/util/HttpServer.java ++++ b/tycho-its/src/test/java/org/eclipse/tycho/test/util/HttpServer.java +@@ -23,21 +23,22 @@ import javax.servlet.ServletException; + import javax.servlet.http.HttpServletRequest; + import javax.servlet.http.HttpServletResponse; + +-import org.mortbay.jetty.Connector; +-import org.mortbay.jetty.Request; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.bio.SocketConnector; +-import org.mortbay.jetty.handler.ContextHandler; +-import org.mortbay.jetty.handler.ContextHandlerCollection; +-import org.mortbay.jetty.security.Constraint; +-import org.mortbay.jetty.security.ConstraintMapping; +-import org.mortbay.jetty.security.HashUserRealm; +-import org.mortbay.jetty.security.Password; +-import org.mortbay.jetty.servlet.Context; +-import org.mortbay.jetty.servlet.DefaultServlet; +-import org.mortbay.jetty.servlet.ServletHandler; +-import org.mortbay.jetty.servlet.ServletHolder; +-import org.mortbay.util.URIUtil; ++import org.eclipse.jetty.server.Connector; ++import org.eclipse.jetty.server.Request; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.bio.SocketConnector; ++import org.eclipse.jetty.server.handler.ContextHandler; ++import org.eclipse.jetty.server.handler.ContextHandlerCollection; ++import org.eclipse.jetty.http.security.Constraint; ++import org.eclipse.jetty.security.ConstraintMapping; ++import org.eclipse.jetty.security.HashLoginService; ++import org.eclipse.jetty.security.ConstraintSecurityHandler; ++import org.eclipse.jetty.http.security.Password; ++import org.eclipse.jetty.servlet.ServletContextHandler; ++import org.eclipse.jetty.servlet.DefaultServlet; ++import org.eclipse.jetty.servlet.ServletHandler; ++import org.eclipse.jetty.servlet.ServletHolder; ++import org.eclipse.jetty.util.URIUtil; + + public class HttpServer { + private static class MonitoringServlet extends DefaultServlet { +@@ -122,7 +123,7 @@ public class HttpServer { + if (username != null) { + context = new Context(server, "/", Context.SESSIONS | Context.SECURITY); + +- HashUserRealm userRealm = new HashUserRealm("default"); ++ HashLoginService userRealm = new HashLoginService("default"); + userRealm.put(username, new Password(password)); + + Constraint constraint = new Constraint(Constraint.__BASIC_AUTH, Constraint.ANY_ROLE); +@@ -132,9 +133,11 @@ public class HttpServer { + constraintMapping.setPathSpec("/*"); + constraintMapping.setConstraint(constraint); + ++ ConstraintSecurityHandler csh = new ConstraintSecurityHandler(); ++ csh.setConstraintMappings(new ConstraintMapping[] { constraintMapping }); + context.getSecurityHandler().setUserRealm(userRealm); + context.getSecurityHandler().setAuthMethod(Constraint.__BASIC_AUTH); +- context.getSecurityHandler().setConstraintMappings(new ConstraintMapping[] { constraintMapping }); ++ context.setSecurityHandler(csh); + } else { + context = new Context(server, "/", 0); + } +diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/util/UpdateSiteUtil.java b/tycho-its/src/test/java/org/eclipse/tycho/test/util/UpdateSiteUtil.java +index 6b1ae65..9cafa96 100644 +--- a/tycho-its/src/test/java/org/eclipse/tycho/test/util/UpdateSiteUtil.java ++++ b/tycho-its/src/test/java/org/eclipse/tycho/test/util/UpdateSiteUtil.java +@@ -22,11 +22,11 @@ import org.apache.maven.it.util.cli.CommandLineUtils; + import org.apache.maven.it.util.cli.Commandline; + import org.apache.maven.it.util.cli.StreamConsumer; + import org.apache.maven.it.util.cli.WriterStreamConsumer; +-import org.mortbay.jetty.Handler; +-import org.mortbay.jetty.Server; +-import org.mortbay.jetty.handler.DefaultHandler; +-import org.mortbay.jetty.handler.HandlerList; +-import org.mortbay.jetty.handler.ResourceHandler; ++import org.eclipse.jetty.server.Handler; ++import org.eclipse.jetty.server.Server; ++import org.eclipse.jetty.server.handler.DefaultHandler; ++import org.eclipse.jetty.server.handler.HandlerList; ++import org.eclipse.jetty.server.handler.ResourceHandler; + + public class UpdateSiteUtil { + +-- +1.7.8.4 + diff --git a/tycho-version.patch b/tycho-version.patch new file mode 100644 index 0000000..675ac31 --- /dev/null +++ b/tycho-version.patch @@ -0,0 +1,685 @@ +diff --git a/pom.xml b/pom.xml +index 3a3e97c..cd956b3 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -46,7 +46,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + pom + + Tycho (Incubation) +diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml +index f459925..33efa48 100644 +--- a/target-platform-configuration/pom.xml ++++ b/target-platform-configuration/pom.xml +@@ -17,7 +17,7 @@ + + tycho + org.eclipse.tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + target-platform-configuration +diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF +index e5a62f0..fa0fd7d 100644 +--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF ++++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: Tycho Noop Equinox password provider (Incubation) + Bundle-SymbolicName: org.eclipse.tycho.noopsecurity;singleton:=true +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Require-Bundle: org.eclipse.equinox.security;bundle-version="1.0.100" + Bundle-RequiredExecutionEnvironment: J2SE-1.5 + Bundle-ActivationPolicy: lazy +diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml +index 31f3b98..b88b017 100644 +--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml ++++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.noopsecurity +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 3719b76..e3606cd 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 +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: Tycho Maven/p2 Repository Integration Tests (Incubation) + Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository.tests;singleton:=true +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Bundle-Vendor: %providerName + Bundle-RequiredExecutionEnvironment: J2SE-1.5 + Require-Bundle: org.eclipse.tycho.p2.maven.repository, +diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml +index 0865cd2..726f77f 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml ++++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.p2.maven.repository.tests +diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF +index 35214ba..d806b59 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF ++++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: Tycho Maven/p2 Repository Integration (Incubation) + Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository;singleton:=true +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Bundle-Vendor: %providerName + Bundle-RequiredExecutionEnvironment: J2SE-1.5 + Bundle-ActivationPolicy: lazy +diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml +index 261d0b0..b18a3b8 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml ++++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.p2.maven.repository +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.facade/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.facade/META-INF/MANIFEST.MF +index 0b9fc72..0f66a0f 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.facade/META-INF/MANIFEST.MF ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.facade/META-INF/MANIFEST.MF +@@ -6,7 +6,7 @@ Export-Package: org.eclipse.tycho.core.facade, + org.eclipse.tycho.p2.resolver.facade, + org.eclipse.tycho.p2.target.facade, + org.eclipse.tycho.repository.registry.facade +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Bundle-Name: Tycho p2 Resolver Maven/OSGi Facade (Incubation) + Bundle-ManifestVersion: 2 + Bundle-Description: Tycho integrates Maven with Eclipse and OSGi +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.facade/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.facade/pom.xml +index e76e262..4263574 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.facade/pom.xml ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.facade/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.p2.resolver.facade +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF +index 2739aab..744b00f 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: Tycho p2 Resolver Bundle Tests (Incubation) + Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl.test;singleton:=true +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Bundle-RequiredExecutionEnvironment: J2SE-1.5 + Fragment-Host: org.eclipse.tycho.p2.resolver.impl + Require-Bundle: org.junit4, +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml +index 7182a86..0e3f12b 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.p2.resolver.impl.test +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF +index d8cebb7..40f9f4a 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: Tycho p2 Resolver Bundle (Incubation) + Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl;singleton:=true +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Bundle-Activator: org.eclipse.tycho.p2.impl.Activator + Require-Bundle: org.eclipse.core.runtime, + org.eclipse.equinox.security;bundle-version="1.0.100", +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml +index 1965e64..a92b953 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.p2.resolver.impl +diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.facade/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.facade/META-INF/MANIFEST.MF +index 6586031..e728926 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.tools.facade/META-INF/MANIFEST.MF ++++ b/tycho-bundles/org.eclipse.tycho.p2.tools.facade/META-INF/MANIFEST.MF +@@ -1,5 +1,5 @@ + Manifest-Version: 1.0 +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Bundle-Name: Tycho p2 Tools Maven/OSGi Facade Tests (Incubation) + Bundle-ManifestVersion: 2 + Bundle-Description: Exposes tools for manipulating p2 data, which are implemented in OSGi bundles, to Maven plug-ins +diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.facade/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.facade/pom.xml +index 341bdc1..8539461 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.tools.facade/pom.xml ++++ b/tycho-bundles/org.eclipse.tycho.p2.tools.facade/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.p2.tools.facade +diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF +index 16ed86b..cc2a2dd 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF ++++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF +@@ -1,5 +1,5 @@ + Manifest-Version: 1.0 +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Bundle-Name: Tycho p2 Tools Bundle (Incubation) + Bundle-ManifestVersion: 2 + Bundle-Description: Implementation of tools for generating, copying, and using p2 repositories in Tycho +diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml +index 5d515b5..f58446e 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml ++++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.p2.tools.impl +diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF +index 862b54d..a83a06a 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF ++++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: Tycho p2 Tools Tests (Incubation) + Bundle-SymbolicName: org.eclipse.tycho.p2.tools.tests +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Bundle-RequiredExecutionEnvironment: J2SE-1.5 + Fragment-Host: org.eclipse.tycho.p2.tools.impl + Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)", +diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml +index 6aa49e3..9e91944 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml ++++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.p2.tools.tests +diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml +index 9a06b39..2c7208e 100644 +--- a/tycho-bundles/pom.xml ++++ b/tycho-bundles/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-bundles +diff --git a/tycho-bundles/tycho-bundles-target/pom.xml b/tycho-bundles/tycho-bundles-target/pom.xml +index 1d0c175..c585044 100644 +--- a/tycho-bundles/tycho-bundles-target/pom.xml ++++ b/tycho-bundles/tycho-bundles-target/pom.xml +@@ -5,7 +5,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + .. + + +diff --git a/tycho-bundles/tycho-p2-runtime/pom.xml b/tycho-bundles/tycho-p2-runtime/pom.xml +index a693d1e..3456eb2 100644 +--- a/tycho-bundles/tycho-p2-runtime/pom.xml ++++ b/tycho-bundles/tycho-p2-runtime/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-bundles +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-p2-runtime +diff --git a/tycho-bundles/tycho-p2-runtime/tycho-p2-runtime.product b/tycho-bundles/tycho-p2-runtime/tycho-p2-runtime.product +index 178f070..a1b680d 100644 +--- a/tycho-bundles/tycho-p2-runtime/tycho-p2-runtime.product ++++ b/tycho-bundles/tycho-p2-runtime/tycho-p2-runtime.product +@@ -1,7 +1,7 @@ + + + +- ++ + + + +diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml +index 080e6dd..c994bb5 100644 +--- a/tycho-compiler-jdt/pom.xml ++++ b/tycho-compiler-jdt/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + tycho-compiler-jdt + +diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml +index e6c7371..d383224 100644 +--- a/tycho-compiler-plugin/pom.xml ++++ b/tycho-compiler-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-compiler-plugin +diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml +index 2eb326b..6e1876a 100644 +--- a/tycho-core/pom.xml ++++ b/tycho-core/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + tycho-core + +diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml +index 89ea315..65a7926 100644 +--- a/tycho-embedder-api/pom.xml ++++ b/tycho-embedder-api/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + tycho-embedder-api + +diff --git a/tycho-equinox-api/pom.xml b/tycho-equinox-api/pom.xml +index 1761027..4c06325 100644 +--- a/tycho-equinox-api/pom.xml ++++ b/tycho-equinox-api/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + tycho-equinox-api + +diff --git a/tycho-equinox-launching/pom.xml b/tycho-equinox-launching/pom.xml +index 9aa4475..fea36da 100644 +--- a/tycho-equinox-launching/pom.xml ++++ b/tycho-equinox-launching/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + tycho-equinox-launching + +diff --git a/tycho-equinox/pom.xml b/tycho-equinox/pom.xml +index e1af3c7..1fd4d9d 100644 +--- a/tycho-equinox/pom.xml ++++ b/tycho-equinox/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + tycho-equinox + +diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml +index f325b05..b8bdbbd 100644 +--- a/tycho-its/pom.xml ++++ b/tycho-its/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + tycho-its + +diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml +index ac90464..a593aef 100644 +--- a/tycho-maven-plugin/pom.xml ++++ b/tycho-maven-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-maven-plugin +diff --git a/tycho-metadata-model/pom.xml b/tycho-metadata-model/pom.xml +index 2893fb1..e0de3b3 100644 +--- a/tycho-metadata-model/pom.xml ++++ b/tycho-metadata-model/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + tycho-metadata-model + +diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml +index b5ee7c5..f175853 100644 +--- a/tycho-p2/pom.xml ++++ b/tycho-p2/pom.xml +@@ -17,7 +17,7 @@ + + tycho + org.eclipse.tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-p2 +diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml +index eec1123..a9338f4 100644 +--- a/tycho-p2/tycho-p2-director-plugin/pom.xml ++++ b/tycho-p2/tycho-p2-director-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-p2 +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-p2-director-plugin +diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml +index 9aacbd5..1205fc2 100644 +--- a/tycho-p2/tycho-p2-facade/pom.xml ++++ b/tycho-p2/tycho-p2-facade/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-p2 +- 0.14.0-SNAPSHOT ++ 0.14.0 + + tycho-p2-facade + +diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml +index 887abef..f593a4e 100644 +--- a/tycho-p2/tycho-p2-plugin/pom.xml ++++ b/tycho-p2/tycho-p2-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-p2 +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-p2-plugin +diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml +index 5842474..4fd8048 100644 +--- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml ++++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-p2 +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-p2-publisher-plugin +diff --git a/tycho-p2/tycho-p2-repository-plugin/pom.xml b/tycho-p2/tycho-p2-repository-plugin/pom.xml +index 354cf6b..969d6de 100644 +--- a/tycho-p2/tycho-p2-repository-plugin/pom.xml ++++ b/tycho-p2/tycho-p2-repository-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-p2 +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-p2-repository-plugin +diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml +index 1151ed3..415cf8e 100644 +--- a/tycho-packaging-plugin/pom.xml ++++ b/tycho-packaging-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-packaging-plugin +diff --git a/tycho-pomgenerator-plugin/pom.xml b/tycho-pomgenerator-plugin/pom.xml +index 8f37f2f..70aec11 100644 +--- a/tycho-pomgenerator-plugin/pom.xml ++++ b/tycho-pomgenerator-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-pomgenerator-plugin +diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml +index c6874fa..3e79357 100644 +--- a/tycho-release/pom.xml ++++ b/tycho-release/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-release +diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml +index 5e77e5f..95f62ba 100644 +--- a/tycho-release/tycho-versions-plugin/pom.xml ++++ b/tycho-release/tycho-versions-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-release +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-versions-plugin +diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml +index 357c496..e534d3d 100644 +--- a/tycho-source-plugin/pom.xml ++++ b/tycho-source-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-source-plugin +diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF +index 012e4d2..4d017a4 100644 +--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF ++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: Tycho Surefire OSGi JUnit3 Runner (Incubation) + Bundle-SymbolicName: org.eclipse.tycho.surefire.junit;singleton:=true +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0" + Bundle-RequiredExecutionEnvironment: J2SE-1.5, + JavaSE-1.6 +diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml +index 2238cf0..af20702 100644 +--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml ++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-surefire +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.surefire.junit +diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF +index 92720ca..9dbed3c 100644 +--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF ++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF +@@ -2,7 +2,7 @@ Manifest-Version: 1.0 + Bundle-ManifestVersion: 2 + Bundle-Name: Tycho Surefire OSGi JUnit4 Runner (Incubation) + Bundle-SymbolicName: org.eclipse.tycho.surefire.junit4;singleton:=true +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0" + Bundle-RequiredExecutionEnvironment: J2SE-1.5, + JavaSE-1.6 +diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml +index 48c886b..4d25625 100644 +--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml ++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-surefire +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.surefire.junit4 +diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF +index 136f75c..f562d88 100644 +--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF ++++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF +@@ -7,7 +7,7 @@ Eclipse-AutoStart: true + Bundle-ClassPath: ., + jars/surefire-booter-2.10.jar, + jars/surefire-api-2.10.jar +-Bundle-Version: 0.14.0.qualifier ++Bundle-Version: 0.14.0 + Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation) + Bundle-ManifestVersion: 2 + Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true +diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml +index f8dce4f..425fb82 100644 +--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml ++++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-surefire +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + org.eclipse.tycho.surefire.osgibooter +diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml +index 44894c7..101e8bb 100644 +--- a/tycho-surefire/pom.xml ++++ b/tycho-surefire/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-surefire +diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml +index eff0159..6389e14 100644 +--- a/tycho-surefire/tycho-surefire-plugin/pom.xml ++++ b/tycho-surefire/tycho-surefire-plugin/pom.xml +@@ -17,7 +17,7 @@ + + org.eclipse.tycho + tycho-surefire +- 0.14.0-SNAPSHOT ++ 0.14.0 + + + tycho-surefire-plugin diff --git a/tycho.spec b/tycho.spec index ba7007b..2b905ef 100644 --- a/tycho.spec +++ b/tycho.spec @@ -1,5 +1,7 @@ %global bootstrap 1 +%global sha1 6391f1dafb35cbef48753e89c743ee9664a1c79d + %global e_osgi org.eclipse.osgi %global e_osgi_v 3.6.2.R36x_v20110210 %global e_osgi_v2 3.8.0.v20110726-1606 @@ -8,19 +10,25 @@ %global e_core_v2 3.8.0.v_C03 %global eclipsedir %{_libdir}/eclipse +%if %{bootstrap} +%global snap %{nil} +%else +%global snap -SNAPSHOT +%endif + Name: tycho -Version: 0.13.0 -Release: 0.1.a74b1717%{?dist} +Version: 0.14.0 +Release: 1%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven Group: Development/Libraries # license file is missing but all files having some licensing information are ASL 2.0 License: ASL 2.0 URL: http://tycho.sonatype.org/ -# git clone git://github.com/sonatype/sonatype-tycho -# git archive --prefix="tycho-0.12.0/" --format=tar a74b1717 | xz > tycho-0.12.0.tar.xz -Source0: %{name}-%{version}.tar.xz +# git clone git://git.eclipse.org/gitroot/tycho/org.eclipse.tycho.git +# git archive --prefix="tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d/" --format=tar 6391f1 | xz > tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz +Source0: %{name}-%{version}-%{sha1}.tar.xz # this is a workaround for maven-plugin-plugin changes that happened after # version 2.4.3 (impossible to have empty mojo created as aggregate). This @@ -32,9 +40,12 @@ Source2: depmap.xml %if %{bootstrap} Source3: maven-repo.tar.xz %endif - -Patch0: 0001-Port-to-surefire-2.9.patch -Patch1: 0002-Remove-tycho-testing-harness.patch +Patch0: %{name}-0001-Remove-tycho-testing-harness.patch +Patch1: %{name}-0002-Fix-Build-Issues.patch +Patch2: %{name}-0003-Jetty8-Update.patch +%if %{bootstrap} +Patch3: %{name}-version.patch +%endif BuildArch: noarch @@ -42,6 +53,7 @@ BuildRequires: jpackage-utils BuildRequires: java-devel BuildRequires: maven BuildRequires: maven-compiler-plugin +BuildRequires: maven-dependency-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin @@ -50,6 +62,8 @@ BuildRequires: maven-resources-plugin BuildRequires: maven-shared-verifier BuildRequires: maven-shared-osgi BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit +BuildRequires: maven-surefire-provider-junit4 BuildRequires: plexus-containers-component-metadata BuildRequires: eclipse-jdt BuildRequires: decentxml @@ -102,17 +116,16 @@ Requires: jpackage-utils This package contains the API documentation for %{name}. %prep -%setup -q -%patch0 -p1 -b .harness -%patch1 -p1 -b .container - -find tycho-core -iname '*html' -delete +%setup -q -n %{name}-%{version}-%{sha1} -# this will make tycho accept any version of bundle -sed -Ei 's/(org.sonatype.tycho|org.eclipse.tycho' tycho-bundles/tycho-p2-runtime/pom.xml +find tycho-core -iname '*html' -delete # place empty mojo in place mkdir -p tycho-maven-plugin/src/main/java/org/fedoraproject @@ -120,11 +133,12 @@ pushd tycho-maven-plugin/src/main/java/org/fedoraproject cp %{SOURCE1} . popd + %if %{bootstrap} tar xf %{SOURCE3} - -#cp -Lr %{eclipsedir}/* .m2/org/sonatype/tycho/tycho-p2-runtime/0.10.0/eclipse/ - +%else +mkdir -p .m2/org/eclipse/%{name}/%{name}-p2-runtime/%{version} +unzip -d .m2/org/eclipse/%{name}/%{name}-p2-runtime/%{version} %{_javadir}/%{name}/%{name}-p2-runtime.zip %endif # prepare directories for eclipse symlinks @@ -139,8 +153,8 @@ mkdir -p .m2/org/eclipse/tycho/%{e_core}/%{e_core_v2}/ pushd .m2/org/sonatype/tycho ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \ %{e_osgi}/%{e_osgi_v}/%{e_osgi}-%{e_osgi_v}.jar -#ln -sf %{eclipsedir}/plugins/org.eclipse.jdt.core_*.jar \ -# %{e_core}/%{e_core_v}/%{e_core}-%{e_core_v}.jar || \ +ln -sf %{eclipsedir}/plugins/org.eclipse.jdt.core_*.jar \ + %{e_core}/%{e_core_v}/%{e_core}-%{e_core_v}.jar || \ ln -sf %{eclipsedir}/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \ %{e_core}/%{e_core_v}/%{e_core}-%{e_core_v}.jar popd @@ -148,15 +162,14 @@ popd pushd .m2/org/eclipse/tycho ln -sf %{eclipsedir}/plugins/org.eclipse.osgi_*.jar \ %{e_osgi}/%{e_osgi_v2}/%{e_osgi}-%{e_osgi_v2}.jar -#ln -sf %{eclipsedir}/plugins/org.eclipse.jdt.core_*.jar \ -# %{e_core}/%{e_core_v2}/%{e_core}-%{e_core_v2}.jar || \ +ln -sf %{eclipsedir}/plugins/org.eclipse.jdt.core_*.jar \ + %{e_core}/%{e_core_v2}/%{e_core}-%{e_core_v2}.jar || \ ln -sf %{eclipsedir}/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \ %{e_core}/%{e_core_v2}/%{e_core}-%{e_core_v2}.jar popd %build export TYCHO_TARGET_PLATFORM=%{eclipsedir} - mvn-rpmbuild -Dmaven.local.debug=true -X -Dmaven.test.skip=true \ -Dmaven.local.depmap.file=%{SOURCE2} \ -Dtycho.targetPlatform=$TYCHO_TARGET_PLATFORM install javadoc:aggregate @@ -169,18 +182,17 @@ for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \ tycho-{core,embedder-api,equinox{,-api,-launching}} \ tycho-{metadata-model,p2/tycho-p2-{director-plugin,facade,plugin,{publisher,repository}-plugin}} \ tycho-{maven,packaging,pomgenerator,source}-plugin tycho-release/tycho-versions-plugin \ - tycho-p2-resolver/org.eclipse.tycho.p2.{resolver,tools}.facade \ - tycho-p2-resolver/tycho-p2-resolver-impl/org* \ + tycho-bundles/org* \ tycho-surefire/{tycho-surefire-plugin,org.eclipse.tycho.surefire.{osgibooter,junit,junit4}}; do echo $mod aid=`basename $mod` install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom - install -m 644 $mod/target/$aid-%{version}.jar %{buildroot}%{_javadir}/%{name}/$aid.jar + install -m 644 $mod/target/$aid-%{version}%{snap}.jar %{buildroot}%{_javadir}/%{name}/$aid.jar %add_to_maven_depmap org.eclipse.tycho $aid %{version} JPP/%{name} $aid %add_to_maven_depmap org.sonatype.tycho $aid %{version} JPP/%{name} $aid done -for pommod in tycho-p2 tycho-p2-resolver{,/tycho-p2-resolver-impl} \ +for pommod in tycho-p2 tycho-bundles{,/org.eclipse.tycho.p2.resolver.impl} \ tycho-surefire tycho-release \ ;do aid=`basename $pommod` @@ -191,7 +203,7 @@ for pommod in tycho-p2 tycho-p2-resolver{,/tycho-p2-resolver-impl} \ done # runtime -pushd tycho-p2-resolver/tycho-p2-resolver-impl/tycho-p2-runtime +pushd tycho-bundles/tycho-p2-runtime install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-p2-runtime.pom install -m 644 target/tycho-p2-runtime-%{version}*.zip %{buildroot}%{_javadir}/%{name}/tycho-p2-runtime.zip %add_to_maven_depmap org.eclipse.tycho tycho-p2-runtime %{version} JPP/%{name} tycho-p2-runtime @@ -223,6 +235,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Wed Feb 01 2012 Roland Grunberg - 0.14.0-1 +- Update to 0.14.0. + * Sat Jan 14 2012 Fedora Release Engineering - 0.10.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild