rpms
/
tycho
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 0.17.0 Release.

This commit is contained in:
Roland Grunberg 2013-04-02 11:40:08 -04:00
parent 9ac076ba3f
commit a0cacb8f5a
9 changed files with 395 additions and 318 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources
View File

@ -1,2 +1,2 @@
ac8c931e958eb696da26f82eeb10ffea maven-repo.tar.xz
336c6a9cae94df32da549e8fb7ce7473 org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab.tar.bz2
7f89f1b9b37cca4977a7c839abfd31fd tycho-0.17.x.tar.bz2

402
tycho-bootstrap.patch
View File

File diff suppressed because it is too large Load Diff

188
tycho-fix-build.patch
View File

@ -1,4 +1,4 @@
From c26ae38c86a8d8084323214326518795bdfc9417 Mon Sep 17 00:00:00 2001
From d5cf464057b6b835847732bad53f401c847e7533 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH] Fix the Tycho build to work on Fedora.
@ -21,14 +21,19 @@ Update to using Jetty 9 API.
Fix to build with Plexus Compiler 2.2 API.
Use Hamcrest 1.1 API only.
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
pom.xml | 9 ++---
tycho-artifactcomparator/pom.xml | 4 +--
.../META-INF/MANIFEST.MF | 2 +-
.../META-INF/MANIFEST.MF | 2 +-
.../local/TemporaryLocalMavenRepository.java | 6 +---
.../resolver/ProjectorResolutionStrategyTest.java | 4 +--
.../p2/target/ee/CustomEEResolutionHandler.java | 2 +-
.../org/eclipse/tycho/test/util/HttpServer.java | 5 +--
.../org/eclipse/tycho/test/util/HttpServer.java | 8 +++--
.../org/eclipse/tycho/test/util/LogVerifier.java | 4 +--
.../org/eclipse/tycho/test/util/P2Context.java | 8 +----
.../org/eclipse/tycho/test/util/TychoMatchers.java | 5 +--
.../tycho-bundles-external.product | 1 -
.../p2 Director.product | 1 -
tycho-compiler-jdt/pom.xml | 4 ---
@ -38,10 +43,10 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../core/maven/TychoMavenLifecycleParticipant.java | 4 ++-
.../tycho/test/AbstractTychoIntegrationTest.java | 11 +++---
.../tycho/testing/EmptyLifecycleExecutor.java | 8 +++++
15 files changed, 52 insertions(+), 51 deletions(-)
18 files changed, 62 insertions(+), 67 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5776b0e..0aa43ea 100644
index 2822951..fd9920b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,12 +208,12 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
@ -72,7 +77,7 @@ index 5776b0e..0aa43ea 100644
<artifactId>surefire-booter</artifactId>
<version>2.10</version>
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
index 27e15a9..5fa695c 100644
index cd0fb9a..01815d8 100644
--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
@@ -24,7 +24,7 @@
@ -91,32 +96,41 @@ index 27e15a9..5fa695c 100644
-</project>
\ No newline at end of file
+</project>
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 e65eb5b..fc38d0c 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
@@ -6,7 +6,7 @@ Bundle-Version: 0.17.0.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Fragment-Host: org.eclipse.tycho.p2.maven.repository
-Require-Bundle: org.junit4;bundle-version="4.8.1",
+Require-Bundle: org.junit;bundle-version="4.8.1",
org.eclipse.equinox.p2.publisher;bundle-version="1.2.0",
org.eclipse.equinox.ds;bundle-version="1.4.0",
org.eclipse.tycho.p2.resolver.impl
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 80be496..0af92d6 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
@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl.test;singleton:=true
Bundle-Version: 0.17.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Fragment-Host: org.eclipse.tycho.p2.resolver.impl
-Require-Bundle: org.junit4,
+Require-Bundle: org.junit,
org.eclipse.equinox.ds,
org.eclipse.equinox.p2.transport.ecf
Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java
index 40c5fc0..c344056 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java
@@ -53,11 +53,7 @@ public class TemporaryLocalMavenRepository extends ExternalResource {
public File getLocalRepositoryRoot() {
if (repoRoot == null) {
- try {
- repoRoot = tempManager.newFolder("repository");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ repoRoot = tempManager.newFolder("repository");
}
return repoRoot;
}
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java
index e39ae93..ee27774 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java
@@ -11,11 +11,11 @@
package org.eclipse.tycho.p2.resolver;
-import static org.hamcrest.CoreMatchers.containsString;
-import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
+import static org.junit.internal.matchers.IsCollectionContaining.hasItem;
+import static org.junit.matchers.JUnitMatchers.containsString;
import java.util.ArrayList;
import java.util.Collection;
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 87c9e11..927cea5 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java
@ -131,13 +145,16 @@ index 87c9e11..927cea5 100644
} else if (PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE.equals(namespace)) {
result.add(new SystemCapability(Type.JAVA_PACKAGE, name, version));
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java
index 1a27b00..eb110dc 100644
index 57b4e10..47423e5 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java
@@ -20,9 +20,10 @@ import java.util.Random;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
@@ -17,9 +17,13 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
+import org.eclipse.jetty.security.ConstraintMapping;
+import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.security.HashLoginService;
+import org.eclipse.jetty.server.AbstractNetworkConnector;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Server;
@ -145,21 +162,86 @@ index 1a27b00..eb110dc 100644
+import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.security.Constraint;
@@ -68,7 +69,7 @@ public class HttpServer {
import org.junit.rules.ExternalResource;
@@ -77,7 +81,7 @@ public class HttpServer extends ExternalResource {
private static HttpServer doStartServer(String username, String password, int port) throws Exception {
Server server = new Server();
private static RunningServer startServerOnPort(int port) throws Exception {
Server jetty = new Server();
- Connector connector = new SocketConnector();
+ AbstractNetworkConnector connector = new ServerConnector(server);
+ AbstractNetworkConnector connector = new ServerConnector(jetty);
connector.setPort(port);
server.addConnector(connector);
jetty.addConnector(connector);
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
index e1bae59..414d155 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java
@@ -70,9 +70,9 @@ public class LogVerifier extends Verifier {
MemoryLog logger;
boolean expectNoErrors = true;
- List<Matcher<? super String>> loggedErrorsMatchers = new ArrayList<Matcher<? super String>>();
+ List<Matcher<? extends String>> loggedErrorsMatchers = new ArrayList<Matcher<? extends String>>();
boolean expectNoWarnings = false;
- List<Matcher<? super String>> loggedWarningsMatchers = new ArrayList<Matcher<? super String>>();
+ List<Matcher<? extends String>> loggedWarningsMatchers = new ArrayList<Matcher<? extends String>>();
MemoryLog getInitializedLogger() {
if (logger == null) {
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java
index 283f9d0..ac34dda 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java
@@ -10,8 +10,6 @@
*******************************************************************************/
package org.eclipse.tycho.test.util;
-import java.io.IOException;
-
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.junit.Rule;
@@ -45,11 +43,7 @@ public final class P2Context extends ExternalResource {
*/
public IProvisioningAgent getAgent() throws ProvisionException {
if (agent == null) {
- try {
- agent = Activator.createProvisioningAgent(tempManager.newFolder("p2agent").toURI());
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ agent = Activator.createProvisioningAgent(tempManager.newFolder("p2agent").toURI());
}
return agent;
}
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
index 9454823..6526bf1 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
@@ -16,8 +16,8 @@ import java.util.List;
import org.hamcrest.CoreMatchers;
import org.hamcrest.Description;
import org.hamcrest.Matcher;
-import org.hamcrest.TypeSafeMatcher;
-import org.hamcrest.core.SubstringMatcher;
+import org.junit.internal.matchers.SubstringMatcher;
+import org.junit.internal.matchers.TypeSafeMatcher;
import org.junit.matchers.JUnitMatchers;
/**
@@ -26,6 +26,7 @@ import org.junit.matchers.JUnitMatchers;
* @see CoreMatchers
* @see JUnitMatchers
*/
+@SuppressWarnings("restriction")
public class TychoMatchers {
/**
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
index dea801e..4733ad0 100644
index 9bc34bb..f22a55c 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -41,7 +41,6 @@
@@ -42,7 +42,6 @@
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
@ -168,10 +250,10 @@ index dea801e..4733ad0 100644
<plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
index dd80b5e..797b4ba 100644
index 62b354d..11f65fb 100644
--- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
+++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
@@ -41,7 +41,6 @@
@@ -42,7 +42,6 @@
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
<plugin id="org.eclipse.equinox.app"/>
<plugin id="org.eclipse.equinox.common"/>
@ -180,7 +262,7 @@ index dd80b5e..797b4ba 100644
<plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
index 9872fd7..8a12fde 100644
index 3857d62..fa6c17c 100644
--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
@@ -38,10 +38,6 @@
@ -195,7 +277,7 @@ index 9872fd7..8a12fde 100644
<artifactId>plexus-compiler-api</artifactId>
</dependency>
diff --git a/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java b/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
index f87983d..d5b1ca7 100644
index f87983d..718e2fc 100644
--- a/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
+++ b/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java
@@ -28,9 +28,10 @@ import java.util.regex.Pattern;
@ -203,8 +285,8 @@ index f87983d..d5b1ca7 100644
import org.codehaus.plexus.compiler.AbstractCompiler;
import org.codehaus.plexus.compiler.CompilerConfiguration;
-import org.codehaus.plexus.compiler.CompilerError;
+import org.codehaus.plexus.compiler.CompilerMessage;
import org.codehaus.plexus.compiler.CompilerException;
+import org.codehaus.plexus.compiler.CompilerMessage;
import org.codehaus.plexus.compiler.CompilerOutputStyle;
+import org.codehaus.plexus.compiler.CompilerResult;
import org.codehaus.plexus.component.annotations.Component;
@ -328,7 +410,7 @@ index f87983d..d5b1ca7 100644
}
diff --git a/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java b/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java
index a6ffdcd..0f0b912 100644
index 74ba22c..7b3603d 100644
--- a/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java
+++ b/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java
@@ -29,7 +29,7 @@ import org.apache.maven.plugin.AbstractMojo;
@ -396,7 +478,7 @@ index 3efb896..cccb6ff 100644
}
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
index 5c4dcb3..9830aee 100644
index df63b2f..510db0a 100644
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
@@ -97,12 +97,11 @@ public abstract class AbstractTychoIntegrationTest {

20
tycho-fix-surefire.patch
View File

@ -1,4 +1,4 @@
From 315e4a7a7e116d7c85749449e7f9d2729fc4d0a5 Mon Sep 17 00:00:00 2001
From 8a790e6ca3fe8beee86883ea6d8d33854b197a44 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Fri, 21 Sep 2012 10:58:09 -0400
Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire.
@ -24,10 +24,10 @@ Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f
6 files changed, 34 insertions(+), 4 deletions(-)
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 63da107..27d4a2b 100644
index 6d6fcf3..43a798a 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
@@ -6,6 +6,7 @@ Bundle-Version: 0.17.0.qualifier
@@ -6,6 +6,7 @@ Bundle-Version: 0.17.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@ -38,7 +38,7 @@ index 63da107..27d4a2b 100644
+ jars/common-junit3-2.13.jar
Bundle-Vendor: %providerName
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
index 42c4a97..cbeeaf0 100644
index 51cb8af..a15c972 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
@@ -44,6 +44,11 @@
@ -54,10 +54,10 @@ index 42c4a97..cbeeaf0 100644
</configuration>
</execution>
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 b5a9203..fa146d5 100644
index 2821621..1b27a6c 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
@@ -6,7 +6,9 @@ Bundle-Version: 0.17.0.qualifier
@@ -6,7 +6,9 @@ Bundle-Version: 0.17.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@ -69,7 +69,7 @@ index b5a9203..fa146d5 100644
org.junit;version="4.0.0",
org.junit.runner;version="4.0.0",
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
index 71ba06e..d88a349 100644
index c526a3a..bcb4d39 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
@@ -44,6 +44,16 @@
@ -90,7 +90,7 @@ index 71ba06e..d88a349 100644
</configuration>
</execution>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
index 3aad05e..29a160d 100644
index 522c40f..a4831a6 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
@@ -8,7 +8,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
@ -105,7 +105,7 @@ index 3aad05e..29a160d 100644
org.junit;version="[4.7,5)",
org.junit.runner;version="[4.7,5)",
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
index 1c465a7..eb9104e 100644
index 5fc2106..678fb0c 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -54,6 +54,16 @@
@ -126,5 +126,5 @@ index 1c465a7..eb9104e 100644
</configuration>
</execution>
--
1.7.11.7
1.8.1.4

34
tycho-maven-surefire.patch
View File

@ -1,4 +1,4 @@
From 62a1273b971ccd9fdba754c22469613bbf09d868 Mon Sep 17 00:00:00 2001
From 47bdd92d667cacf94d903e4677bc53c350f8e293 Mon Sep 17 00:00:00 2001
From: Jan Sievers <jan.sievers@sap.com>
Date: Tue, 4 Sep 2012 16:02:52 +0200
Subject: [PATCH] POC 386481 update maven surefire to latest version 2.13
@ -42,7 +42,7 @@ Change-Id: Ibcb439a24add880c4cdafe67b42e29ca3cb14ff1
delete mode 100644 tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreRunListener.java
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 6d0559a..63da107 100644
index 5274861..6d6fcf3 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
@@ -7,5 +7,5 @@ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
@ -64,10 +64,10 @@ index 499ce76..fe88b19 100644
+ jars/,\
plugin.properties
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 de18fd6..b5a9203 100644
index 890a069..2821621 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
@@ -6,7 +6,7 @@ Bundle-Version: 0.17.0.qualifier
@@ -6,7 +6,7 @@ Bundle-Version: 0.17.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@ -88,10 +88,10 @@ index b787149..fe88b19 100644
+ jars/,\
plugin.properties
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
index 752b471..3aad05e 100644
index 3a83088..522c40f 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
@@ -6,11 +6,14 @@ Bundle-Version: 0.17.0.qualifier
@@ -6,11 +6,14 @@ Bundle-Version: 0.17.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .,
@ -123,7 +123,7 @@ index 716961d..2589258 100644
about_files/
-source.. = src/
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
index 6a7f598..1c465a7 100644
index 10f68c1..5fc2106 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -44,6 +44,16 @@
@ -382,7 +382,7 @@ index fb6bede..0000000
-
-}
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 24107e1..4913119 100644
index d035572..ceb4814 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
@@ -4,8 +4,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
@ -395,11 +395,11 @@ index 24107e1..4913119 100644
+ jars/surefire-api-2.13.jar,
+ jars/maven-surefire-common-2.13.jar,
+ jars/plexus-utils-3.0.jar
Bundle-Version: 0.17.0.qualifier
Bundle-Version: 0.17.0
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
index bb5ba5e..555eef8 100644
index d9f9263..9ac6c89 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -52,6 +52,16 @@
@ -503,7 +503,7 @@ index 791221b..72a5f75 100644
/*
diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
index aab6422..985e8f3 100644
index 16534eb..4f9d39f 100644
--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
@@ -26,7 +26,7 @@
@ -516,7 +516,7 @@ index aab6422..985e8f3 100644
<modules>
diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
index 2f8c3fa..de9f60d 100644
index d47ad8d..d620d92 100644
--- a/tycho-surefire/tycho-surefire-plugin/pom.xml
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
@@ -96,5 +96,10 @@
@ -531,7 +531,7 @@ index 2f8c3fa..de9f60d 100644
</dependencies>
</project>
diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
index 57abaec..127d55b 100644
index 5ac5427..340f562 100644
--- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
+++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
@@ -18,6 +18,7 @@ import java.io.IOException;
@ -554,7 +554,7 @@ index 57abaec..127d55b 100644
import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager;
import org.codehaus.plexus.util.FileUtils;
@@ -629,6 +631,27 @@ public class TestMojo extends AbstractMojo {
@@ -737,6 +739,27 @@ public class TestMojo extends AbstractMojo {
providerProperties.put("perCoreThreadCount", String.valueOf(perCoreThreadCount));
providerProperties.put("useUnlimitedThreads", String.valueOf(useUnlimitedThreads));
}
@ -582,7 +582,7 @@ index 57abaec..127d55b 100644
for (Map.Entry entry : providerProperties.entrySet()) {
surefireProps.put("__provider." + entry.getKey(), entry.getValue());
}
@@ -673,7 +696,7 @@ public class TestMojo extends AbstractMojo {
@@ -783,7 +806,7 @@ public class TestMojo extends AbstractMojo {
case 0:
getLog().info("All tests passed!");
break;
@ -591,7 +591,7 @@ index 57abaec..127d55b 100644
String message = "No tests found.";
if (failIfNoTests) {
throw new MojoFailureException(message);
@@ -681,7 +704,7 @@ public class TestMojo extends AbstractMojo {
@@ -791,7 +814,7 @@ public class TestMojo extends AbstractMojo {
getLog().warn(message);
}
break;
@ -614,5 +614,5 @@ index 8358883..625b6fc 100644
public Version getVersion() {
--
1.7.11.7
1.8.1.4

23
tycho-remove-units.patch
View File

@ -1,15 +1,20 @@
diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
index 3436ba6..da4da36 100644
diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
index a014278..2b54ed8 100644
--- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
+++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
@@ -2,10 +2,6 @@
<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="13">
@@ -2,15 +2,10 @@
<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="15">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20130124-220434-7J7IFkRFFt6ZrOZqtTHsTRYeW"/>
-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20130130-2000"/>
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20121023-201113-85FAoGkcFoYTldRygAi3fkdtMT"/>
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20130115-150500-9N8OI2RGMMn85Z2AELstv0CF0LCR"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.3milestones/S-4.3M5-201301302000/"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20130228-0336"/>
-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20130314-1330"/>
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20130314-0217"/>
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20130312-1605"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.3milestones/S-4.3M6-201303141330/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<!-- required for surefire junit3 provider -->
-<unit id="org.junit" version="3.8.2.v3_8_2_v20100427-1100"/>
<repository location="http://download.eclipse.org/releases/indigo"/>
</location>
</locations>

6
tycho-set-reactor-cache-version.patch
View File

@ -1,13 +1,13 @@
diff --git a/pom.xml b/pom.xml
index afe83e3..2cc9a6a 100644
index fd9920b..8a469d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
<jdtAptVersion>1.0.500.v20120522-1651</jdtAptVersion>
<jdtAptVersion>1.0.600.v20130227-1643</jdtAptVersion>
<!-- version of tycho used by this build -->
- <tychoBootstrapVersion>0.16.0</tychoBootstrapVersion>
+ <tychoBootstrapVersion>0.17.0</tychoBootstrapVersion>
+ <tychoBootstrapVersion>0.17.0-SNAPSHOT</tychoBootstrapVersion>
</properties>
<dependencyManagement>

26
tycho-use-custom-resolver.patch
View File

@ -1,4 +1,4 @@
From e27cbf1ed27cbe225d92510f4e9afd5088d36dce Mon Sep 17 00:00:00 2001
From dcf9f210ba54345cfe85ba91ea0d18f617cd6940 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@ -24,14 +24,13 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../tycho/p2/target/TargetDefinitionResolver.java | 11 +++--
.../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++--
tycho-core/pom.xml | 5 ++
.../ee/ExecutionEnvironmentConfigurationImpl.java | 2 +-
.../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++
.../tycho/core/osgitools/AbstractTychoProject.java | 24 ++++++++++
.../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++-
.../DefaultTargetPlatformConfigurationReader.java | 6 ++-
.../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 +++++++
.../p2/resolver/P2TargetPlatformResolver.java | 11 +++++
10 files changed, 165 insertions(+), 11 deletions(-)
9 files changed, 164 insertions(+), 10 deletions(-)
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
index 6ea8a81..e90d279 100644
@ -144,7 +143,7 @@ index 3b8b9ab..b98c254 100644
if (includeLocalMavenRepo && logger.isDebugEnabled()) {
IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
index 6f936b9..1c4f3a8 100644
index 95f31fc..4d06441 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -146,6 +146,11 @@
@ -159,19 +158,6 @@ index 6f936b9..1c4f3a8 100644
<dependency>
<groupId>org.eclipse.tycho</groupId>
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java
index d14cb48..51c7a98 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java
@@ -18,7 +18,7 @@ import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration;
import org.eclipse.tycho.core.ee.shared.SystemCapability;
public class ExecutionEnvironmentConfigurationImpl implements ExecutionEnvironmentConfiguration {
- private static final String DEFAULT_EXECUTION_ENVIRONMENT = "J2SE-1.5";
+ private static final String DEFAULT_EXECUTION_ENVIRONMENT = "JavaSE-1.6";
private static final int PRIMARY = 0;
private static final int SECONDARY = 1;
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 cccb6ff..fb8bf78 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@ -260,7 +246,7 @@ index 695133d..ad25d9c 100644
return (TargetPlatform) project.getContextValue(TychoConstants.CTX_TARGET_PLATFORM);
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
index f818671..18ae1b4 100644
index ab40599..3e64271 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
@@ -45,7 +45,9 @@ import org.eclipse.tycho.core.BundleProject;
@ -273,7 +259,7 @@ index f818671..18ae1b4 100644
import org.eclipse.tycho.core.ee.shared.ExecutionEnvironment;
import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration;
import org.eclipse.tycho.core.facade.BuildPropertiesParser;
@@ -492,6 +494,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
@@ -487,6 +489,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
String pdeProfile = getEclipsePluginProject(DefaultReactorProject.adapt(project)).getBuildProperties()
.getJreCompilationProfile();
if (pdeProfile != null) {
@ -281,7 +267,7 @@ index f818671..18ae1b4 100644
sink.setProfileConfiguration(pdeProfile.trim(), "build.properties");
} else {
@@ -509,7 +512,31 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
@@ -504,7 +507,31 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
if (envs.isEmpty()) {
return null;
}

12
tycho.spec
View File

@ -2,20 +2,21 @@
# Set this if Tycho and Eclipse are not in buildroot
%global bootstrap 0
# When building version under development (non-release)
%global snap -SNAPSHOT
# %%global snap -SNAPSHOT
%global snap %{nil}
%define __requires_exclude osgi*
Name: tycho
Version: 0.17.0
Release: 0.11.git3351b1%{?dist}
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/
Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab.tar.bz2
Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.17.x.tar.bz2
# 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
@ -124,7 +125,7 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
%setup -q -n org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab
%setup -q -n %{name}-0.17.x
%patch0 -p1
%patch1 -p1
@ -267,6 +268,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
* Tue Apr 2 2013 Roland Grunberg <rgrunber@redhat.com> 0.17.0-1
- Update to 0.17.0 Release.
* Mon Mar 18 2013 Roland Grunberg <rgrunber@redhat.com> 0.17.0-0.11.git3351b1
- Non-bootstrap build.