Update to 0.16.0 SNAPSHOT.
This commit is contained in:
Roland Grunberg
parent
d74a54602c
commit
50be185d52
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@ tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz
|
||||
tycho-0.14.0.tar.bz2
|
||||
/tycho-0.14.x.tar.bz2
|
||||
/tycho-0.15.x.tar.bz2
|
||||
/org.eclipse.tycho-df2c3591ae0e641a8d12c13ca9c1058eaf8439b2.tar.bz2
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
a238f4ebd99940ea798475d760152634 tycho-0.15.x.tar.bz2
|
||||
7a11dc2efbcc5904ad8d5c199fcee33a org.eclipse.tycho-df2c3591ae0e641a8d12c13ca9c1058eaf8439b2.tar.bz2
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
From b67b6a5ab67eea4cb69d259fb7140a54355df61d Mon Sep 17 00:00:00 2001
|
||||
From 2d1e009c256c26c8b1bf66dace56bb7a8436c236 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Tue, 12 Jun 2012 09:56:38 -0400
|
||||
Subject: [PATCH 1/4] Fix the Tycho build to work on Fedora.
|
||||
@ -10,18 +10,27 @@ JSR14. Many Eclipse OSGi bundles use JSR14 for a build target but since
|
||||
JDK 1.7 ignores certain information (eg. generics) we must be careful
|
||||
when using those libraries.
|
||||
|
||||
Remove org.eclipse.equinox.concurrent until present in Fedora Eclipse.
|
||||
|
||||
Fix API issues with org.objectweb.asm (Need 4.0 but only have 3.0).
|
||||
|
||||
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
|
||||
---
|
||||
pom.xml | 5 -----
|
||||
tycho-bundles/tycho-bundles-target/tycho.target | 2 --
|
||||
tycho-artifactcomparator/pom.xml | 6 +++---
|
||||
.../tycho/zipcomparator/internal/ClassfileComparator.java | 2 +-
|
||||
.../tycho-bundles-external/tycho-bundles-external.product | 1 -
|
||||
tycho-bundles/tycho-bundles-target/tycho.target | 4 ----
|
||||
.../tycho-standalone-p2-director/p2 Director.product | 1 -
|
||||
tycho-compiler-jdt/pom.xml | 4 ----
|
||||
.../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------
|
||||
.../tycho/core/osgitools/StandalonePluginConverterTest.java | 8 ++++----
|
||||
.../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
|
||||
.../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
|
||||
6 files changed, 18 insertions(+), 21 deletions(-)
|
||||
11 files changed, 27 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 69e68c6..7cfb0cf 100644
|
||||
index dc7c1f5..1868f9a 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -221,11 +221,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
|
||||
@ -36,21 +45,82 @@ index 69e68c6..7cfb0cf 100644
|
||||
<groupId>org.apache.maven.surefire</groupId>
|
||||
<artifactId>surefire-booter</artifactId>
|
||||
<version>2.10</version>
|
||||
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
|
||||
index 775107a..a6ff6f7 100644
|
||||
--- a/tycho-artifactcomparator/pom.xml
|
||||
+++ b/tycho-artifactcomparator/pom.xml
|
||||
@@ -23,8 +23,8 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<!-- CQ https://dev.eclipse.org/ipzilla/show_bug.cgi?id=6591 -->
|
||||
- <groupId>org.ow2.asm</groupId>
|
||||
- <artifactId>asm-debug-all</artifactId>
|
||||
+ <groupId>asm</groupId>
|
||||
+ <artifactId>asm-all</artifactId>
|
||||
<version>4.0</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@@ -54,4 +54,4 @@
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
-</project>
|
||||
\ No newline at end of file
|
||||
+</project>
|
||||
diff --git a/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java b/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
|
||||
index 6944b03..a3a9825 100644
|
||||
--- a/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
|
||||
+++ b/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
|
||||
@@ -61,7 +61,7 @@ public class ClassfileComparator implements ContentsComparator {
|
||||
private String disassemble(byte[] bytes) {
|
||||
ClassReader reader = new ClassReader(bytes);
|
||||
ClassNode clazz = new ClassNode();
|
||||
- reader.accept(clazz, Opcodes.ASM4 | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
|
||||
+ reader.accept(clazz, (4 << 16 | 0 << 8 | 0) | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
|
||||
|
||||
// inner class list gets reordered during pack200 normalization
|
||||
if (clazz.innerClasses != null) {
|
||||
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
|
||||
index 3e584f5..8b54310 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 @@
|
||||
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
|
||||
<plugin id="org.eclipse.equinox.app"/>
|
||||
<plugin id="org.eclipse.equinox.common"/>
|
||||
- <plugin id="org.eclipse.equinox.concurrent"/>
|
||||
<plugin id="org.eclipse.equinox.ds"/>
|
||||
<plugin id="org.eclipse.equinox.frameworkadmin"/>
|
||||
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
|
||||
diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
|
||||
index 1cd9a7b..48eb53a 100644
|
||||
index d23b885..1437dbd 100644
|
||||
--- a/tycho-bundles/tycho-bundles-target/tycho.target
|
||||
+++ b/tycho-bundles/tycho-bundles-target/tycho.target
|
||||
@@ -4,8 +4,6 @@
|
||||
<target name="Target platform for Tycho's bundles" sequenceNumber="2">
|
||||
@@ -4,10 +4,6 @@
|
||||
<target name="Target platform for Tycho's bundles" sequenceNumber="7">
|
||||
<locations>
|
||||
<location includeAllPlatforms="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
|
||||
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120426-1529-7P7OFvNFLWUl7UmDUz0O8_a2"/>
|
||||
-<unit id="org.eclipse.sdk.ide" version="4.2.0.I20120503-1800"/>
|
||||
<repository location="http://download.eclipse.org/eclipse/updates/4.2milestones/"/>
|
||||
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120522-1813-7P7OG2BFLWUl7UmbVUO9iCm"/>
|
||||
-<unit id="org.eclipse.sdk.ide" version="4.2.0.I20120608-1400"/>
|
||||
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120522-1813-85FAcGbBFoYTldHrOJw3cF4q"/>
|
||||
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N89H_mGMMn84Osz0TAoT279BRQD"/>
|
||||
<repository location="http://download.eclipse.org/eclipse/updates/4.2"/>
|
||||
</location>
|
||||
</locations>
|
||||
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
|
||||
--- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
|
||||
+++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
|
||||
@@ -41,7 +41,6 @@
|
||||
<plugin id="org.eclipse.ecf.ssl" fragment="true"/>
|
||||
<plugin id="org.eclipse.equinox.app"/>
|
||||
<plugin id="org.eclipse.equinox.common"/>
|
||||
- <plugin id="org.eclipse.equinox.concurrent"/>
|
||||
<plugin id="org.eclipse.equinox.ds"/>
|
||||
<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 9f7bdd7..6a1102b 100644
|
||||
index 01b9a9e..c373e6a 100644
|
||||
--- a/tycho-compiler-jdt/pom.xml
|
||||
+++ b/tycho-compiler-jdt/pom.xml
|
||||
@@ -38,10 +38,6 @@
|
||||
@ -150,6 +220,28 @@ index 42db7f6..a145c57 100644
|
||||
assertEquals(originalManifest.size(), writtenManifest.size());
|
||||
for (Enumeration<String> keys = writtenManifest.keys(); keys.hasMoreElements();) {
|
||||
String key = keys.nextElement();
|
||||
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
|
||||
--- 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 {
|
||||
verifier.getCliOptions().add(customOptions);
|
||||
}
|
||||
|
||||
- if (System.getProperty(SYSPROP_STATELOCATION) != null) {
|
||||
- verifier.setForkJvm(false);
|
||||
- String m2eresolver = System.getProperty("tychodev-maven.ext.class.path"); // XXX
|
||||
- if (m2eresolver != null) {
|
||||
- verifier.addCliOption("-Dmaven.ext.class.path=" + m2eresolver);
|
||||
- }
|
||||
+ String m2eState = System.getProperty("m2eclipse.workspace.state");
|
||||
+ String m2eResolver = System.getProperty("m2eclipse.workspace.resolver");
|
||||
+
|
||||
+ if (m2eState != null && m2eResolver != null) {
|
||||
+ verifier.getVerifierProperties().put("m2eclipse.workspace.state", m2eState);
|
||||
}
|
||||
|
||||
return verifier;
|
||||
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
|
||||
index a9d80d3..3ddbe9c 100644
|
||||
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 35f7704c0086224e2f307f6e8d0469911d120136 Mon Sep 17 00:00:00 2001
|
||||
From 15d879a19f9704b823d38dfc390ba23ef666a422 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Tue, 29 May 2012 14:27:27 -0400
|
||||
Subject: [PATCH 2/4] Resolve all necessary dependencies for Tycho Surefire.
|
||||
@ -12,20 +12,25 @@ of provided classes. This patch addresses this issue.
|
||||
|
||||
Basically, the jars added to the Bundle-ClassPath in this patch, provide
|
||||
the additional classes that are in the original jars used upstream.
|
||||
|
||||
Change-Id: I678a961226d5ca27542a2b79a069b995cd3613eb
|
||||
---
|
||||
pom.xml | 2 +-
|
||||
.../META-INF/MANIFEST.MF | 5 +++--
|
||||
.../build.properties | 2 +-
|
||||
.../org.eclipse.tycho.surefire.junit/pom.xml | 5 +++++
|
||||
.../META-INF/MANIFEST.MF | 4 +++-
|
||||
.../build.properties | 2 +-
|
||||
.../org.eclipse.tycho.surefire.junit4/pom.xml | 10 ++++++++++
|
||||
.../META-INF/MANIFEST.MF | 3 ++-
|
||||
.../org.eclipse.tycho.surefire.osgibooter/pom.xml | 5 +++++
|
||||
9 files changed, 31 insertions(+), 7 deletions(-)
|
||||
pom.xml | 2 +-
|
||||
.../org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF | 5 +++--
|
||||
.../org.eclipse.tycho.surefire.junit/build.properties | 2 +-
|
||||
tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml | 5 +++++
|
||||
.../org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF | 4 +++-
|
||||
.../org.eclipse.tycho.surefire.junit4/build.properties | 2 +-
|
||||
tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml | 10 ++++++++++
|
||||
.../org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF | 4 +++-
|
||||
.../org.eclipse.tycho.surefire.junit47/build.properties | 2 ++
|
||||
tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml | 10 ++++++++++
|
||||
.../org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF | 3 ++-
|
||||
tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml | 5 +++++
|
||||
12 files changed, 46 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/pom.xml b/pom.xml
|
||||
index 69e68c6..42ffc40 100644
|
||||
index 1868f9a..3a27718 100644
|
||||
--- a/pom.xml
|
||||
+++ b/pom.xml
|
||||
@@ -79,7 +79,7 @@
|
||||
@ -38,10 +43,10 @@ index 69e68c6..42ffc40 100644
|
||||
<wagonVersion>1.0-beta-6</wagonVersion>
|
||||
<securityDispatcherVersion>1.3</securityDispatcherVersion>
|
||||
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 1417c3a..f9f6cd2 100644
|
||||
index c9281d6..c7767ba 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.15.0
|
||||
@@ -6,6 +6,7 @@ Bundle-Version: 0.16.0.qualifier
|
||||
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
|
||||
JavaSE-1.6
|
||||
@ -63,10 +68,10 @@ index 499ce76..fe88b19 100644
|
||||
+ jars/,\
|
||||
plugin.properties
|
||||
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
|
||||
index b917533..f5699bc 100644
|
||||
index f9feec9..188c45c 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
|
||||
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
|
||||
@@ -47,6 +47,11 @@
|
||||
@@ -44,6 +44,11 @@
|
||||
<artifactId>surefire-junit3</artifactId>
|
||||
<version>${surefire-version}</version>
|
||||
</artifactItem>
|
||||
@ -79,10 +84,10 @@ index b917533..f5699bc 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 fdf4e6a..de38fb3 100644
|
||||
index c2e019c..632039f 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.15.0
|
||||
@@ -6,7 +6,9 @@ Bundle-Version: 0.16.0.qualifier
|
||||
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
|
||||
JavaSE-1.6
|
||||
@ -105,10 +110,10 @@ index b787149..fe88b19 100644
|
||||
+ jars/,\
|
||||
plugin.properties
|
||||
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
|
||||
index 0039fc4..d5f35cb 100644
|
||||
index f1f821e..f7e6791 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
|
||||
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
|
||||
@@ -71,6 +71,16 @@
|
||||
@@ -44,6 +44,16 @@
|
||||
<artifactId>surefire-junit4</artifactId>
|
||||
<version>${surefire-version}</version>
|
||||
</artifactItem>
|
||||
@ -121,12 +126,61 @@ index 0039fc4..d5f35cb 100644
|
||||
+ <groupId>org.apache.maven.surefire</groupId>
|
||||
+ <artifactId>common-junit4</artifactId>
|
||||
+ <version>${surefire-version}</version>
|
||||
+ </artifactItem>
|
||||
</artifactItems>
|
||||
</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 59d4c36..50d53dd 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,7 +6,9 @@ Bundle-Version: 0.16.0.qualifier
|
||||
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0"
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||
Bundle-ClassPath: .,
|
||||
- jars/surefire-junit47-2.10.jar
|
||||
+ jars/surefire-junit47-2.10.jar,
|
||||
+ jars/common-junit3-2.10.jar,
|
||||
+ jars/common-junit4-2.10.jar
|
||||
Import-Package: junit.framework;version="[4.7,5)",
|
||||
org.junit;version="[4.7,5)",
|
||||
org.junit.runner;version="[4.7,5)",
|
||||
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/build.properties b/tycho-surefire/org.eclipse.tycho.surefire.junit47/build.properties
|
||||
index 716961d..ad4ed57 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/build.properties
|
||||
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/build.properties
|
||||
@@ -11,6 +11,8 @@
|
||||
bin.includes = .,\
|
||||
META-INF/,\
|
||||
jars/surefire-junit47-2.10.jar,\
|
||||
+ jars/common-junit3-2.10.jar,\
|
||||
+ jars/common-junit4-2.10.jar,\
|
||||
plugin.properties,\
|
||||
about.html,\
|
||||
about_files/
|
||||
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
|
||||
index 61beabb..9be536a 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 @@
|
||||
<artifactId>surefire-junit47</artifactId>
|
||||
<version>${surefire-version}</version>
|
||||
</artifactItem>
|
||||
+ <artifactItem>
|
||||
+ <groupId>org.apache.maven.surefire</groupId>
|
||||
+ <artifactId>common-junit4</artifactId>
|
||||
+ <version>${surefire-version}</version>
|
||||
+ </artifactItem>
|
||||
+ <artifactItem>
|
||||
+ <groupId>org.apache.maven.surefire</groupId>
|
||||
+ <artifactId>common-junit3</artifactId>
|
||||
+ <version>${surefire-version}</version>
|
||||
+ </artifactItem>
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
</execution>
|
||||
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 06c99c9..c2c4c8c 100644
|
||||
index 9c418b3..1bdb8cb 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
|
||||
@@ -5,7 +5,8 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
|
||||
@ -136,11 +190,11 @@ index 06c99c9..c2c4c8c 100644
|
||||
- jars/surefire-api-2.10.jar
|
||||
+ jars/surefire-api-2.10.jar,
|
||||
+ jars/plexus-utils-3.0.jar
|
||||
Bundle-Version: 0.15.0
|
||||
Bundle-Version: 0.16.0.qualifier
|
||||
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 4b65c4a..7a13f1d 100644
|
||||
index 9582aef..87f1f23 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
|
||||
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
|
||||
@@ -52,6 +52,11 @@
|
||||
@ -156,5 +210,5 @@ index 4b65c4a..7a13f1d 100644
|
||||
</configuration>
|
||||
</execution>
|
||||
--
|
||||
1.7.7.6
|
||||
1.7.11.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 038d1819e9b9880783ce187023e1404f5ea12db7 Mon Sep 17 00:00:00 2001
|
||||
From e907892903141709326414a573d8703a5dccef47 Mon Sep 17 00:00:00 2001
|
||||
From: Roland Grunberg <rgrunber@redhat.com>
|
||||
Date: Tue, 12 Jun 2012 10:12:53 -0400
|
||||
Subject: [PATCH 3/4] Upstream builds against maven-surefire 2.10 but in
|
||||
@ -6,15 +6,29 @@ Subject: [PATCH 3/4] Upstream builds against maven-surefire 2.10 but in
|
||||
|
||||
Change-Id: I69ceee1cb2abe86bc6ca080ddde6676bf995347a
|
||||
---
|
||||
.../META-INF/MANIFEST.MF | 3 ++-
|
||||
.../org.eclipse.tycho.surefire.osgibooter/pom.xml | 7 +++++++
|
||||
.../surefire/osgibooter/OsgiSurefireBooter.java | 15 ++++++++-------
|
||||
.../osgibooter/TychoClasspathConfiguration.java | 5 +++++
|
||||
.../java/org/eclipse/tycho/surefire/TestMojo.java | 4 ++--
|
||||
5 files changed, 24 insertions(+), 10 deletions(-)
|
||||
.../surefire/junitcore/OsgiEnabledJUnitCoreProvider.java | 2 +-
|
||||
.../META-INF/MANIFEST.MF | 3 ++-
|
||||
.../org.eclipse.tycho.surefire.osgibooter/pom.xml | 7 +++++++
|
||||
.../tycho/surefire/osgibooter/OsgiSurefireBooter.java | 15 ++++++++-------
|
||||
.../surefire/osgibooter/TychoClasspathConfiguration.java | 5 +++++
|
||||
.../main/java/org/eclipse/tycho/surefire/TestMojo.java | 4 ++--
|
||||
6 files changed, 25 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreProvider.java b/tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreProvider.java
|
||||
index eaa8dc4..ea3a628 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreProvider.java
|
||||
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreProvider.java
|
||||
@@ -115,7 +115,7 @@ public class OsgiEnabledJUnitCoreProvider
|
||||
org.junit.runner.notification.RunListener jUnit4RunListener = new OsgiEnabledJUnitCoreRunListener( listener, testSetMap );
|
||||
customRunListeners.add( 0, jUnit4RunListener );
|
||||
|
||||
- JUnitCoreWrapper.execute( testsToRun, jUnitCoreParameters, customRunListeners );
|
||||
+ JUnitCoreWrapper.execute( testsToRun, jUnitCoreParameters, customRunListeners, null );
|
||||
return reporterFactory.close();
|
||||
}
|
||||
|
||||
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 c2c4c8c..9fa7626 100644
|
||||
index 1bdb8cb..d510010 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
|
||||
@@ -6,7 +6,8 @@ Eclipse-AutoStart: true
|
||||
@ -24,11 +38,11 @@ index c2c4c8c..9fa7626 100644
|
||||
- jars/plexus-utils-3.0.jar
|
||||
+ jars/plexus-utils-3.0.jar,
|
||||
+ jars/maven-surefire-common-2.10.jar
|
||||
Bundle-Version: 0.15.0
|
||||
Bundle-Version: 0.16.0.qualifier
|
||||
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 7a13f1d..275c95e 100644
|
||||
index 87f1f23..b6040a5 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
|
||||
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
|
||||
@@ -56,6 +56,13 @@
|
||||
@ -46,10 +60,10 @@ index 7a13f1d..275c95e 100644
|
||||
</artifactItems>
|
||||
</configuration>
|
||||
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
|
||||
index 8d46bdb..162a706 100644
|
||||
index 791221b..dcd1244 100644
|
||||
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
|
||||
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
|
||||
@@ -26,13 +26,14 @@ import java.util.Set;
|
||||
@@ -27,13 +27,14 @@ import java.util.Set;
|
||||
import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
|
||||
import org.apache.maven.surefire.booter.ProviderConfiguration;
|
||||
import org.apache.maven.surefire.booter.StartupConfiguration;
|
||||
@ -66,7 +80,7 @@ index 8d46bdb..162a706 100644
|
||||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.Status;
|
||||
@@ -63,22 +64,22 @@ public class OsgiSurefireBooter {
|
||||
@@ -64,22 +65,22 @@ public class OsgiSurefireBooter {
|
||||
boolean printSummary = true;
|
||||
boolean disableXmlReport = false;
|
||||
ClassLoader testClassLoader = getBundleClassLoader(plugin);
|
||||
@ -84,7 +98,7 @@ index 8d46bdb..162a706 100644
|
||||
TestRequest testRequest = new TestRequest(null, testClassesDir, null);
|
||||
- ProviderConfiguration providerConfiguration = new ProviderConfiguration(dirScannerParams, failIfNoTests,
|
||||
+ ProviderConfiguration providerConfiguration = new ProviderConfiguration(dirScannerParams, RunOrderParameters.DEFAULT(), failIfNoTests,
|
||||
reporterConfig, null, testRequest, new Properties(), null);
|
||||
reporterConfig, null, testRequest, extractProviderProperties(testProps), null);
|
||||
StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
|
||||
StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir,
|
||||
- trimStacktrace);
|
||||
@ -111,10 +125,10 @@ index c94d3ea..6c732a5 100644
|
||||
return testClassLoader;
|
||||
}
|
||||
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 a8857f1..83f0e0f 100644
|
||||
index 77288dd..9cc2e49 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
|
||||
@@ -589,7 +589,7 @@ public class TestMojo extends AbstractMojo {
|
||||
@@ -670,7 +670,7 @@ public class TestMojo extends AbstractMojo {
|
||||
case 0:
|
||||
getLog().info("All tests passed!");
|
||||
break;
|
||||
@ -123,7 +137,7 @@ index a8857f1..83f0e0f 100644
|
||||
String message = "No tests found.";
|
||||
if (failIfNoTests) {
|
||||
throw new MojoFailureException(message);
|
||||
@@ -597,7 +597,7 @@ public class TestMojo extends AbstractMojo {
|
||||
@@ -678,7 +678,7 @@ public class TestMojo extends AbstractMojo {
|
||||
getLog().warn(message);
|
||||
}
|
||||
break;
|
||||
@ -133,5 +147,5 @@ index a8857f1..83f0e0f 100644
|
||||
+ " for the individual test results.";
|
||||
if (testFailureIgnore) {
|
||||
--
|
||||
1.7.7.6
|
||||
1.7.11.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 9a323780512a16b0ed3e095d4b0954ed2780fe3d Mon Sep 17 00:00:00 2001
|
||||
From d5aa6d0a1a2ed5f56e2df61094a541fb92ada771 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.
|
||||
@ -21,18 +21,18 @@ running in local mode.
|
||||
|
||||
Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
|
||||
---
|
||||
.../tycho/p2/target/TargetDefinitionResolver.java | 8 +++--
|
||||
.../tycho/p2/target/TargetDefinitionResolver.java | 10 ++++--
|
||||
.../tycho/p2/target/TargetPlatformBuilderImpl.java | 6 ++++
|
||||
.../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++++
|
||||
.../core/osgitools/EclipseFeatureProject.java | 22 +++++++++++++
|
||||
.../tycho/core/osgitools/OsgiBundleProject.java | 38 +++++++++++++++++++++-
|
||||
.../core/osgitools/EclipseFeatureProject.java | 22 ++++++++++++
|
||||
.../tycho/core/osgitools/OsgiBundleProject.java | 42 ++++++++++++++++++++--
|
||||
.../DefaultTargetPlatformConfigurationReader.java | 5 ++-
|
||||
.../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 17 ++++++++++
|
||||
.../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 15 ++++++++
|
||||
.../p2/resolver/P2TargetPlatformResolver.java | 10 ++++++
|
||||
8 files changed, 118 insertions(+), 4 deletions(-)
|
||||
8 files changed, 120 insertions(+), 6 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 6a85c49..d9d6055 100644
|
||||
index 5fdc6a1..838e267 100644
|
||||
--- 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
|
||||
@@ -24,6 +24,7 @@ import org.eclipse.core.runtime.CoreException;
|
||||
@ -43,14 +43,16 @@ index 6a85c49..d9d6055 100644
|
||||
import org.eclipse.equinox.p2.core.IProvisioningAgent;
|
||||
import org.eclipse.equinox.p2.core.ProvisionException;
|
||||
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
|
||||
@@ -100,8 +101,11 @@ public class TargetDefinitionResolver {
|
||||
@@ -103,9 +104,12 @@ public class TargetDefinitionResolver {
|
||||
|
||||
List<IMetadataRepository> metadataRepositories = new ArrayList<IMetadataRepository>();
|
||||
for (Repository repository : iuLocationDefinition.getRepositories()) {
|
||||
- repositoryIdManager.addMapping(repository.getId(), repository.getLocation());
|
||||
- artifactRepositories.add(repository.getLocation());
|
||||
- metadataRepositories.add(loadRepository(repository));
|
||||
+ // We cannot resolve a non-file URI in local mode
|
||||
+ if (System.getProperty("maven.local.mode") == null || URIUtil.isFileURI(repository.getLocation())) {
|
||||
+ repositoryIdManager.addMapping(repository.getId(), repository.getLocation());
|
||||
+ artifactRepositories.add(repository.getLocation());
|
||||
+ metadataRepositories.add(loadRepository(repository));
|
||||
+ }
|
||||
@ -58,22 +60,22 @@ index 6a85c49..d9d6055 100644
|
||||
|
||||
IQueryable<IInstallableUnit> locationUnits = new CompoundQueryable<IInstallableUnit>(
|
||||
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
|
||||
index e4b4084..8d58a3c 100644
|
||||
index fa1cfab..23cdb5d 100644
|
||||
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
|
||||
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
|
||||
@@ -225,6 +225,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
|
||||
@@ -223,6 +223,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
|
||||
IMetadataRepository metadataRepository = null;
|
||||
IArtifactRepository artifactRepository = null;
|
||||
|
||||
+ // We cannot resolve a non-file URI in local mode while offline
|
||||
+ if (System.getProperty("maven.local.mode") != null && offline && !URIUtil.isFileURI(location)) {
|
||||
+ if (System.getProperty("maven.local.mode") != null && offline && !URIUtil.isFileURI(location.getURL())) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
try {
|
||||
// TODO always log that a p2 repository is added to the target platform somewhere; used to be either from p2 or the following line
|
||||
// logger.info("Adding repository (cached) " + location.toASCIIString());
|
||||
remoteRepositoryIdManager.addMapping(location.getId(), location.getURL());
|
||||
|
||||
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 0dd2fd4..15669a6 100644
|
||||
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
|
||||
@ -109,13 +111,13 @@ index 0dd2fd4..15669a6 100644
|
||||
resolver.setupProject(session, project, DefaultReactorProject.adapt(project));
|
||||
}
|
||||
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java
|
||||
index 060a844..dbbe51a 100644
|
||||
index 0fe42a6..1bc3a6e 100644
|
||||
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java
|
||||
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java
|
||||
@@ -21,6 +21,9 @@ import org.eclipse.tycho.core.ArtifactDependencyVisitor;
|
||||
import org.eclipse.tycho.core.ArtifactDependencyWalker;
|
||||
import org.eclipse.tycho.core.TargetEnvironment;
|
||||
import org.eclipse.tycho.core.TychoProject;
|
||||
import org.eclipse.tycho.core.facade.TargetEnvironment;
|
||||
+import org.eclipse.tycho.core.UnknownEnvironmentException;
|
||||
+import org.eclipse.tycho.core.utils.ExecutionEnvironment;
|
||||
+import org.eclipse.tycho.core.utils.ExecutionEnvironmentUtils;
|
||||
@ -147,13 +149,16 @@ index 060a844..dbbe51a 100644
|
||||
+
|
||||
}
|
||||
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 fe6383f..d037faf 100644
|
||||
index c4b783e..e83dd72 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
|
||||
@@ -505,6 +505,28 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
|
||||
@@ -525,12 +525,50 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
|
||||
if (envs.isEmpty()) {
|
||||
return null;
|
||||
}
|
||||
|
||||
ExecutionEnvironment manifestMinimalEE = Collections.min(envs);
|
||||
- return Collections.min(envs);
|
||||
+
|
||||
+ ExecutionEnvironment manifestMinimalEE = Collections.min(envs);
|
||||
+ ExecutionEnvironment tmp;
|
||||
+
|
||||
+ if (System.getProperty("maven.local.mode") != null) {
|
||||
@ -176,10 +181,8 @@ index fe6383f..d037faf 100644
|
||||
+ // Continue
|
||||
+ }
|
||||
+ }
|
||||
|
||||
if (buildMinimalEE == null) {
|
||||
return manifestMinimalEE;
|
||||
@@ -515,7 +537,21 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
|
||||
+ return manifestMinimalEE;
|
||||
}
|
||||
|
||||
protected ExecutionEnvironment getExecutionEnvironment(MavenProject project, String profile) {
|
||||
try {
|
||||
@ -203,7 +206,7 @@ index fe6383f..d037faf 100644
|
||||
throw new RuntimeException("Unknown execution environment specified in build.properties of project "
|
||||
+ project, e);
|
||||
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
|
||||
index aad664a..87fe760 100644
|
||||
index c2997bc..9c1f5c8 100644
|
||||
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
|
||||
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
|
||||
@@ -66,7 +66,10 @@ public class DefaultTargetPlatformConfigurationReader {
|
||||
@ -219,10 +222,10 @@ index aad664a..87fe760 100644
|
||||
setTargetPlatformResolver(result, configuration);
|
||||
|
||||
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java
|
||||
index 15b3fff..c8f14df 100644
|
||||
index ff4c14a..de02644 100644
|
||||
--- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java
|
||||
+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java
|
||||
@@ -23,6 +23,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
@@ -22,6 +22,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
|
||||
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
|
||||
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
|
||||
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
|
||||
@ -230,19 +233,18 @@ index 15b3fff..c8f14df 100644
|
||||
import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
|
||||
import org.apache.maven.execution.MavenSession;
|
||||
import org.apache.maven.model.Dependency;
|
||||
@@ -38,6 +39,7 @@ import org.codehaus.plexus.util.FileUtils;
|
||||
import org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator;
|
||||
@@ -38,6 +39,7 @@ import org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator;
|
||||
import org.eclipse.tycho.dev.DevWorkspaceResolver;
|
||||
import org.eclipse.tycho.locking.facade.FileLockService;
|
||||
import org.eclipse.tycho.locking.facade.FileLocker;
|
||||
+import org.sonatype.aether.util.artifact.DefaultArtifact;
|
||||
|
||||
@Component(role = EquinoxRuntimeLocator.class)
|
||||
public class TychoP2RuntimeLocator implements EquinoxRuntimeLocator {
|
||||
@@ -158,6 +160,21 @@ public class TychoP2RuntimeLocator implements EquinoxRuntimeLocator {
|
||||
}
|
||||
@@ -189,6 +191,19 @@ public class TychoP2RuntimeLocator implements EquinoxRuntimeLocator {
|
||||
Artifact artifact = repositorySystem.createArtifact(dependency.getGroupId(), dependency.getArtifactId(),
|
||||
dependency.getVersion(), dependency.getType());
|
||||
|
||||
private File resolveArtifact(MavenSession session, Artifact artifact) throws MavenExecutionException {
|
||||
+
|
||||
+ // If we are in local mode, find the artifact on the system
|
||||
+ if (System.getProperty("maven.local.mode") != null) {
|
||||
+ JavadirWorkspaceReader wReader = new JavadirWorkspaceReader();
|
||||
@ -253,18 +255,17 @@ index 15b3fff..c8f14df 100644
|
||||
+ File file = wReader.findArtifact(newArtifact);
|
||||
+ if (file != null) {
|
||||
+ artifact.setFile(file);
|
||||
+ return file;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
List<ArtifactRepository> repositories = new ArrayList<ArtifactRepository>();
|
||||
for (MavenProject project : session.getProjects()) {
|
||||
repositories.addAll(project.getPluginArtifactRepositories());
|
||||
ArtifactResolutionRequest request = new ArtifactResolutionRequest();
|
||||
request.setArtifact(artifact);
|
||||
request.setResolveRoot(true).setResolveTransitively(false);
|
||||
diff --git a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
|
||||
index ea06289..0768fd0 100644
|
||||
index 4db1bd4..b45a4ea 100644
|
||||
--- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
|
||||
+++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
|
||||
@@ -206,6 +206,16 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp
|
||||
@@ -193,6 +193,16 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp
|
||||
tpBuilder.setProjectLocation(project.getBasedir());
|
||||
tpBuilder.setIncludePackedArtifacts(configuration.isIncludePackedArtifacts());
|
||||
|
||||
@ -272,7 +273,7 @@ index ea06289..0768fd0 100644
|
||||
+ if (System.getProperty("maven.local.mode") != null) {
|
||||
+ String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo";
|
||||
+ try {
|
||||
+ tpBuilder.addP2Repository(new URI(uri));
|
||||
+ tpBuilder.addP2Repository(new MavenRepositoryLocation(uri, new URI(uri)));
|
||||
+ } catch (URISyntaxException e) {
|
||||
+ getLogger().warn("Unable to resolve repository URI : " + uri, e);
|
||||
+ }
|
||||
|
||||
35
tycho.spec
35
tycho.spec
@ -1,21 +1,22 @@
|
||||
%global bootstrap 0
|
||||
%global sha df2c3591ae0e641a8d12c13ca9c1058eaf8439b2
|
||||
|
||||
%if %{bootstrap}
|
||||
%global snap -SNAPSHOT
|
||||
%else
|
||||
%global snap %{nil}
|
||||
%else
|
||||
%global snap -SNAPSHOT
|
||||
%endif
|
||||
|
||||
Name: tycho
|
||||
Version: 0.15.0
|
||||
Release: 3%{?dist}
|
||||
Version: 0.16.0
|
||||
Release: 1.df2c35%{?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/tycho-0.15.x.tar.bz2
|
||||
Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/org.eclipse.tycho-%{sha}.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
|
||||
@ -30,17 +31,17 @@ Patch1: %{name}-fix-surefire.patch
|
||||
# Upstream builds against maven-surefire 2.10 but in rawhide we have 2.12
|
||||
Patch2: %{name}-maven-surefire.patch
|
||||
Patch3: %{name}-use-custom-resolver.patch
|
||||
Patch4: %{name}-fix-swt.patch
|
||||
# Set some temporary build version so that the bootstrapped build has
|
||||
# a different version from the nonbootstrapped. Otherwise there will
|
||||
# be cyclic dependencies.
|
||||
Patch5: %{name}-bootstrap.patch
|
||||
Patch4: %{name}-bootstrap.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: jpackage-utils
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: maven
|
||||
BuildRequires: maven-clean-plugin
|
||||
BuildRequires: maven-compiler-plugin
|
||||
BuildRequires: maven-dependency-plugin
|
||||
BuildRequires: maven-install-plugin
|
||||
@ -107,15 +108,14 @@ Requires: jpackage-utils
|
||||
This package contains the API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-0.15.x
|
||||
%setup -q -n org.eclipse.tycho-%{sha}
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%if %{bootstrap}
|
||||
%patch5 -p1
|
||||
%patch4 -p1
|
||||
%endif
|
||||
|
||||
find tycho-core -iname '*html' -delete
|
||||
@ -128,19 +128,19 @@ popd
|
||||
|
||||
%build
|
||||
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
|
||||
mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} install javadoc:aggregate
|
||||
mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -Dmaven.test.skip=true install javadoc:aggregate
|
||||
|
||||
%install
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
||||
for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
|
||||
tycho-{core,embedder-api,testing-harness} \
|
||||
sisu-equinox/sisu-equinox{-api,-launching,-embedder} \
|
||||
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-{artifactcomparator,core,embedder-api,metadata-model,testing-harness} \
|
||||
sisu-equinox/sisu-equinox{-api,-launching,-embedder} \
|
||||
tycho-p2/tycho-p2-{facade,plugin,{director,publisher,repository}-plugin} \
|
||||
tycho-{maven,packaging,pomgenerator,release/tycho-versions,source}-plugin \
|
||||
tycho-bundles/org* \
|
||||
tycho-surefire/{tycho-surefire-plugin,org.eclipse.tycho.surefire.{osgibooter,junit,junit4}}; do
|
||||
tycho-surefire/{tycho-surefire-plugin,org.eclipse.tycho.surefire.{osgibooter,junit,junit4{,7}}}; do
|
||||
echo $mod
|
||||
aid=`basename $mod`
|
||||
install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
|
||||
@ -194,6 +194,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
|
||||
%{_javadocdir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Thu Aug 2 2012 Roland Grunberg <rgrunber@redhat.com> 0.16.0-1.df2c35
|
||||
- Update to 0.16.0 SNAPSHOT.
|
||||
|
||||
* Tue Jul 31 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-3
|
||||
- Non-bootstrap build.
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user