[tycho] Update to 0.22.0 pre-release.
Roland Grunberg
rgrunber at fedoraproject.org
Sat Nov 29 17:01:17 UTC 2014
commit b81da618df1380705d7e5929e0be6a8c7f2cd95d
Author: Roland Grunberg <rgrunber at redhat.com>
Date: Tue Nov 25 11:48:43 2014 -0500
Update to 0.22.0 pre-release.
sources | 2 +-
tycho-bootstrap.sh | 4 +-
tycho-fix-build.patch | 84 +++-----
tycho-fix-surefire.patch | 82 +++++---
tycho-maven-delegation.patch | 96 ++++----
tycho-maven-surefire.patch | 448 ---------------------------------------
tycho-running-env-only.patch | 43 ++--
tycho-use-custom-resolver.patch | 269 ++++++++----------------
tycho.spec | 14 +-
9 files changed, 248 insertions(+), 794 deletions(-)
---
diff --git a/sources b/sources
index 4a92d55..639518a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
3c1629e532861686aa3b01eb55b17575 fedoraproject-p2-9a996d.tar.xz
-127267aa75abd86df6815bcbd7f2492d tycho-0.21.0.tar.bz2
+e1397ea891464c0bc9efc20dc2f75b40 org.eclipse.tycho-b1051d48d84b8382fdf5fb31dce7a45220f84965.tar.bz2
c600a5115f29962c974b75b4b25e74f1 eclipse-bootstrap.tar.xz
diff --git a/tycho-bootstrap.sh b/tycho-bootstrap.sh
index 8e4be75..2252d7b 100755
--- a/tycho-bootstrap.sh
+++ b/tycho-bootstrap.sh
@@ -3,8 +3,8 @@
. $(pwd)/tycho-scripts.sh
eclipse_bootstrap=$1
-preV='0.21.0'
-v='0.21.0-SNAPSHOT'
+preV='0.22.0'
+v='0.22.0-SNAPSHOT'
osgiV='3.10.0.v20140328-1811'
fp2V='0.0.1-SNAPSHOT'
bundles=()
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index c6d15a5..e613d35 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,4 +1,4 @@
-From bdadf5704a5459c0fb42334c66d617015eab19ea Mon Sep 17 00:00:00 2001
+From 51411f57cb7c92fc6370e321753bf011a35dfa7b Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber at redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH] Fix the Tycho build to work on Fedora.
@@ -22,19 +22,18 @@ Update to using plexus-archiver 2.6.
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
- .../META-INF/MANIFEST.MF | 2 +-
- .../tycho/p2/target/ee/CustomEEResolutionHandler.java | 2 +-
- .../main/java/org/eclipse/tycho/test/util/HttpServer.java | 8 ++++++--
- .../tycho-bundles-external/tycho-bundles-external.product | 1 -
- .../tycho-standalone-p2-director/p2 Director.product | 1 -
- .../src/main/java/org/eclipse/tycho/core/ee/EEVersion.java | 13 ++++++++++++-
- .../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
- .../tycho/plugins/p2/director/ProductArchiverMojo.java | 9 +++------
- .../eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
- 9 files changed, 31 insertions(+), 20 deletions(-)
+ .../META-INF/MANIFEST.MF | 2 +-
+ .../eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java | 2 +-
+ .../src/main/java/org/eclipse/tycho/test/util/HttpServer.java | 8 ++++++--
+ .../tycho-bundles-external/tycho-bundles-external.product | 1 -
+ .../tycho-standalone-p2-director/p2 Director.product | 1 -
+ .../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
+ .../tycho/plugins/p2/director/ProductArchiverMojo.java | 9 +++------
+ .../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
+ 8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
-index f59f155..6d3813b 100644
+index ad42ac5..b9d68f6 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Fragment-Host: org.eclipse.tycho.p2.maven.repository
@@ -60,10 +59,10 @@ index 6773a40..c66c991 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 57b4e10..47423e5 100644
+index 42c6a5a..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
-@@ -17,9 +17,13 @@ import java.util.List;
+@@ -17,6 +17,11 @@ import java.util.List;
import java.util.Map;
import java.util.Random;
@@ -71,24 +70,22 @@ index 57b4e10..47423e5 100644
+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.Connector;
import org.eclipse.jetty.server.Server;
--import org.eclipse.jetty.server.bio.SocketConnector;
-+import org.eclipse.jetty.server.ServerConnector;
+ import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.ServletContextHandler;
- import org.eclipse.jetty.servlet.ServletHolder;
- import org.junit.rules.ExternalResource;
-@@ -77,7 +81,7 @@ public class HttpServer extends ExternalResource {
+@@ -76,8 +81,7 @@ public class HttpServer extends ExternalResource {
private static RunningServer startServerOnPort(int port) throws Exception {
Server jetty = new Server();
-- Connector connector = new SocketConnector();
+- ServerConnector connector = new ServerConnector(jetty);
+- connector.setHost("localhost");
+ AbstractNetworkConnector connector = new ServerConnector(jetty);
connector.setPort(port);
jetty.addConnector(connector);
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
-index 9f6cb78..41705c5 100644
+index 76516e5..7c99168 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -43,7 +43,6 @@
@@ -111,42 +108,11 @@ index 6739b3a..af9237b 100644
<plugin id="org.eclipse.equinox.ds"/>
<plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
-diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/EEVersion.java b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/EEVersion.java
-index 6455a7c..4d09e34 100644
---- a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/EEVersion.java
-+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/EEVersion.java
-@@ -18,7 +18,8 @@ public class EEVersion implements Comparable<EEVersion> {
- public enum EEType {
-
- // order is significant for comparison
-- OSGI_MINIMUM("OSGi/Minimum"), CDC_FOUNDATION("CDC/Foundation"), JRE("JRE"), JAVA_SE("JavaSE");
-+ OSGI_MINIMUM("OSGi/Minimum"), CDC_FOUNDATION("CDC/Foundation"), JRE("JRE"), JAVA_SE("JavaSE"), JAVA_SE_COMPACT1(
-+ "JavaSE/compact1"), JAVA_SE_COMPACT2("JavaSE/compact2"), JAVA_SE_COMPACT3("JavaSE/compact3");
-
- private final String profileName;
-
-@@ -51,6 +52,16 @@ public class EEVersion implements Comparable<EEVersion> {
- * @see java.lang.Comparable#compareTo(java.lang.Object)
- */
- public int compareTo(EEVersion other) {
-+ // JavaSE/compact{1..3} > JavaSE-N except when N = 1.8
-+ final Version JAVA8 = Version.parseVersion("1.8");
-+ if (type.equals(EEType.JAVA_SE) && version.equals(JAVA8)
-+ && other.type.profileName.contains("JavaSE/compact")) {
-+ return 1;
-+
-+ } else if (other.type.equals(EEType.JAVA_SE) && other.version.equals(JAVA8)
-+ && type.profileName.contains("JavaSE/compact")) {
-+ return -1;
-+ }
- int result = type.compareTo(other.type);
- if (result != 0) {
- return result;
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 4cc937c..59335b9 100644
+index b71b858..1160f6c 100644
--- 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
-@@ -77,7 +77,9 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+@@ -84,7 +84,9 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
}
private void validate(List<MavenProject> projects) throws MavenExecutionException {
@@ -158,19 +124,19 @@ index 4cc937c..59335b9 100644
}
diff --git a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
-index 6a5c967..957b737 100644
+index e30aae3..0102465 100644
--- a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
+++ b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
-@@ -26,6 +26,7 @@ import org.apache.maven.project.MavenProjectHelper;
+@@ -27,6 +27,7 @@ import org.apache.maven.project.MavenProjectHelper;
import org.codehaus.plexus.archiver.Archiver;
import org.codehaus.plexus.archiver.ArchiverException;
import org.codehaus.plexus.archiver.tar.TarArchiver;
+import org.codehaus.plexus.archiver.tar.TarArchiver.TarCompressionMethod;
import org.codehaus.plexus.archiver.tar.TarLongFileMode;
- import org.eclipse.tycho.core.facade.TargetEnvironment;
+ import org.eclipse.tycho.core.shared.TargetEnvironment;
import org.eclipse.tycho.plugins.tar.TarGzArchiver;
@@ -98,13 +99,9 @@ public final class ProductArchiverMojo extends AbstractProductMojo {
- productArchivers.put("tar.gz", new ProductArchiver() {
+ productArchivers.put(TAR_GZ_ARCHIVE_FORMAT, new ProductArchiver() {
@Override
Archiver getArchiver() throws ArchiverException {
- TarArchiver.TarCompressionMethod tarCompressionMethod = new TarArchiver.TarCompressionMethod();
diff --git a/tycho-fix-surefire.patch b/tycho-fix-surefire.patch
index 78352f6..02edb28 100644
--- a/tycho-fix-surefire.patch
+++ b/tycho-fix-surefire.patch
@@ -1,6 +1,6 @@
-From 30e2826ca933fd28d1f769f43fd818ce536b5363 Mon Sep 17 00:00:00 2001
-From: Roland Grunberg <rgrunber at redhat.com>
-Date: Fri, 21 Sep 2012 10:58:09 -0400
+From 3d497c3a1f153eeff65b5c336c3735afc2f5e02c Mon Sep 17 00:00:00 2001
+From: Jan Sievers <jan.sievers at sap.com>
+Date: Tue, 4 Sep 2012 16:02:52 +0200
Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire.
When running an Eclipse bundle's tests, Tycho Surefire resolves its
@@ -21,24 +21,26 @@ Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f
tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml | 10 ++++++++++
.../org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF | 4 +++-
tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml | 10 ++++++++++
- 6 files changed, 34 insertions(+), 4 deletions(-)
+ .../org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF | 3 ++-
+ tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml | 5 +++++
+ 8 files changed, 41 insertions(+), 5 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 0063b71..9087302 100644
+index 985c901..d0ae690 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.21.0
+@@ -6,6 +6,7 @@ Bundle-Version: 0.22.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)"
--Bundle-ClassPath: jars/surefire-junit3-2.15.jar
+-Bundle-ClassPath: jars/surefire-junit3-2.17.jar
+Require-Bundle: org.junit;bundle-version="[3.8.0,5.0.0)"
-+Bundle-ClassPath: jars/surefire-junit3-2.15.jar,
-+ jars/common-junit3-2.15.jar
++Bundle-ClassPath: jars/surefire-junit3-2.17.jar,
++ jars/common-junit3-2.17.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 341e317..5cd46d6 100644
+index 108286e..4093a2f 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,22 +56,22 @@ index 341e317..5cd46d6 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 861e0d7..a37db5f 100644
+index 41cf2a4..1f554ba 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.21.0
+@@ -6,7 +6,9 @@ Bundle-Version: 0.22.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
--Bundle-ClassPath: jars/surefire-junit4-2.15.jar
-+Bundle-ClassPath: jars/surefire-junit4-2.15.jar,
-+ jars/common-junit3-2.15.jar,
-+ jars/common-junit4-2.15.jar
+-Bundle-ClassPath: jars/surefire-junit4-2.17.jar
++Bundle-ClassPath: jars/surefire-junit4-2.17.jar,
++ jars/common-junit3-2.17.jar,
++ jars/common-junit4-2.17.jar
Import-Package: junit.framework;version="3.0.0",
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 0cdea03..8156c49 100644
+index 8b5cf64..ae3b3b1 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,22 +92,22 @@ index 0cdea03..8156c49 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 6e0cebb..69aecdd 100644
+index 6bb3710..ebac243 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
Bundle-ClassPath: .,
- jars/surefire-junit47-2.15.jar,
- jars/common-junit48-2.15.jar,
-- jars/surefire-grouper-2.15.jar
-+ jars/surefire-grouper-2.15.jar,
-+ jars/common-junit3-2.15.jar,
-+ jars/common-junit4-2.15.jar
+ jars/surefire-junit47-2.17.jar,
+ jars/common-junit48-2.17.jar,
+- jars/surefire-grouper-2.17.jar
++ jars/surefire-grouper-2.17.jar,
++ jars/common-junit3-2.17.jar,
++ jars/common-junit4-2.17.jar
Import-Package: junit.framework;version="3.0.0",
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 e217cdf..3e45493 100644
+index ba08dc0..afadf96 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 @@
@@ -125,6 +127,36 @@ index e217cdf..3e45493 100644
</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 6c9a366..dfe22ae 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,8 @@ Bundle-Version: 0.22.0
+ Bundle-ClassPath: .,
+ jars/surefire-booter-2.17.jar,
+ jars/surefire-api-2.17.jar,
+- jars/maven-surefire-common-2.17.jar
++ jars/maven-surefire-common-2.17.jar,
++ jars/plexus-utils-3.0.jar
+ 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 e457dce..6fd329f 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
++++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+@@ -57,6 +57,11 @@
+ <artifactId>maven-surefire-common</artifactId>
+ <version>${surefire-version}</version>
+ </artifactItem>
++ <artifactItem>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-utils</artifactId>
++ <version>3.0</version>
++ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
--
1.9.3
diff --git a/tycho-maven-delegation.patch b/tycho-maven-delegation.patch
index e3cf19b..2440cfc 100644
--- a/tycho-maven-delegation.patch
+++ b/tycho-maven-delegation.patch
@@ -1,4 +1,4 @@
-From 7e3beef99cd00d3b5f0690ec2a3c19b16facb77a Mon Sep 17 00:00:00 2001
+From 824f4a6c2db4f229e43de0c217d00a0c2c5b723d Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber at redhat.com>
Date: Wed, 18 Jun 2014 13:01:31 -0400
Subject: [PATCH] Tycho should always delegate artifact resolution to Maven.
@@ -17,9 +17,9 @@ locations.
Change-Id: Ia44969ed1064965a82c3507a63e54caeebb75b18
---
.../META-INF/MANIFEST.MF | 1 +
- .../eclipse/tycho/core/facade/MavenContext.java | 2 +
- .../tycho/core/facade/MavenContextImpl.java | 10 ++++-
- .../tycho/core/facade/MavenRepositorySystem.java | 19 +++++++++
+ .../eclipse/tycho/core/shared/MavenContext.java | 2 +
+ .../tycho/core/shared/MavenContextImpl.java | 10 ++++-
+ .../tycho/core/shared/MavenRepositorySystem.java | 19 +++++++++
.../local/LocalArtifactRepositoryP2APITest.java | 4 +-
.../local/LocalMetadataRepositoryTest.java | 3 +-
.../repository/local/LocalArtifactRepository.java | 8 ++--
@@ -39,23 +39,23 @@ Change-Id: Ia44969ed1064965a82c3507a63e54caeebb75b18
.../adapters/MavenRepositorySystemAdapter.java | 37 ++++++++++++++++
.../configuration/MavenContextConfigurator.java | 8 +++-
22 files changed, 166 insertions(+), 62 deletions(-)
- create mode 100644 tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenRepositorySystem.java
+ create mode 100644 tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java
create mode 100644 tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java
create mode 100644 tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java
diff --git a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
-index 453e864..09a83ad 100644
+index 9658fbc..efd0a2c 100644
--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF
@@ -7,3 +7,4 @@ Fragment-Host: org.eclipse.tycho.core.shared
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.junit;bundle-version="4.8.2"
Bundle-Vendor: %providerName
+Import-Package: org.eclipse.tycho.p2.repository
-diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenContext.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenContext.java
-index 3b0f3f4..7ce5afd 100644
---- a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenContext.java
-+++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenContext.java
+diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java
+index d63c1f1..cd8594d 100644
+--- a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java
++++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContext.java
@@ -38,4 +38,6 @@ public interface MavenContext {
*/
public Properties getSessionProperties();
@@ -63,10 +63,10 @@ index 3b0f3f4..7ce5afd 100644
+ public MavenRepositorySystem getRepositorySystem();
+
}
-diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenContextImpl.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenContextImpl.java
-index 44b0e77..934e890 100644
---- a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenContextImpl.java
-+++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenContextImpl.java
+diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java
+index 7b39d58..a15354f 100644
+--- a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java
++++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenContextImpl.java
@@ -19,18 +19,20 @@ public class MavenContextImpl implements MavenContext {
private MavenLogger mavenLogger;
private boolean offline;
@@ -99,11 +99,11 @@ index 44b0e77..934e890 100644
+ }
+
}
-diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenRepositorySystem.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenRepositorySystem.java
+diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java
new file mode 100644
-index 0000000..fd2f0a9
+index 0000000..965e5cd
--- /dev/null
-+++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/facade/MavenRepositorySystem.java
++++ b/tycho-bundles/org.eclipse.tycho.core.shared/src/main/java/org/eclipse/tycho/core/shared/MavenRepositorySystem.java
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Red Hat Inc.
@@ -115,7 +115,7 @@ index 0000000..fd2f0a9
+ * Contributors:
+ * Red Hat Inc. - initial API and implementation
+ *******************************************************************************/
-+package org.eclipse.tycho.core.facade;
++package org.eclipse.tycho.core.shared;
+
+import java.io.File;
+
@@ -168,14 +168,14 @@ index 9b6d270..8779841 100644
private LocalMetadataRepository createRepository(File location) throws ProvisionException {
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java
-index 36946bf..ae435c2 100644
+index 36946bf..0e2d330 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepository.java
@@ -23,6 +23,7 @@ import java.util.Set;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
-+import org.eclipse.tycho.core.facade.MavenRepositorySystem;
++import org.eclipse.tycho.core.shared.MavenRepositorySystem;
import org.eclipse.tycho.p2.maven.repository.Activator;
import org.eclipse.tycho.p2.maven.repository.xmlio.ArtifactsIO;
import org.eclipse.tycho.p2.repository.GAV;
@@ -200,14 +200,14 @@ index 36946bf..ae435c2 100644
public LocalArtifactRepository(IProvisioningAgent agent, LocalRepositoryP2Indices localRepoIndices,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java
-index fc99483..187d84f 100644
+index fc99483..be2ce88 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/LocalArtifactRepositoryFactory.java
@@ -18,6 +18,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
import org.eclipse.equinox.p2.repository.artifact.spi.ArtifactRepositoryFactory;
-+import org.eclipse.tycho.core.facade.MavenRepositorySystem;
++import org.eclipse.tycho.core.shared.MavenRepositorySystem;
import org.eclipse.tycho.p2.maven.repository.Activator;
import org.eclipse.tycho.p2.repository.LocalRepositoryP2Indices;
import org.eclipse.tycho.repository.util.internal.RepositoryFactoryTools;
@@ -221,14 +221,14 @@ index fc99483..187d84f 100644
}
return null;
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
-index e727bdb..6f4f860 100644
+index 2a746f2..7b9983a 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/src/main/java/org/eclipse/tycho/repository/local/index/LocalRepositoryP2IndicesImpl.java
@@ -14,6 +14,7 @@ package org.eclipse.tycho.repository.local.index;
import java.io.File;
- import org.eclipse.tycho.core.facade.MavenContext;
-+import org.eclipse.tycho.core.facade.MavenRepositorySystem;
+ import org.eclipse.tycho.core.shared.MavenContext;
++import org.eclipse.tycho.core.shared.MavenRepositorySystem;
import org.eclipse.tycho.locking.facade.FileLockService;
import org.eclipse.tycho.p2.repository.LocalRepositoryP2Indices;
import org.eclipse.tycho.p2.repository.TychoRepositoryIndex;
@@ -258,7 +258,7 @@ index e727bdb..6f4f860 100644
+
}
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java
-index 7fdec5e..b4a80cb 100644
+index 432ec09..4e5566a 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMavenMirrorsTest.java
@@ -29,6 +29,7 @@ import org.eclipse.tycho.p2.impl.test.ResourceUtil;
@@ -279,11 +279,11 @@ index 7fdec5e..b4a80cb 100644
mavenRepositorySettings = new MavenRepositorySettingsStub();
subject = new RemoteAgent(mavenContext, mavenRepositorySettings, OFFLINE);
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java
-index 9fbecb6..0aa6d61 100644
+index ae31862..14b8f85 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/remote/RemoteAgentMetadataRepositoryCacheTest.java
@@ -26,6 +26,7 @@ import org.eclipse.equinox.p2.repository.metadata.IMetadataRepositoryManager;
- import org.eclipse.tycho.core.facade.MavenContextImpl;
+ import org.eclipse.tycho.core.shared.MavenContextImpl;
import org.eclipse.tycho.test.util.HttpServer;
import org.eclipse.tycho.test.util.LogVerifier;
+import org.eclipse.tycho.test.util.MavenRepositorySystemStub;
@@ -327,7 +327,7 @@ index 50fe92f..3044e97 100644
@Test
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java
-index 751791c..23d8481 100644
+index d982042..127ae11 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/target/TestResolverFactory.java
@@ -28,6 +28,7 @@ import org.eclipse.tycho.p2.target.facade.TargetPlatformFactory;
@@ -357,7 +357,7 @@ index 751791c..23d8481 100644
// TODO use TemporaryLocalMavenRepository
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java
-index 0155593..12d38a5 100644
+index a74d4d5..2f903a1 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/resolver/P2ResolverFactoryImpl.java
@@ -33,7 +33,7 @@ public class P2ResolverFactoryImpl implements P2ResolverFactory {
@@ -390,7 +390,7 @@ index 0155593..12d38a5 100644
}
return localArtifactRepository;
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java
-index eb20440..3b903df 100644
+index 8bee7ba..f2b07a5 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/PomDependencyCollectorImpl.java
@@ -44,7 +44,7 @@ public class PomDependencyCollectorImpl implements PomDependencyCollector {
@@ -403,14 +403,14 @@ index eb20440..3b903df 100644
public void setProjectLocation(File projectLocation) {
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
-index 8281167..b10929a 100644
+index 0195871..44a0f30 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
@@ -25,6 +25,7 @@ import org.eclipse.equinox.p2.publisher.PublisherResult;
import org.eclipse.equinox.p2.publisher.eclipse.BundlesAction;
import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor;
- import org.eclipse.tycho.core.facade.MavenLogger;
-+import org.eclipse.tycho.core.facade.MavenRepositorySystem;
+ import org.eclipse.tycho.core.shared.MavenLogger;
++import org.eclipse.tycho.core.shared.MavenRepositorySystem;
import org.eclipse.tycho.p2.impl.publisher.MavenPropertiesAdvice;
import org.eclipse.tycho.p2.impl.publisher.repo.TransientArtifactRepository;
import org.eclipse.tycho.p2.metadata.IArtifactFacade;
@@ -449,14 +449,14 @@ index 8281167..b10929a 100644
}
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java
-index 2122578..54c46fc 100644
+index 2122578..5e4a01e 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryP2Indices.java
@@ -13,6 +13,8 @@ package org.eclipse.tycho.p2.repository;
import java.io.File;
-+import org.eclipse.tycho.core.facade.MavenRepositorySystem;
++import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+
/**
* This service provides access to the tycho p2 index files of the local maven repository.
@@ -469,14 +469,14 @@ index 2122578..54c46fc 100644
+
}
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-index b5c8c55..7f6aa58 100644
+index b5c8c55..8842af3 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
@@ -14,54 +14,27 @@ import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
-+import org.eclipse.tycho.core.facade.MavenRepositorySystem;
++import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+
public class LocalRepositoryReader implements RepositoryReader {
@@ -539,14 +539,14 @@ index b5c8c55..7f6aa58 100644
}
}
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java
-index f7cc92c..d6f3fec 100644
+index f7cc92c..7bc8a95 100644
--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/repository/local/testutil/TemporaryLocalMavenRepository.java
@@ -14,9 +14,11 @@ import java.io.File;
import java.io.IOException;
import org.eclipse.equinox.internal.p2.core.helpers.FileUtils;
-+import org.eclipse.tycho.core.facade.MavenRepositorySystem;
++import org.eclipse.tycho.core.shared.MavenRepositorySystem;
import org.eclipse.tycho.p2.repository.LocalRepositoryP2Indices;
import org.eclipse.tycho.repository.local.LocalArtifactRepository;
import org.eclipse.tycho.repository.local.index.LocalRepositoryP2IndicesImpl;
@@ -565,7 +565,7 @@ index f7cc92c..d6f3fec 100644
}
diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java
new file mode 100644
-index 0000000..5d5f815
+index 0000000..7e020da
--- /dev/null
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/MavenRepositorySystemStub.java
@@ -0,0 +1,30 @@
@@ -583,7 +583,7 @@ index 0000000..5d5f815
+
+import java.io.File;
+
-+import org.eclipse.tycho.core.facade.MavenRepositorySystem;
++import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+import org.eclipse.tycho.p2.repository.RepositoryLayoutHelper;
+
+public class MavenRepositorySystemStub implements MavenRepositorySystem {
@@ -601,7 +601,7 @@ index 0000000..5d5f815
+}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java
new file mode 100644
-index 0000000..7c22f62
+index 0000000..e1d46fa
--- /dev/null
+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/adapters/MavenRepositorySystemAdapter.java
@@ -0,0 +1,37 @@
@@ -623,7 +623,7 @@ index 0000000..7c22f62
+import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.repository.RepositorySystem;
-+import org.eclipse.tycho.core.facade.MavenRepositorySystem;
++import org.eclipse.tycho.core.shared.MavenRepositorySystem;
+
+public class MavenRepositorySystemAdapter implements MavenRepositorySystem {
+
@@ -643,7 +643,7 @@ index 0000000..7c22f62
+
+}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java
-index cde12ad..dd907a2 100644
+index e5837e2..137dcb1 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/configuration/MavenContextConfigurator.java
@@ -16,6 +16,7 @@ import java.util.Properties;
@@ -655,8 +655,8 @@ index cde12ad..dd907a2 100644
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.component.annotations.Component;
@@ -26,6 +27,7 @@ import org.eclipse.sisu.equinox.embedder.EquinoxLifecycleListener;
- import org.eclipse.tycho.core.facade.MavenContext;
- import org.eclipse.tycho.core.facade.MavenContextImpl;
+ import org.eclipse.tycho.core.shared.MavenContext;
+ import org.eclipse.tycho.core.shared.MavenContextImpl;
import org.eclipse.tycho.osgi.adapters.MavenLoggerAdapter;
+import org.eclipse.tycho.osgi.adapters.MavenRepositorySystemAdapter;
diff --git a/tycho-running-env-only.patch b/tycho-running-env-only.patch
index 5fb78f9..f11b77d 100644
--- a/tycho-running-env-only.patch
+++ b/tycho-running-env-only.patch
@@ -1,4 +1,4 @@
-From 03176de4589022cdb80672017080066b192116c8 Mon Sep 17 00:00:00 2001
+From 068c927f7e56f216bc8bce674e849fae9ffceb1d Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth at redhat.com>
Date: Thu, 10 Jul 2014 15:26:50 +0100
Subject: [PATCH] Add "running env only" option to the p2-director-plugin.
@@ -6,32 +6,33 @@ Subject: [PATCH] Add "running env only" option to the p2-director-plugin.
This options allows you to restrict assembling and archiving products
to only the current running target environment.
---
- .../tycho/plugins/p2/director/AbstractProductMojo.java | 16 ++++++++++++++++
- .../eclipse/tycho/plugins/p2/director/DirectorMojo.java | 3 +++
- .../tycho/plugins/p2/director/ProductArchiverMojo.java | 3 +++
- 3 files changed, 22 insertions(+)
+ .../tycho/plugins/p2/director/AbstractProductMojo.java | 17 +++++++++++++++++
+ .../eclipse/tycho/plugins/p2/director/DirectorMojo.java | 3 +++
+ .../tycho/plugins/p2/director/ProductArchiverMojo.java | 3 +++
+ 3 files changed, 23 insertions(+)
diff --git a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java
-index c34cb72..a2e2f72 100644
+index 7879a79..59eaf7a 100644
--- a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java
+++ b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/AbstractProductMojo.java
-@@ -112,6 +112,15 @@ abstract class AbstractProductMojo extends AbstractMojo {
- @Parameter(property = "p2.timeout", defaultValue = "0")
- private int forkedProcessTimeoutInSeconds;
+@@ -106,6 +106,16 @@ abstract class AbstractProductMojo extends AbstractMojo {
+ private List<Product> products;
-+ /**
+ /**
+ * <p>
+ * Assemble and archive product installations for the running environment only. Setting this to
+ * true will omit all target environments that do not exactly match the running environment.
+ * </p>
++ *
++ * @parameter expression="${director.running.env.only}"
+ */
-+ @Parameter(defaultValue = "false", property = "director.running.env.only")
+ private boolean runningEnvOnly;
+
- int getForkedProcessTimeoutInSeconds() {
- return forkedProcessTimeoutInSeconds;
- }
-@@ -148,4 +157,11 @@ abstract class AbstractProductMojo extends AbstractMojo {
++ /**
+ * Kill the forked process after a certain number of seconds. If set to 0, wait forever for the
+ * process, never timing out.
+ */
+@@ -148,4 +158,11 @@ abstract class AbstractProductMojo extends AbstractMojo {
static String getOsWsArch(TargetEnvironment env, char separator) {
return env.getOs() + separator + env.getWs() + separator + env.getArch();
}
@@ -44,7 +45,7 @@ index c34cb72..a2e2f72 100644
+ }
}
diff --git a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/DirectorMojo.java b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/DirectorMojo.java
-index 8bd539f..f95ce7e 100644
+index 9f90ff1..fc8b342 100644
--- a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/DirectorMojo.java
+++ b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/DirectorMojo.java
@@ -114,6 +114,9 @@ public final class DirectorMojo extends AbstractProductMojo {
@@ -58,19 +59,19 @@ index 8bd539f..f95ce7e 100644
File destination = getProductMaterializeDirectory(product, env);
diff --git a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
-index 6a5c967..0e8df2a 100644
+index 0102465..ffa84b0 100644
--- a/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
+++ b/tycho-p2/tycho-p2-director-plugin/src/main/java/org/eclipse/tycho/plugins/p2/director/ProductArchiverMojo.java
-@@ -129,6 +129,9 @@ public final class ProductArchiverMojo extends AbstractProductMojo {
+@@ -122,6 +122,9 @@ public final class ProductArchiverMojo extends AbstractProductMojo {
for (Product product : config.getProducts()) {
for (TargetEnvironment env : getEnvironments()) {
+ if (!buildForEnv(env)) {
+ continue;
+ }
- String format = formats != null ? formats.get(env.getOs()) : DEFAULT_ARCHIVE_FORMAT;
- if (format != null) {
- format = format.trim();
+ String format = getArchiveFormat(env);
+ ProductArchiver productArchiver = productArchivers.get(format);
+ if (productArchiver == null) {
--
1.9.3
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index ec3d62b..738c954 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From a8aaa1b1e97b9173f9a0816b6918faffd75817e6 Mon Sep 17 00:00:00 2001
+From a79c7771631f3bccbf5625c85ed99796b187ae9c Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber at redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@@ -27,23 +27,22 @@ reactor cache, resolution should be attempted using the XMvn Resolver.
Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
---
- .../embedder/internal/DefaultEquinoxEmbedder.java | 11 ++++-
- .../META-INF/MANIFEST.MF | 3 +-
+ .../embedder/internal/DefaultEquinoxEmbedder.java | 11 +++++-
.../p2/remote/RemoteRepositoryCacheManager.java | 14 +++++++
- .../tycho/p2/target/TargetDefinitionResolver.java | 48 ++++++++++++++++++++--
- .../p2/target/TargetPlatformBundlePublisher.java | 15 ++-----
- .../tycho/p2/target/TargetPlatformFactoryImpl.java | 45 ++++++++++++++++++--
- .../tycho/p2/repository/LocalRepositoryReader.java | 44 +++++++++++++++++++-
+ .../tycho/p2/target/TargetDefinitionResolver.java | 17 ++++++--
+ .../p2/target/TargetPlatformBundlePublisher.java | 15 ++------
+ .../tycho/p2/target/TargetPlatformFactoryImpl.java | 45 ++++++++++++++++++++--
+ .../tycho/p2/repository/LocalRepositoryReader.java | 44 ++++++++++++++++++++-
.../facade/TargetPlatformConfigurationStub.java | 6 ++-
.../tycho-bundles-external.product | 1 +
- .../eclipse/tycho/core/locking/FileLockerImpl.java | 26 +++++++++---
- .../core/maven/TychoMavenLifecycleParticipant.java | 13 ++++++
+ .../eclipse/tycho/core/locking/FileLockerImpl.java | 26 ++++++++++---
+ .../core/maven/TychoMavenLifecycleParticipant.java | 13 +++++++
.../tycho/core/osgitools/AbstractTychoProject.java | 23 +++++++++++
- .../tycho/core/osgitools/OsgiBundleProject.java | 29 ++++++++++++-
+ .../tycho/core/osgitools/OsgiBundleProject.java | 5 ++-
.../DefaultTargetPlatformConfigurationReader.java | 6 ++-
tycho-p2/tycho-p2-facade/pom.xml | 5 +++
- .../tycho/p2/resolver/P2DependencyResolver.java | 30 ++++++++++++++
- 16 files changed, 287 insertions(+), 32 deletions(-)
+ .../tycho/p2/resolver/P2DependencyResolver.java | 23 +++++++++++
+ 15 files changed, 222 insertions(+), 32 deletions(-)
diff --git a/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java b/sisu-equinox/sisu-equinox-embedder/src/main/java/org/eclipse/sisu/equinox/embedder/internal/DefaultEquinoxEmbedder.java
index ed01c2d..759f005 100644
@@ -74,22 +73,8 @@ index ed01c2d..759f005 100644
}
String getReferenceUrl(File file) {
-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 cc5e9b3..85ff778 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
-@@ -18,7 +18,8 @@ Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.equinox.p2.repository;bundle-version="2.0.0",
- org.eclipse.equinox.p2.updatesite;bundle-version="1.0.200",
- org.eclipse.core.net;bundle-version="1.2.100",
-- org.eclipse.tycho.p2.maven.repository;bundle-version="0.12.0"
-+ org.eclipse.tycho.p2.maven.repository;bundle-version="0.12.0",
-+ org.fedoraproject.p2
- Bundle-RequiredExecutionEnvironment: J2SE-1.5
- Bundle-ActivationPolicy: lazy
- Export-Package: org.eclipse.tycho.p2.impl;x-friends:="org.eclipse.tycho.p2.impl.test",
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
-index 707b1c5..c8c4152 100644
+index 1d3a029..2ec5c59 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/remote/RemoteRepositoryCacheManager.java
@@ -12,12 +12,19 @@ package org.eclipse.tycho.p2.remote;
@@ -109,8 +94,8 @@ index 707b1c5..c8c4152 100644
import org.eclipse.equinox.internal.p2.repository.Transport;
import org.eclipse.equinox.p2.core.ProvisionException;
+import org.eclipse.osgi.util.NLS;
- import org.eclipse.tycho.core.facade.MavenContext;
- import org.eclipse.tycho.core.facade.MavenLogger;
+ import org.eclipse.tycho.core.shared.MavenContext;
+ import org.eclipse.tycho.core.shared.MavenLogger;
@@ -48,6 +55,13 @@ class RemoteRepositoryCacheManager extends CacheManager {
@Override
@@ -127,100 +112,52 @@ index 707b1c5..c8c4152 100644
if (offline) {
if (cacheFile != null) {
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 e8f7c3f..b34512a 100644
+index c614e15..d6ae1af 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
-@@ -11,9 +11,11 @@
- package org.eclipse.tycho.p2.target;
+@@ -20,6 +20,7 @@ import java.util.Set;
- import java.net.URI;
-+import java.nio.file.Paths;
- import java.util.ArrayList;
- import java.util.Collection;
- import java.util.Collections;
-+import java.util.HashSet;
- import java.util.Iterator;
- import java.util.LinkedHashSet;
- import java.util.List;
-@@ -22,6 +24,7 @@ import java.util.Set;
- import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
- import org.eclipse.core.runtime.IStatus;
+ import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.URIUtil;
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-@@ -51,6 +54,7 @@ import org.eclipse.tycho.p2.util.resolution.ProjectorResolutionStrategy;
- import org.eclipse.tycho.p2.util.resolution.SlicerResolutionStrategy;
- import org.eclipse.tycho.repository.util.DuplicateFilteringLoggingProgressMonitor;
- import org.eclipse.tycho.repository.util.StatusTool;
-+import org.fedoraproject.p2.EclipseSystemLayout;
-
- /**
- * Class which performs target definition resolution. This class is used by the
-@@ -122,9 +126,35 @@ public class TargetDefinitionResolver {
+@@ -121,7 +122,12 @@ public final class TargetDefinitionResolver {
+ resolverRun.addLocation((InstallableUnitLocation) locationDefinition);
- List<IMetadataRepository> metadataRepositories = new ArrayList<IMetadataRepository>();
- for (Repository repository : iuLocationDefinition.getRepositories()) {
-- repositoryIdManager.addMapping(repository.getId(), repository.getLocation());
+ for (Repository repository : ((InstallableUnitLocation) locationDefinition).getRepositories()) {
- artifactRepositories.add(repository.getLocation());
-- metadataRepositories.add(loadRepository(repository));
+ // We cannot resolve a non-file URI in local mode
+ if ((System.getProperty("TYCHO_MVN_LOCAL") == null && System.getProperty("TYCHO_MVN_RPMBUILD") == null)
+ || URIUtil.isFileURI(repository.getLocation())
+ || "fedora".equals(repository.getLocation().getScheme())) {
-+ repositoryIdManager.addMapping(repository.getId(), repository.getLocation());
+ artifactRepositories.add(repository.getLocation());
-+ metadataRepositories.add(loadRepository(repository));
-+ }
-+ }
-+ // Add Fedora Local P2 Repository when running in local mode
-+ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
-+ final Set<String> allLocations = new HashSet<String>();
-+ final Set<String> roots = EclipseSystemLayout.getSCLRoots();
-+
-+ for (String root : roots) {
-+ EclipseSystemLayout.initLocations(Paths.get(root), allLocations, allLocations, allLocations, false);
-+ }
-+ allLocations.addAll(EclipseSystemLayout.getUserDefinedBundleLocations());
-+
-+ for (String loc : allLocations) {
-+ try {
-+ String uri = "fedora:" + loc;
-+ URI location = new URI(uri);
-+ repositoryIdManager.addMapping(uri, location);
-+ artifactRepositories.add(location);
-+ metadataRepositories.add(metadataManager.loadRepository(location, monitor));
-+ } catch (Exception e) {
-+ }
+ }
}
-
- IQueryable<IInstallableUnit> locationUnits = new CompoundQueryable<IInstallableUnit>(
-@@ -236,6 +266,18 @@ public class TargetDefinitionResolver {
- IQuery<IInstallableUnit> latestMatchingIUQuery = QueryUtil.createLatestQuery(matchingIUQuery);
-
- IQueryResult<IInstallableUnit> queryResult = units.query(latestMatchingIUQuery, monitor);
-+
-+ // If the iu/version can't be located then try to use an iu of any version
-+ if ((System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null)
-+ && queryResult.isEmpty()) {
-+ logger.warn(NLS.bind("Could not find \"{0}/{1}\" in the repositories of the current location",
-+ unitReference.getId(), unitReference.getVersion()));
-+ logger.warn(NLS.bind("Attempting to look for \"{0}\" instead.", unitReference.getId()));
-+ matchingIUQuery = QueryUtil.createIUQuery(unitReference.getId());
-+ latestMatchingIUQuery = QueryUtil.createLatestQuery(matchingIUQuery);
-+ queryResult = units.query(latestMatchingIUQuery, monitor);
-+ }
-+
- return queryResult;
- }
+ } else {
+ logger.warn("Target location type '" + locationDefinition.getTypeDescription() + "' is not supported");
+@@ -278,8 +284,13 @@ public final class TargetDefinitionResolver {
+
+ loadedRepositories = new ArrayList<IMetadataRepository>();
+ for (Repository repository : locationDefinition.getRepositories()) {
+- repositoryIdManager.addMapping(repository.getId(), repository.getLocation());
+- loadedRepositories.add(loadRepository(repository));
++ // We cannot resolve a non-file URI in local mode
++ if ((System.getProperty("TYCHO_MVN_LOCAL") == null && System.getProperty("TYCHO_MVN_RPMBUILD") == null)
++ || URIUtil.isFileURI(repository.getLocation())
++ || "fedora".equals(repository.getLocation().getScheme())) {
++ repositoryIdManager.addMapping(repository.getId(), repository.getLocation());
++ loadedRepositories.add(loadRepository(repository));
++ }
+ }
+ }
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
-index 5d6bc1f..8281167 100644
+index 66a252f..0195871 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBundlePublisher.java
-@@ -28,6 +28,7 @@ import org.eclipse.tycho.core.facade.MavenLogger;
+@@ -28,6 +28,7 @@ import org.eclipse.tycho.core.shared.MavenLogger;
import org.eclipse.tycho.p2.impl.publisher.MavenPropertiesAdvice;
import org.eclipse.tycho.p2.impl.publisher.repo.TransientArtifactRepository;
import org.eclipse.tycho.p2.metadata.IArtifactFacade;
@@ -257,7 +194,7 @@ index 5d6bc1f..8281167 100644
private File getBaseDir() {
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
-index 6554f43..334c425 100644
+index 41fb4c6..75b25ac 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformFactoryImpl.java
@@ -32,6 +32,9 @@ import org.eclipse.core.runtime.URIUtil;
@@ -389,7 +326,7 @@ index 8d36462..b5c8c55 100644
+ }
}
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java
-index 9505cb5..41bd9ad 100644
+index 22cca24..670f013 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/target/facade/TargetPlatformConfigurationStub.java
@@ -56,7 +56,11 @@ public class TargetPlatformConfigurationStub {
@@ -406,7 +343,7 @@ index 9505cb5..41bd9ad 100644
// convenience method for tests
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
-index 41705c5..c7399cb 100644
+index 7c99168..28ad59f 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -76,6 +76,7 @@
@@ -465,7 +402,7 @@ index 86253bd..cef15d2 100644
throw new RuntimeException(e);
} catch (IOException e) {
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 59335b9..77e7c7e 100644
+index 1160f6c..acb2a1d 100644
--- 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
@@ -29,6 +29,7 @@ import org.apache.maven.project.MavenProject;
@@ -475,28 +412,28 @@ index 59335b9..77e7c7e 100644
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.logging.Logger;
import org.eclipse.tycho.ReactorProject;
- import org.eclipse.tycho.core.osgitools.BundleReader;
-@@ -66,6 +67,18 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
- validate(projects);
- configureComponents(session);
+ import org.eclipse.tycho.core.ee.shared.BuildFailureException;
+@@ -68,6 +69,18 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+ validate(projects);
+ configureComponents(session);
-+ try {
-+ if (plexus.lookup("org.fedoraproject.xmvn.resolver.Resolver") != null) {
-+ if (session.isOffline()) {
-+ System.setProperty("TYCHO_MVN_RPMBUILD", "");
-+ } else {
-+ System.setProperty("TYCHO_MVN_LOCAL", "");
++ try {
++ if (plexus.lookup("org.fedoraproject.xmvn.resolver.Resolver") != null) {
++ if (session.isOffline()) {
++ System.setProperty("TYCHO_MVN_RPMBUILD", "");
++ } else {
++ System.setProperty("TYCHO_MVN_LOCAL", "");
++ }
+ }
++ } catch (ComponentLookupException e) {
++ // No XMvn (Upstream Maven in use)
+ }
-+ } catch (ComponentLookupException e) {
-+ // No XMvn (Upstream Maven in use)
-+ }
+
- for (MavenProject project : projects) {
- resolver.setupProject(session, project, DefaultReactorProject.adapt(project));
- }
+ for (MavenProject project : projects) {
+ resolver.setupProject(session, project, DefaultReactorProject.adapt(project));
+ }
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
-index f2602ec..c5755a0 100644
+index dfd4b6f..c05fcd8 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
@@ -19,6 +19,9 @@ import org.eclipse.tycho.artifacts.DependencyArtifacts;
@@ -507,8 +444,8 @@ index f2602ec..c5755a0 100644
+import org.eclipse.tycho.core.ee.UnknownEnvironmentException;
+import org.eclipse.tycho.core.ee.shared.ExecutionEnvironment;
import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration;
- import org.eclipse.tycho.core.facade.TargetEnvironment;
import org.eclipse.tycho.core.osgitools.targetplatform.LocalDependencyResolver;
+ import org.eclipse.tycho.core.osgitools.targetplatform.MultiEnvironmentDependencyArtifacts;
@@ -91,15 +94,35 @@ public abstract class AbstractTychoProject extends AbstractLogEnabled implements
String configuredForcedProfile = tpConfiguration.getExecutionEnvironment();
@@ -546,20 +483,10 @@ index f2602ec..c5755a0 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 f7f5df1..710c8a9 100644
+index fae4eb7..3f5289c 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
-@@ -47,7 +47,9 @@ import org.eclipse.tycho.core.BundleProject;
- import org.eclipse.tycho.core.PluginDescription;
- import org.eclipse.tycho.core.TychoConstants;
- import org.eclipse.tycho.core.TychoProject;
-+import org.eclipse.tycho.core.ee.ExecutionEnvironmentUtils;
- import org.eclipse.tycho.core.ee.StandardExecutionEnvironment;
-+import org.eclipse.tycho.core.ee.UnknownEnvironmentException;
- import org.eclipse.tycho.core.ee.shared.ExecutionEnvironment;
- import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration;
- import org.eclipse.tycho.core.facade.BuildPropertiesParser;
-@@ -489,6 +491,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
+@@ -492,6 +492,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
String pdeProfile = getEclipsePluginProject(DefaultReactorProject.adapt(project)).getBuildProperties()
.getJreCompilationProfile();
if (pdeProfile != null) {
@@ -567,44 +494,27 @@ index f7f5df1..710c8a9 100644
sink.setProfileConfiguration(pdeProfile.trim(), "build.properties");
} else {
-@@ -506,7 +509,31 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
- if (envs.isEmpty()) {
- return null;
- }
-- return Collections.min(envs);
-+
-+ ExecutionEnvironment manifestMinimalEE = Collections.min(envs);
-+ ExecutionEnvironment tmp;
-+
-+ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
-+ try {
-+ // EE must be at least JavaSE-1.6
-+ final ExecutionEnvironment javaSE16 = ExecutionEnvironmentUtils.getExecutionEnvironment("JavaSE-1.6");
-+ while (!envs.isEmpty()) {
-+ tmp = Collections.min(envs);
-+ if (tmp.isCompatibleCompilerTargetLevel(javaSE16.getCompilerTargetLevelDefault())) {
-+ manifestMinimalEE = tmp;
-+ break;
-+ }
-+ envs.remove(tmp);
-+ }
-+
-+ if (envs.isEmpty()) {
-+ return javaSE16;
-+ }
-+ } catch (UnknownEnvironmentException e) {
-+ // Continue
-+ }
-+ }
-+ return manifestMinimalEE;
- }
+@@ -502,13 +503,13 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
+
+ switch (tpConfiguration.getBREEHeaderSelectionPolicy()) {
+ case first:
+- sink.setProfileConfiguration(manifestBREEs[0].getProfileName(),
++ sink.setProfileConfiguration(overrideToAtLeastJavaSE16(manifestBREEs[0].getProfileName()),
+ "Bundle-RequiredExecutionEnvironment (first entry)");
+ break;
+
+ case minimal:
+ ExecutionEnvironment manifestMinimalEE = Collections.min(Arrays.asList(manifestBREEs));
+- sink.setProfileConfiguration(manifestMinimalEE.getProfileName(),
++ sink.setProfileConfiguration(overrideToAtLeastJavaSE16(manifestMinimalEE.getProfileName()),
+ "Bundle-RequiredExecutionEnvironment (minimal entry)");
+ }
- }
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 4a1f157..65cbf47 100644
+index 6fa6b8e..e6d25be 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
-@@ -64,7 +64,11 @@ public class DefaultTargetPlatformConfigurationReader {
+@@ -68,7 +68,11 @@ public class DefaultTargetPlatformConfigurationReader {
+ configuration.toString());
}
@@ -618,7 +528,7 @@ index 4a1f157..65cbf47 100644
setTargetPlatformResolver(result, configuration);
diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml
-index dc1941f..0e84b5b 100644
+index b567d50..34baa1a 100644
--- a/tycho-p2/tycho-p2-facade/pom.xml
+++ b/tycho-p2/tycho-p2-facade/pom.xml
@@ -57,6 +57,11 @@
@@ -634,7 +544,7 @@ index dc1941f..0e84b5b 100644
<build>
diff --git a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java
-index 255df24..2e4e113 100644
+index ae2dc38..d7a76c1 100644
--- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java
+++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2DependencyResolver.java
@@ -15,6 +15,7 @@ import java.net.MalformedURLException;
@@ -645,7 +555,7 @@ index 255df24..2e4e113 100644
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-@@ -85,6 +86,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory;
+@@ -86,6 +87,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory;
import org.eclipse.tycho.p2.target.facade.PomDependencyCollector;
import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub;
import org.eclipse.tycho.repository.registry.facade.ReactorRepositoryManagerFacade;
@@ -653,7 +563,7 @@ index 255df24..2e4e113 100644
@Component(role = DependencyResolver.class, hint = P2DependencyResolver.ROLE_HINT, instantiationStrategy = "per-lookup")
public class P2DependencyResolver extends AbstractLogEnabled implements DependencyResolver, Initializable {
-@@ -201,6 +203,34 @@ public class P2DependencyResolver extends AbstractLogEnabled implements Dependen
+@@ -206,6 +208,27 @@ public class P2DependencyResolver extends AbstractLogEnabled implements Dependen
pomDependencies.setProjectLocation(project.getBasedir());
}
@@ -662,17 +572,10 @@ index 255df24..2e4e113 100644
+
+ Set<String> allLocations = new HashSet<String>();
+ final Set<String> roots = EclipseSystemLayout.getSCLRoots();
-+
-+ Set<String> platformDirs = new HashSet<String>();
-+ Set<String> internalDirs = new HashSet<String>();
-+ Set<String> externalDirs = new HashSet<String>();
+ for (String root : roots) {
-+ EclipseSystemLayout.initLocations(Paths.get(root), platformDirs, internalDirs, externalDirs, false);
++ EclipseSystemLayout.initLocations(Paths.get(root), allLocations, allLocations, allLocations, false);
+ }
+
-+ allLocations.addAll(platformDirs);
-+ allLocations.addAll(internalDirs);
-+ allLocations.addAll(externalDirs);
+ allLocations.addAll(EclipseSystemLayout.getUserDefinedBundleLocations());
+
+ for (String loc : allLocations) {
@@ -689,5 +592,5 @@ index 255df24..2e4e113 100644
addEntireP2RepositoryToTargetPlatform(repository, tpConfiguration);
}
--
-1.8.3.1
+1.9.3
diff --git a/tycho.spec b/tycho.spec
index 4c48157..9f062e5 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -22,15 +22,15 @@
%define __requires_exclude osgi*
Name: tycho
-Version: 0.21.0
-Release: 23%{?dist}
+Version: 0.22.0
+Release: 0.1.gitb1051d%{?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 and EPL
URL: http://eclipse.org/tycho
-Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.21.0.tar.bz2
+Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/org.eclipse.tycho-b1051d48d84b8382fdf5fb31dce7a45220f84965.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
@@ -52,8 +52,6 @@ Source6: fedoraproject-p2-%{fp_p2_sha}.tar.xz
Source7: p2-install.sh
Patch0: %{name}-fix-build.patch
-# Upstream builds against maven-surefire 2.12.3
-Patch1: %{name}-maven-surefire.patch
Patch2: %{name}-fix-surefire.patch
Patch3: %{name}-use-custom-resolver.patch
Patch4: %{name}-maven-delegation.patch
@@ -169,7 +167,7 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-0.21.0
+%setup -q -n org.eclipse.tycho-b1051d48d84b8382fdf5fb31dce7a45220f84965
# Prepare fedoraproject-p2
tar -xf %{SOURCE6}
@@ -177,7 +175,6 @@ tar -xf %{SOURCE6}
%pom_disable_module org.fedoraproject.p2.tests fedoraproject-p2
%patch0 -p1
-%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
@@ -421,6 +418,9 @@ ln -s %{_javadir}/%{name}/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/
%{_javadocdir}/%{name}
%changelog
+* Thu Nov 27 2014 Roland Grunberg <rgrunber at redhat.com> - 0.22.0-0.1.gitb1051d
+- Update to 0.22.0 pre-release.
+
* Thu Nov 27 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.21.0-23
- fedoraproject-p2: Obtain SCL roots by parsing Java conf files
- fedoraproject-p2: Add support for installing into SCL root
More information about the scm-commits
mailing list