Non-bootstrap build.

Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
Fedora Eclipse now compiles all JSR14 upstream bundles with a target of 1.5, allowing us to leave in place parts of Tycho code that use those particular libraries with generics.
2012-08-24 15:46:19 -04:00 · 2012-08-24 11:02:52 -04:00 · 2012-08-24 10:58:19 -04:00 · 2012-08-22 11:41:59 -04:00 · 2012-08-22 11:41:53 -04:00 · 2012-08-10 11:42:36 -04:00
12 changed files with 1785 additions and 333 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,7 @@
 /maven-repo.tar.bz2
 /tycho-0.10.0.tar.xz
+maven-repo.tar.xz
+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
--- a/0001-Remove-tycho-testing-harness.patch
+++ b/0001-Remove-tycho-testing-harness.patch
@ -1,192 +0,0 @@
-From 1fc5ec4dcccd0951860f9db6f485fd3c00a4a684 Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Tue, 29 Mar 2011 17:58:43 +0200
-Subject: [PATCH] Remove tycho-testing-harness
-
-It needs maven2 parts to build, but we need depmap for other parts of tycho.
-Thus we disable it for now and this is not a big deal because we are not
-running tests anyway (yet).
---
- maven-osgi-compiler-plugin/pom.xml          |   10 ++++------
- maven-osgi-packaging-plugin/pom.xml         |   10 ++++------
- maven-tycho-plugin/pom.xml                  |    6 ------
- pom.xml                                     |    1 -
- tycho-osgi-components/pom.xml               |   10 ++++------
- tycho-p2/tycho-p2-director-plugin/pom.xml   |    6 ------
- tycho-p2/tycho-p2-publisher-plugin/pom.xml  |    6 ------
- tycho-release/tycho-versions-plugin/pom.xml |    8 +-------
- 8 files changed, 13 insertions(+), 44 deletions(-)
-
-diff --git a/maven-osgi-compiler-plugin/pom.xml b/maven-osgi-compiler-plugin/pom.xml
-index 6e55905..9d0979a 100644
--- a/maven-osgi-compiler-plugin/pom.xml
-+++ b/maven-osgi-compiler-plugin/pom.xml
-@@ -64,18 +64,16 @@
-       <artifactId>tycho-compiler-jdt</artifactId>
-       <version>${project.version}</version>
-     </dependency>
-+    <dependency>
-+      <groupId>org.apache.maven</groupId>
-+      <artifactId>maven-artifact</artifactId>
-+    </dependency>
- 
-     <dependency>
-       <groupId>org.apache.maven.plugin-testing</groupId>
-       <artifactId>maven-plugin-testing-harness</artifactId>
-       <scope>test</scope>
-     </dependency>
-    <dependency>
-      <groupId>org.sonatype.tycho</groupId>
-      <artifactId>tycho-testing-harness</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-   </dependencies>
- 
- </project>
-diff --git a/maven-osgi-packaging-plugin/pom.xml b/maven-osgi-packaging-plugin/pom.xml
-index d7faeac..7fc5e5a 100644
--- a/maven-osgi-packaging-plugin/pom.xml
-+++ b/maven-osgi-packaging-plugin/pom.xml
-@@ -24,12 +24,6 @@
-       <artifactId>tycho-equinox</artifactId>
-       <version>${project.version}</version>
-     </dependency>     
-    <dependency>
-      <groupId>org.sonatype.tycho</groupId>
-      <artifactId>tycho-testing-harness</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
- 
-     <dependency>
-       <groupId>commons-lang</groupId>
-@@ -41,6 +35,10 @@
-     </dependency>
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-+      <artifactId>maven-artifact</artifactId>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.maven</groupId>
-       <artifactId>maven-plugin-api</artifactId>
-     </dependency>
-     <dependency>
-diff --git a/maven-tycho-plugin/pom.xml b/maven-tycho-plugin/pom.xml
-index 5f6c55e..af1ea97 100644
--- a/maven-tycho-plugin/pom.xml
-+++ b/maven-tycho-plugin/pom.xml
-@@ -65,12 +65,6 @@
-       <artifactId>maven-plugin-testing-harness</artifactId>
-       <scope>test</scope>
-     </dependency>
-    <dependency>
-      <groupId>org.sonatype.tycho</groupId>
-      <artifactId>tycho-testing-harness</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-   </dependencies>
- 
- </project>
-diff --git a/pom.xml b/pom.xml
-index 7197d73..14cce0b 100644
--- a/pom.xml
-+++ b/pom.xml
-@@ -509,7 +509,6 @@
-         <module>tycho-equinox</module>
-         <module>tycho-bootstrap-maven-plugin</module>
-         <module>tycho-osgi-components</module>
-        <module>tycho-testing-harness</module>
- 
-       </modules>
-     </profile>
-diff --git a/tycho-osgi-components/pom.xml b/tycho-osgi-components/pom.xml
-index 8967ed4..1bb9d77 100644
--- a/tycho-osgi-components/pom.xml
-+++ b/tycho-osgi-components/pom.xml
-@@ -50,6 +50,10 @@
-     </dependency>
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-+      <artifactId>maven-artifact</artifactId>
-+    </dependency>
-+    <dependency>
-+      <groupId>org.apache.maven</groupId>
-       <artifactId>maven-plugin-api</artifactId>
-     </dependency>
-     <dependency>
-@@ -76,12 +80,6 @@
-     </dependency>
- 
-     <dependency>
-      <groupId>org.sonatype.tycho</groupId>
-      <artifactId>tycho-testing-harness</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-     	<groupId>org.easymock</groupId>
-     	<artifactId>easymock</artifactId>
-     	<version>3.0</version>
-diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml
-index 5340831..85357dc 100644
--- a/tycho-p2/tycho-p2-director-plugin/pom.xml
-+++ b/tycho-p2/tycho-p2-director-plugin/pom.xml
-@@ -41,12 +41,6 @@
-     </dependency>
-     
-     <dependency>
-      <groupId>org.sonatype.tycho</groupId>
-      <artifactId>tycho-testing-harness</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-     	<groupId>org.easymock</groupId>
-     	<artifactId>easymock</artifactId>
-     	<version>3.0</version>
-diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
-index f736ff1..ee2fb63 100644
--- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml
-+++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
-@@ -37,12 +37,6 @@
-       <version>${project.version}</version>
-     </dependency>
-     <dependency>
-      <groupId>org.sonatype.tycho</groupId>
-      <artifactId>tycho-testing-harness</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-       <groupId>org.apache.maven.surefire</groupId>
-       <artifactId>surefire-booter</artifactId>
-     </dependency>
-diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml
-index 24a0275..e9274a8 100644
--- a/tycho-release/tycho-versions-plugin/pom.xml
-+++ b/tycho-release/tycho-versions-plugin/pom.xml
-@@ -28,12 +28,6 @@
-       <version>${project.version}</version>
-     </dependency>
- 
-    <dependency>
-      <groupId>org.sonatype.tycho</groupId>
-      <artifactId>tycho-testing-harness</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
- 
-   </dependencies>
- 
-@@ -46,4 +40,4 @@
-     </plugins>
-   </build>
- 
-</project>
-\ No newline at end of file
-+</project>
-- 
-1.7.4
-
--- a/95
+++ b/95
@ -0,0 +1,95 @@
+#! /bin/sh
+
+where=$1'-sdk'
+repo=$1; shift
+eclipse=$(rpm --eval '%{_eclipse_base}'); shift
+
+datadir=/usr/share/eclipse
+
+mkdir -p $where/plugins $where/features
+pushd $where
+
+      (cd $eclipse;
+	ls -d plugins/* features/* 2>/dev/null) |
+      while read f; do
+         [ ! -e $f ] && ln -s $eclipse/$f $f
+      done
+      (cd $eclipse/dropins; ls -d * 2>/dev/null) |
+      while read f; do
+	  if [ -e $eclipse/dropins/$f/eclipse ]; then
+	      (cd $eclipse/dropins/$f/eclipse;
+				ls -d plugins/* features/* 2>/dev/null) |
+	      while read g; do
+		  [ ! -e $g ] && \
+		    ln -s $eclipse/dropins/$f/eclipse/$g $g
+	      done
+          else
+	      (cd $eclipse/dropins/$f;
+				ls -d plugins/* features/* 2>/dev/null) |
+	      while read g; do
+	          [ ! -e $g ] && \
+		    ln -s $eclipse/dropins/$f/$g $g
+	      done
+          fi
+      done
+      (cd $datadir/dropins; ls -d * 2>/dev/null) |
+      while read f; do
+	  if [ -e $datadir/dropins/$f/eclipse ]; then
+	      (cd $datadir/dropins/$f/eclipse;
+				ls -d plugins/* features/* 2>/dev/null) |
+	      while read g; do
+		  [ ! -e $g ] && \
+		    ln -s $datadir/dropins/$f/eclipse/$g $g
+	      done
+          else
+	      (cd $datadir/dropins/$f;
+				ls -d plugins/* features/* 2>/dev/null) |
+	      while read g; do
+	          [ ! -e $g ] && \
+		    ln -s $datadir/dropins/$f/$g $g
+	      done
+          fi
+      done
+
+for p in $(ls -d $eclipse/dropins/jdt/plugins/*); do
+    plugin=$(basename $p)
+    [ ! -e plugins/$plugin ] && ln -s $eclipse/dropins/jdt/plugins/$plugin plugins/$plugin
+done
+for f in $(ls -d $eclipse/dropins/jdt/features/*); do
+    feature=$(basename $f)
+    [ ! -e features/$feature ] && ln -s $eclipse/dropins/jdt/features/$feature features/$feature
+done
+for p in $(ls -d $eclipse/dropins/sdk/plugins/*); do
+    plugin=$(basename $p)
+    [ ! -e plugins/$plugin ] && ln -s $eclipse/dropins/sdk/plugins/$plugin plugins/$plugin
+done
+for f in $(ls -d $eclipse/dropins/sdk/features/*); do
+    feature=$(basename $f)
+    [ ! -e features/$feature ] && ln -s $eclipse/dropins/sdk/features/$feature features/$feature
+done
+for p in $(ls -d $eclipse/plugins/*); do
+    plugin=$(basename $p)
+    [ ! -e plugins/$plugin ] && ln -s $eclipse/plugins/$plugin plugins/$plugin
+done
+for f in $(ls -d $eclipse/features/*); do
+    feature=$(basename $f)
+    [ ! -e features/$feature ] && ln -s $eclipse/features/$feature features/$feature
+done
+
+for p in $(find /usr/share/java -name "*.jar"); do
+    unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName'
+    if [ $? = 0 ]; then
+        plugin=$(basename $p)
+        [ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin
+    fi
+done
+
+popd
+
+eclipse -nosplash -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
+-metadataRepository file:$repo \
+-artifactRepository file:$repo \
+-source $where \
+-compress -append -publishArtifacts
+
+rm -rf $where
--- a/depmap.xml
+++ b/depmap.xml
@ -2,63 +2,13 @@
 <dependency>
    <maven>
        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-artifact</artifactId>
+        <artifactId>maven-model</artifactId>
        <version>3.0.3</version>
    </maven>
    <jpp>
        <groupId>JPP/maven</groupId>
-        <artifactId>maven-artifact</artifactId>
+        <artifactId>maven-model</artifactId>
        <version>3.0.3</version>
    </jpp>
 </dependency>
-<dependency>
-    <maven>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-api</artifactId>
-        <version>3.0.3</version>
-    </maven>
-    <jpp>
-        <groupId>JPP/maven</groupId>
-        <artifactId>maven-plugin-api</artifactId>
-        <version>3.0.3</version>
-    </jpp>
-</dependency>
-<dependency>
-    <maven>
-        <groupId>org.apache.maven</groupId>
-        <artifactId>maven-core</artifactId>
-        <version>3.0.3</version>
-    </maven>
-    <jpp>
-        <groupId>JPP/maven</groupId>
-        <artifactId>maven-core</artifactId>
-        <version>3.0.3</version>
-    </jpp>
-</dependency>
-<dependency>
-    <maven>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>org.eclipse.jdt.core</artifactId>
-        <version>3.6.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>jdt-core</artifactId>
-        <version>3.6.0</version>
-    </jpp>
-</dependency>
-<dependency>
-    <maven>
-        <groupId>org.sonatype.tycho</groupId>
-        <artifactId>org.eclipse.osgi</artifactId>
-        <version>3.6.0</version>
-    </maven>
-    <jpp>
-        <groupId>JPP</groupId>
-        <artifactId>jdt-osgi</artifactId>
-        <version>3.6.0</version>
-    </jpp>
-</dependency>
-
-
 </dependencies>
--- a/make_bootstrap_repo.sh
+++ b/make_bootstrap_repo.sh
@ -0,0 +1,8 @@
+#!/bin/bash
+rm -rf $(pwd)/.m2
+
+export TYCHO_TARGET_PLATFORM=/usr/lib/eclipse
+
+mvn-local -Dmaven.repo.local=$(pwd)/.m2 -Dmaven.local.debug=true -X -Dmaven.test.skip -Dsite.generation=true clean install 1>log1.txt 2>log2.txt || exit
+
+tar caf maven-repo.tar.xz .m2
--- a/3
+++ b/3
@ -1,2 +1 @@
-feda402d0f9cc1cfd22dc11a7c85dd4c  maven-repo.tar.bz2
-f2ff10d3f25941d2746c030b57a0218b  tycho-0.10.0.tar.xz
+a238f4ebd99940ea798475d760152634  tycho-0.15.x.tar.bz2
--- a/tycho-bootstrap.patch
+++ b/tycho-bootstrap.patch
@ -0,0 +1,814 @@
+diff --git a/pom.xml b/pom.xml
+index 4b59631..ef016a8 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -63,7 +63,7 @@
+ 
+ 	<groupId>org.eclipse.tycho</groupId>
+ 	<artifactId>tycho</artifactId>
+-	<version>0.15.0</version>
+	<version>0.15.0-SNAPSHOT</version>
+ 	<packaging>pom</packaging>
+ 
+ 	<name>Tycho (Incubation)</name>
+diff --git a/sisu-equinox/pom.xml b/sisu-equinox/pom.xml
+index eb03656..357e880 100644
+--- a/sisu-equinox/pom.xml
+++ b/sisu-equinox/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>sisu-equinox</artifactId>
+diff --git a/sisu-equinox/sisu-equinox-api/pom.xml b/sisu-equinox/sisu-equinox-api/pom.xml
+index 1fffedc..149d1be 100644
+--- a/sisu-equinox/sisu-equinox-api/pom.xml
+++ b/sisu-equinox/sisu-equinox-api/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>sisu-equinox</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>sisu-equinox-api</artifactId>
+ 
+diff --git a/sisu-equinox/sisu-equinox-embedder/pom.xml b/sisu-equinox/sisu-equinox-embedder/pom.xml
+index 893ce07..af9b1f4 100644
+--- a/sisu-equinox/sisu-equinox-embedder/pom.xml
+++ b/sisu-equinox/sisu-equinox-embedder/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>sisu-equinox</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>sisu-equinox-embedder</artifactId>
+ 
+diff --git a/sisu-equinox/sisu-equinox-launching/pom.xml b/sisu-equinox/sisu-equinox-launching/pom.xml
+index e67a60b..e1de88e 100644
+--- a/sisu-equinox/sisu-equinox-launching/pom.xml
+++ b/sisu-equinox/sisu-equinox-launching/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>sisu-equinox</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>sisu-equinox-launching</artifactId>
+ 
+diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml
+index f0744dc..b14eeaf 100644
+--- a/target-platform-configuration/pom.xml
+++ b/target-platform-configuration/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<artifactId>tycho</artifactId>
+ 		<groupId>org.eclipse.tycho</groupId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>target-platform-configuration</artifactId>
+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 eb10d9b..77c8286 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
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Core Maven/OSGi Shared Classes Tests (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.core.shared.tests
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Fragment-Host: org.eclipse.tycho.core.shared
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.junit;bundle-version="4.8.2"
+diff --git a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
+index af23db6..163b8ec 100644
+--- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.core.shared.tests</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
+index aa4c8d1..7e8f68b 100644
+--- a/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF
+@@ -1,7 +1,7 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.eclipse.tycho.core.shared
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-Name: Tycho Core Maven/OSGi Shared Classes (Incubation)
+ Bundle-Vendor: %providerName
+ Export-Package: org.eclipse.tycho.artifacts,
+diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
+index f983a4c..52ec0fb 100644
+--- a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.core.shared</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
+index d69a0b4..be608cc 100644
+--- a/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF
+@@ -1,7 +1,7 @@
+ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-SymbolicName: org.eclipse.tycho.embedder.shared
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-Name: Tycho Embedder API Maven/OSGi Shared Classes (Incubation)
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
+index 8f89041..eb94113 100644
+--- a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.embedder.shared</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
+index f600965..def80b7 100644
+--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Noop Equinox password provider (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.noopsecurity;singleton:=true
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Require-Bundle: org.eclipse.equinox.security;bundle-version="1.0.100"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ActivationPolicy: lazy
+diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
+index 2f4c2ee..4108494 100644
+--- a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.noopsecurity</artifactId>
+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 f433bfa..c74d1c9 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Maven/p2 Repository Integration Tests (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository.tests;singleton:=true
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.eclipse.tycho.p2.maven.repository,
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
+index ecf5c9b..62239e2 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.p2.maven.repository.tests</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
+index afbc349..485fdeb 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Maven/p2 Repository Integration (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository;singleton:=true
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-Vendor: %providerName
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ActivationPolicy: lazy
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
+index 2367577..c31b8e8 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.p2.maven.repository</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+index 2bc890b..30bcc06 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho p2 Resolver Bundle Tests (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl.test;singleton:=true
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Fragment-Host: org.eclipse.tycho.p2.resolver.impl
+ Require-Bundle: org.junit4,
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
+index 81b949a..718e67c 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.p2.resolver.impl.test</artifactId>
+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 a1c079e..9d24312 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho p2 Resolver Bundle (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl;singleton:=true
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-Activator: org.eclipse.tycho.p2.impl.Activator
+ Require-Bundle: org.eclipse.core.runtime,
+  org.eclipse.equinox.security;bundle-version="1.0.100",
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
+index 21ea1c7..9a258fd 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.p2.resolver.impl</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
+index 3b91ec6..1c75bda 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF
+@@ -5,7 +5,7 @@ Export-Package:
+  org.eclipse.tycho.p2.resolver.facade,
+  org.eclipse.tycho.p2.target.facade,
+  org.eclipse.tycho.repository.registry.facade
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-Name: Tycho p2 Resolver Maven/OSGi Shared Classes (Incubation)
+ Bundle-ManifestVersion: 2
+ Bundle-Description: Tycho integrates Maven with Eclipse and OSGi
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
+index 1478f60..d2bd99b 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
+index 0740c9e..7ac922c 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF
+@@ -1,5 +1,5 @@
+ Manifest-Version: 1.0
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-Name: Tycho p2 Tools Bundle (Incubation)
+ Bundle-ManifestVersion: 2
+ Bundle-Description: Implementation of tools for generating, copying, and using p2 repositories in Tycho
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
+index 5676655..f204689 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.p2.tools.impl</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
+index ca4e6ec..e61bdd9 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF
+@@ -1,5 +1,5 @@
+ Manifest-Version: 1.0
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-Name: Tycho p2 Tools Maven/OSGi Shared Classes (Incubation)
+ Bundle-ManifestVersion: 2
+ Bundle-Description: Exposes tools for manipulating p2 data, which are implemented in OSGi bundles, to Maven plug-ins
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
+index 03d61de..2d93d50 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.p2.tools.shared</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
+index 92bfb4e..bfdd302 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho p2 Tools Tests (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.p2.tools.tests
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Fragment-Host: org.eclipse.tycho.p2.tools.impl
+ Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
+index c19b17b..00494f2 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.p2.tools.tests</artifactId>
+diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
+index 54bd5be..05aa0f3 100644
+--- a/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Test Utilities (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.test.utils
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
+  org.eclipse.equinox.p2.core;bundle-version="1.0.100",
+diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml b/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
+index 8156ac6..b998e07 100644
+--- a/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
+++ b/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.test.utils</artifactId>
+diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml
+index 6fe0452..d0ec87f 100644
+--- a/tycho-bundles/pom.xml
+++ b/tycho-bundles/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-bundles</artifactId>
+diff --git a/tycho-bundles/tycho-bundles-external/pom.xml b/tycho-bundles/tycho-bundles-external/pom.xml
+index 427990d..00f586d 100644
+--- a/tycho-bundles/tycho-bundles-external/pom.xml
+++ b/tycho-bundles/tycho-bundles-external/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-bundles-external</artifactId>
+diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+index edd79f4..c327a59 100644
+--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <?pde version="3.5"?>
+ 
+-<product uid="tycho-bundles-external" name="org.eclipse.tycho.p2" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.15.0" useFeatures="false" includeLaunchers="false">
+<product uid="tycho-bundles-external" name="org.eclipse.tycho.p2" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.15.0.qualifier" useFeatures="false" includeLaunchers="false">
+ 
+    <configIni use="default">
+    </configIni>
+diff --git a/tycho-bundles/tycho-bundles-target/pom.xml b/tycho-bundles/tycho-bundles-target/pom.xml
+index dad3156..7b811ed 100644
+--- a/tycho-bundles/tycho-bundles-target/pom.xml
+++ b/tycho-bundles/tycho-bundles-target/pom.xml
+@@ -5,7 +5,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-bundles</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 		<relativePath>..</relativePath>
+ 	</parent>
+ 
+diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
+index 6a1102b..31bf702 100644
+--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>tycho-compiler-jdt</artifactId>
+ 
+diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml
+index 0f3a90f..a90c88a 100644
+--- a/tycho-compiler-plugin/pom.xml
+++ b/tycho-compiler-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-compiler-plugin</artifactId>
+diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
+index f72348a..51731fe 100644
+--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>tycho-core</artifactId>
+ 
+diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml
+index 5d5ce09..c9f88f1 100644
+--- a/tycho-embedder-api/pom.xml
+++ b/tycho-embedder-api/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>tycho-embedder-api</artifactId>
+ 
+diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml
+index bd177bb..c958570 100644
+--- a/tycho-its/pom.xml
+++ b/tycho-its/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>tycho-its</artifactId>
+ 
+diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml
+index 4fc5fdd..20cc720 100644
+--- a/tycho-maven-plugin/pom.xml
+++ b/tycho-maven-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-maven-plugin</artifactId>
+diff --git a/tycho-metadata-model/pom.xml b/tycho-metadata-model/pom.xml
+index 6365d77..5c2affd 100644
+--- a/tycho-metadata-model/pom.xml
+++ b/tycho-metadata-model/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>tycho-metadata-model</artifactId>
+ 
+diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml
+index 9c67a98..d58cfea 100644
+--- a/tycho-p2/pom.xml
+++ b/tycho-p2/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<artifactId>tycho</artifactId>
+ 		<groupId>org.eclipse.tycho</groupId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-p2</artifactId>
+diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml
+index 55dd6e9..3253d06 100644
+--- a/tycho-p2/tycho-p2-director-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-director-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-p2</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-p2-director-plugin</artifactId>
+diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml
+index 4660cf5..a901d81 100644
+--- a/tycho-p2/tycho-p2-facade/pom.xml
+++ b/tycho-p2/tycho-p2-facade/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-p2</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>tycho-p2-facade</artifactId>
+ 
+diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml
+index 8a33009..eaf643d 100644
+--- a/tycho-p2/tycho-p2-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-p2</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-p2-plugin</artifactId>
+diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+index 94a3095..379fe81 100644
+--- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-p2</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-p2-publisher-plugin</artifactId>
+diff --git a/tycho-p2/tycho-p2-repository-plugin/pom.xml b/tycho-p2/tycho-p2-repository-plugin/pom.xml
+index 8d7c080..193d31e 100644
+--- a/tycho-p2/tycho-p2-repository-plugin/pom.xml
+++ b/tycho-p2/tycho-p2-repository-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-p2</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-p2-repository-plugin</artifactId>
+diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml
+index 026c595..36087a0 100644
+--- a/tycho-packaging-plugin/pom.xml
+++ b/tycho-packaging-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-packaging-plugin</artifactId>
+diff --git a/tycho-pomgenerator-plugin/pom.xml b/tycho-pomgenerator-plugin/pom.xml
+index d9a76bf..589a06b 100644
+--- a/tycho-pomgenerator-plugin/pom.xml
+++ b/tycho-pomgenerator-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-pomgenerator-plugin</artifactId>
+diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml
+index 105ea56..b7827e3 100644
+--- a/tycho-release/pom.xml
+++ b/tycho-release/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-release</artifactId>
+diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml
+index 335271a..e72fc5e 100644
+--- a/tycho-release/tycho-versions-plugin/pom.xml
+++ b/tycho-release/tycho-versions-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-release</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-versions-plugin</artifactId>
+diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml
+index f9a4915..a5b6e86 100644
+--- a/tycho-source-plugin/pom.xml
+++ b/tycho-source-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-source-plugin</artifactId>
+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 f9f6cd2..dc82e3c 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Surefire OSGi JUnit3 Runner (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.surefire.junit;singleton:=true
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+  JavaSE-1.6
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+index f5699bc..c77dd03 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-surefire</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.surefire.junit</artifactId>
+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 de38fb3..14f0f30 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Surefire OSGi JUnit4 Runner (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.surefire.junit4;singleton:=true
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5,
+  JavaSE-1.6
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+index d5f35cb..beda338 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-surefire</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.surefire.junit4</artifactId>
+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 9fa7626..326708c 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
+@@ -8,6 +8,6 @@ Bundle-ClassPath: .,
+  jars/surefire-api-2.10.jar,
+  jars/plexus-utils-3.0.jar
+-Bundle-Version: 0.15.0
+Bundle-Version: 0.15.0.qualifier
+ 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 275c95e..5b9bf35 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-surefire</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>org.eclipse.tycho.surefire.osgibooter</artifactId>
+diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
+index 663463d..e998884 100644
+--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-surefire</artifactId>
+diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
+index 8f6c9ca..2c58841 100644
+--- a/tycho-surefire/tycho-surefire-plugin/pom.xml
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<groupId>org.eclipse.tycho</groupId>
+ 		<artifactId>tycho-surefire</artifactId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 
+ 	<artifactId>tycho-surefire-plugin</artifactId>
+diff --git a/tycho-testing-harness/pom.xml b/tycho-testing-harness/pom.xml
+index d0c1393..f0175f1 100644
+--- a/tycho-testing-harness/pom.xml
+++ b/tycho-testing-harness/pom.xml
+@@ -17,7 +17,7 @@
+ 	<parent>
+ 		<artifactId>tycho</artifactId>
+ 		<groupId>org.eclipse.tycho</groupId>
+-		<version>0.15.0</version>
+		<version>0.15.0-SNAPSHOT</version>
+ 	</parent>
+ 	<artifactId>tycho-testing-harness</artifactId>
+ 
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@ -0,0 +1,81 @@
+From 048c43afbf54608f7f3bfccaff6b85ca72ea1348 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/3] Fix the Tycho build to work on Fedora.
+
+Minor fixes of limited scope needed to have Tycho building on Fedora.
+
+Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
+---
+ pom.xml                                                           | 5 -----
+ tycho-bundles/tycho-bundles-target/tycho.target                   | 2 --
+ tycho-compiler-jdt/pom.xml                                        | 4 ----
+ .../java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java    | 8 ++++++++
+ 4 files changed, 8 insertions(+), 11 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 69e68c6..7cfb0cf 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -221,11 +221,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
+ 				<version>${jdtVersion}</version>
+ 			</dependency>
+ 			<dependency>
+-				<groupId>org.eclipse.tycho</groupId>
+-				<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+-				<version>${jdtAptVersion}</version>
+-			</dependency>			                        
+-			<dependency>
+ 				<groupId>org.apache.maven.surefire</groupId>
+ 				<artifactId>surefire-booter</artifactId>
+ 				<version>2.10</version>
+diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
+index 1cd9a7b..48eb53a 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">
+ <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/"/>
+ </location>
+ </locations>
+diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
+index 9f7bdd7..6a1102b 100644
+--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
+@@ -38,10 +38,6 @@
+ 			<artifactId>org.eclipse.jdt.core</artifactId>
+ 		</dependency>
+ 		<dependency>
+-			<groupId>org.eclipse.tycho</groupId>
+-			<artifactId>org.eclipse.jdt.compiler.apt</artifactId>
+-		</dependency>
+-		<dependency>
+ 			<groupId>org.codehaus.plexus</groupId>
+ 			<artifactId>plexus-compiler-api</artifactId>
+ 		</dependency>
+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
+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
+@@ -37,6 +37,14 @@ public class EmptyLifecycleExecutor implements LifecycleExecutor {
+         return null;
+     }
+ 
+    public MavenExecutionPlan calculateExecutionPlan(MavenSession session, boolean bool, String... tasks)
+            throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
+            MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
+            PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
+            PluginVersionResolutionException {
+        return null;
+    }
+
+     public MavenExecutionPlan calculateExecutionPlan(MavenSession session, String... tasks)
+             throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
+             MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
+-- 
+1.7.11.4
+
--- a/tycho-fix-surefire.patch
+++ b/tycho-fix-surefire.patch
@ -0,0 +1,160 @@
+From 35f7704c0086224e2f307f6e8d0469911d120136 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.
+
+When running an Eclipse bundle's tests, Tycho Surefire resolves its
+runtime dependencies using a class loader, which is in fact just looking
+through Bundle-ClassPath. As a result, it must copy over and include
+system jars in its Bundle-ClassPath. We use Fedora system jars to
+satisfy these dependencies but even these jars differ slightly in terms
+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.
+---
+ 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(-)
+
+diff --git a/pom.xml b/pom.xml
+index 69e68c6..42ffc40 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -79,7 +79,7 @@
+ 		<junitVersion>3.8.2</junitVersion>
+ 		<plexusVersion>1.5.5</plexusVersion>
+ 		<plexusInterpolationVersion>1.14</plexusInterpolationVersion>
+-		<plexusUtilsVersion>2.0.4</plexusUtilsVersion>
+		<plexusUtilsVersion>3.0</plexusUtilsVersion>
+ 		<sisuInjectVersion>1.4.2</sisuInjectVersion>
+ 		<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
+--- 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
+ 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.10.jar
+Require-Bundle: org.junit;bundle-version="[3.8.0,4.9.0)"
+Bundle-ClassPath: jars/surefire-junit3-2.10.jar,
+ jars/common-junit3-2.10.jar
+ Bundle-Vendor: %providerName
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties b/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties
+index 499ce76..fe88b19 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties
+@@ -9,5 +9,5 @@
+ #    Sonatype Inc. - initial API and implementation
+ ###############################################################################
+ bin.includes = META-INF/,\
+-               jars/surefire-junit3-2.10.jar,\
+               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
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+@@ -47,6 +47,11 @@
+ 									<artifactId>surefire-junit3</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.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+index fdf4e6a..de38fb3 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
+ 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.10.jar
+Bundle-ClassPath: jars/surefire-junit4-2.10.jar,
+ jars/common-junit3-2.10.jar,
+ jars/common-junit4-2.10.jar
+ Import-Package: junit.framework;version="4.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/build.properties b/tycho-surefire/org.eclipse.tycho.surefire.junit4/build.properties
+index b787149..fe88b19 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/build.properties
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/build.properties
+@@ -9,5 +9,5 @@
+ #    Sonatype Inc. - initial API and implementation
+ ###############################################################################
+ bin.includes = META-INF/,\
+-               jars/surefire-junit4-2.10.jar,\
+               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
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+@@ -71,6 +71,16 @@
+ 									<artifactId>surefire-junit4</artifactId>
+ 									<version>${surefire-version}</version>
+ 								</artifactItem>
+								<artifactItem>
+									<groupId>org.apache.maven.surefire</groupId>
+									<artifactId>common-junit3</artifactId>
+									<version>${surefire-version}</version>
+								</artifactItem>
+								<artifactItem>
+									<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.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+index 06c99c9..c2c4c8c 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",
+ Eclipse-AutoStart: true
+ Bundle-ClassPath: .,
+  jars/surefire-booter-2.10.jar,
+- jars/surefire-api-2.10.jar
+ jars/surefire-api-2.10.jar,
+ jars/plexus-utils-3.0.jar
+ Bundle-Version: 0.15.0
+ Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
+ Bundle-ManifestVersion: 2
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+index 4b65c4a..7a13f1d 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 @@
+ 									<artifactId>surefire-booter</artifactId>
+ 									<version>${surefire-version}</version>
+ 								</artifactItem>
+								<artifactItem>
+									<groupId>org.codehaus.plexus</groupId>
+									<artifactId>plexus-utils</artifactId>
+									<version>${plexusUtilsVersion}</version>
+								</artifactItem>
+ 							</artifactItems>
+ 						</configuration>
+ 					</execution>
+-- 
+1.7.7.6
+
--- a/tycho-fix-swt.patch
+++ b/tycho-fix-swt.patch
@ -0,0 +1,129 @@
+From 198ef97930794f59230035f350f286255ea63c61 Mon Sep 17 00:00:00 2001
+From: Igor Fedorenko <igor@ifedorenko.com>
+Date: Wed, 30 May 2012 10:01:36 -0400
+Subject: [PATCH] 380934 do not 'fixSWT' for swt fragment projects
+
+Change-Id: I2990ff68acfe14e104480ba85ce30c2138d74e45
+Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
+---
+ .../swt/org.eclipse.swt/META-INF/MANIFEST.MF       |    4 ++
+ .../resolver/swt/swtFragment/META-INF/MANIFEST.MF  |    6 ++
+ .../tycho/p2/impl/resolver/P2ResolverTest.java     |   54 ++++++++++++++++++++
+ .../impl/resolver/ProjectorResolutionStrategy.java |   12 ++++
+ 4 files changed, 76 insertions(+), 0 deletions(-)
+ create mode 100644 tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/resources/resolver/swt/org.eclipse.swt/META-INF/MANIFEST.MF
+ create mode 100644 tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/resources/resolver/swt/swtFragment/META-INF/MANIFEST.MF
+
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/resources/resolver/swt/org.eclipse.swt/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/resources/resolver/swt/org.eclipse.swt/META-INF/MANIFEST.MF
+new file mode 100644
+index 0000000..b2eda0d
+--- /dev/null
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/resources/resolver/swt/org.eclipse.swt/META-INF/MANIFEST.MF
+@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.eclipse.swt
+Bundle-Version: 3.0.0.qualifier
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/resources/resolver/swt/swtFragment/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/resources/resolver/swt/swtFragment/META-INF/MANIFEST.MF
+new file mode 100644
+index 0000000..380c312
+--- /dev/null
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/resources/resolver/swt/swtFragment/META-INF/MANIFEST.MF
+@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.eclipse.tycho.p2.impl.resolver.test.swtFragment
+Bundle-SymbolicName: org.eclipse.tycho.p2.impl.resolver.swtFragment
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.swt; bundle-version="[3.0.0,4.0.0)"
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/impl/resolver/P2ResolverTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/impl/resolver/P2ResolverTest.java
+index 7d5ea2d..cc7baf4 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/impl/resolver/P2ResolverTest.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/impl/resolver/P2ResolverTest.java
+@@ -222,6 +222,60 @@ public class P2ResolverTest extends P2ResolverTestBase {
+         assertContainsUnit("org.eclipse.swt.gtk.linux.x86_64", result.getNonReactorUnits());
+     }
+ 
+    @Test
+    public void swt() throws Exception {
+        File swt = resourceFile("resolver/swt/org.eclipse.swt");
+        addReactorProject(swt, TYPE_ECLIPSE_PLUGIN, "org.eclipse.swt");
+        File swtFragment = resourceFile("resolver/swt/swtFragment");
+        addReactorProject(swtFragment, TYPE_ECLIPSE_PLUGIN, "org.eclipse.tycho.p2.impl.resolver.test.swtFragment");
+
+        List<P2ResolutionResult> results = impl.resolveProject(context.buildTargetPlatform(), swt);
+
+        Assert.assertEquals(1, results.size());
+        P2ResolutionResult result = results.get(0);
+
+        Assert.assertEquals(1, result.getArtifacts().size());
+        assertContainLocation(result, swt);
+    }
+
+    @Test
+    public void swtFragment() throws Exception {
+        File swt = resourceFile("resolver/swt/org.eclipse.swt");
+        addReactorProject(swt, TYPE_ECLIPSE_PLUGIN, "org.eclipse.swt");
+        File swtFragment = resourceFile("resolver/swt/swtFragment");
+        addReactorProject(swtFragment, TYPE_ECLIPSE_PLUGIN, "org.eclipse.tycho.p2.impl.resolver.test.swtFragment");
+
+        List<P2ResolutionResult> results = impl.resolveProject(context.buildTargetPlatform(), swtFragment);
+
+        Assert.assertEquals(1, results.size());
+        P2ResolutionResult result = results.get(0);
+
+        Assert.assertEquals(2, result.getArtifacts().size());
+        Assert.assertEquals(0, result.getNonReactorUnits().size());
+
+        assertContainLocation(result, swtFragment);
+        assertContainLocation(result, swt);
+    }
+
+    @Test
+    public void swtFragmentWithRemoteSWT() throws Exception {
+        context.addP2Repository(resourceFile("repositories/e361").toURI());
+
+        File swtFragment = resourceFile("resolver/swt/swtFragment");
+        addReactorProject(swtFragment, TYPE_ECLIPSE_PLUGIN, "org.eclipse.tycho.p2.impl.resolver.test.swtFragment");
+
+        List<P2ResolutionResult> results = impl.resolveProject(context.buildTargetPlatform(), swtFragment);
+
+        Assert.assertEquals(1, results.size());
+        P2ResolutionResult result = results.get(0);
+
+        Assert.assertEquals(2, result.getArtifacts().size());
+        Assert.assertEquals(1, result.getNonReactorUnits().size());
+
+        assertContainLocation(result, swtFragment);
+        assertContainsUnit("org.eclipse.swt", result.getNonReactorUnits());
+    }
+
+     private static void assertContainsUnit(String unitID, Set<?> units) {
+         Assert.assertFalse("Unit " + unitID + " not found", getInstallableUnits(unitID, units).isEmpty());
+     }
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/impl/resolver/ProjectorResolutionStrategy.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/impl/resolver/ProjectorResolutionStrategy.java
+index 3d0f3db..c5bf797 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/impl/resolver/ProjectorResolutionStrategy.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/impl/resolver/ProjectorResolutionStrategy.java
+@@ -110,6 +110,18 @@ public class ProjectorResolutionStrategy extends AbstractSlicerResolutionStrateg
+             return;
+         }
+ 
+        // 380934 one of rootIUs can be SWT or an SWT fragment
+        for (IInstallableUnit iu : rootIUs) {
+            if ("org.eclipse.swt".equals(iu.getId())) {
+                return;
+            }
+            for (IProvidedCapability provided : iu.getProvidedCapabilities()) {
+                if ("osgi.fragment".equals(provided.getNamespace()) && "org.eclipse.swt".equals(provided.getName())) {
+                    return;
+                }
+            }
+        }
+
+         IInstallableUnit swtFragment = null;
+ 
+         all_ius: for (Iterator<IInstallableUnit> iter = availableIUs.query(QueryUtil.ALL_UNITS, monitor).iterator(); iter
+-- 
+1.7.7.6
+
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@ -0,0 +1,335 @@
+From 9dea234b988c593f22f9c6c77a453b2fa155c157 Mon Sep 17 00:00:00 2001
+From: Roland Grunberg <rgrunber@redhat.com>
+Date: Tue, 12 Jun 2012 10:38:51 -0400
+Subject: [PATCH 3/3] Implement a custom resolver for Tycho in local mode.
+
+When running in local mode, dependencies should be resolved by looking
+on the local system. Remote repositories should be ignored unless
+offline mode is disabled.
+
+Automatically create a local p2 repository of all bundles on the system
+so that they may be used for local dependency resolution. This is done
+using a modified version of Eclipse's copy-platform script.
+
+Since Fedora 17, we need an Execution Environment of at least JavaSE-1.6
+for Eclipse bundles. Eclipse Juno platform bundles depend on
+javax.annotation. In Fedora this is provided by geronimo-annotation, but
+has a dependency on javax.lang.model (since 1.6).
+
+Use the defined target environments in local mode when the property
+tycho.local.keepTarget is set.
+
+Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
+---
+ .../tycho/p2/target/TargetDefinitionResolver.java  |  8 +++-
+ .../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++--
+ .../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++
+ .../tycho/core/osgitools/AbstractTychoProject.java | 12 ++++-
+ .../tycho/core/osgitools/OsgiBundleProject.java    | 38 ++++++++++++++-
+ .../DefaultTargetPlatformConfigurationReader.java  |  5 +-
+ .../tycho/osgi/runtime/TychoP2RuntimeLocator.java  | 17 +++++++
+ .../p2/resolver/P2TargetPlatformResolver.java      | 10 ++++
+ 8 files changed, 151 insertions(+), 10 deletions(-)
+
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
+index 6a85c49..d9d6055 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;
+ 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;
+@@ -100,8 +101,11 @@ public class TargetDefinitionResolver {
+ 
+                 List<IMetadataRepository> metadataRepositories = new ArrayList<IMetadataRepository>();
+                 for (Repository repository : iuLocationDefinition.getRepositories()) {
+-                    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())) {
+                        artifactRepositories.add(repository.getLocation());
+                        metadataRepositories.add(loadRepository(repository));
+                    }
+                 }
+ 
+                 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..d5395dd 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
+@@ -41,6 +41,9 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent;
+ import org.eclipse.equinox.p2.core.ProvisionException;
+ import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+ import org.eclipse.equinox.p2.metadata.VersionedId;
+import org.eclipse.equinox.p2.metadata.expression.ExpressionUtil;
+import org.eclipse.equinox.p2.metadata.expression.IExpression;
+import org.eclipse.equinox.p2.query.IQuery;
+ import org.eclipse.equinox.p2.query.IQueryResult;
+ import org.eclipse.equinox.p2.query.QueryUtil;
+ import org.eclipse.equinox.p2.repository.IRepository;
+@@ -225,6 +228,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)) {
+            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());
+@@ -405,12 +414,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
+             result.addAll(contentPart.getUnits());
+         }
+ 
+-        SubMonitor sub = SubMonitor.convert(monitor, metadataRepositories.size() * 200);
+-        for (IMetadataRepository repository : metadataRepositories) {
+-            IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
+-            result.addAll(matches.toUnmodifiableSet());
+        if (System.getProperty("maven.local.mode") != null && !offline) {
+            final String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo";
+            final IExpression notmatchIU_ID = ExpressionUtil.parse("id != $0");
+            IMetadataRepository systemLocalP2Repo = null;
+
+            // Sanity check even though the repo we want should be at index 1
+            for (IMetadataRepository repository : metadataRepositories) {
+                if (repository.getLocation().toString().equals(uri)) {
+                    systemLocalP2Repo = repository;
+                    break;
+                }
+            }
+
+            IQuery<IInstallableUnit> noLocalIUs = QueryUtil.createIUAnyQuery();
+
+            // Create a conjunction query that negates all IUs on the local system
+            for (IInstallableUnit unit : systemLocalP2Repo.query(QueryUtil.ALL_UNITS, null).toUnmodifiableSet()) {
+                noLocalIUs = QueryUtil.createCompoundQuery(noLocalIUs, QueryUtil.createMatchQuery(notmatchIU_ID, unit.getId()), true);
+            }
+
+            SubMonitor sub = SubMonitor.convert(monitor, metadataRepositories.size() * 200);
+            for (IMetadataRepository repository : metadataRepositories) {
+                IQueryResult<IInstallableUnit> matches;
+                if (repository.getLocation().toString().equals(uri)) {
+                    matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
+                } else {
+                    // Don't collect any remote IUs that can be found on the system
+                    // This will favour IUs in the system local p2 repository
+                    matches = repository.query(noLocalIUs, sub.newChild(100));
+                }
+                result.addAll(matches.toUnmodifiableSet());
+            }
+            sub.done();
+        } else {
+            SubMonitor sub = SubMonitor.convert(monitor, metadataRepositories.size() * 200);
+            for (IMetadataRepository repository : metadataRepositories) {
+                IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
+                matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
+                result.addAll(matches.toUnmodifiableSet());
+            }
+            sub.done();
+         }
+-        sub.done();
+ 
+         if (logger.isDebugEnabled()) {
+             IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
+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
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+@@ -11,6 +11,7 @@
+ package org.eclipse.tycho.core.maven;
+ 
+ import java.io.File;
+import java.io.IOException;
+ import java.util.HashSet;
+ import java.util.List;
+ import java.util.Set;
+@@ -55,6 +56,21 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+         registerExecutionListener(session);
+         configureComponents(session);
+ 
+        // Create a system p2 repository for local dependency resolution
+        if (System.getProperty("maven.local.mode") != null) {
+            try {
+                String[] cmd = new String[] { "/usr/share/java/tycho/copy-platform-all",
+                        System.getProperty("user.dir") + "/.m2/p2/repo" };
+                System.out.println("Building system local p2 repository...");
+                Process p = Runtime.getRuntime().exec(cmd);
+                p.waitFor();
+            } catch (IOException e) {
+                // Continue
+            } catch (InterruptedException e) {
+                // Continue
+            }
+        }
+
+         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 3fc622a..03a710b 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
+@@ -98,7 +98,17 @@ public abstract class AbstractTychoProject extends AbstractLogEnabled implements
+             }
+ 
+             try {
+-                return ExecutionEnvironmentUtils.getExecutionEnvironment(profile);
+                ExecutionEnvironment ee = ExecutionEnvironmentUtils.getExecutionEnvironment(profile);
+
+                if (System.getProperty("maven.local.mode") != null) {
+                    // EE must be at least JavaSE-1.6
+                    final ExecutionEnvironment javaSE16 = ExecutionEnvironmentUtils.getExecutionEnvironment("JavaSE-1.6");
+                    if (ee.compareTo(javaSE16) < 0) {
+                        ee = javaSE16;
+                    }
+                }
+
+                return ee;
+             } catch (UnknownEnvironmentException e) {
+                 // can't happen, ee is validated during configuration parsing
+             }
+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
+--- 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
+         }
+ 
+         ExecutionEnvironment manifestMinimalEE = Collections.min(envs);
+        ExecutionEnvironment tmp;
+
+        if (System.getProperty("maven.local.mode") != 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.compareTo(javaSE16) >= 0) {
+                        manifestMinimalEE = tmp;
+                        break;
+                    }
+                    envs.remove(tmp);
+                }
+
+                if (envs.isEmpty()) {
+                    return javaSE16;
+                }
+            } catch (UnknownEnvironmentException e) {
+                // Continue
+            }
+        }
+ 
+         if (buildMinimalEE == null) {
+             return manifestMinimalEE;
+@@ -515,7 +537,21 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
+ 
+     protected ExecutionEnvironment getExecutionEnvironment(MavenProject project, String profile) {
+         try {
+-            return ExecutionEnvironmentUtils.getExecutionEnvironment(profile);
+            ExecutionEnvironment ee = ExecutionEnvironmentUtils.getExecutionEnvironment(profile);
+
+            if (System.getProperty("maven.local.mode") != null && ee != null) {
+                try {
+                    // EE must be at least JavaSE-1.6
+                    final ExecutionEnvironment javaSE16 = ExecutionEnvironmentUtils.getExecutionEnvironment("JavaSE-1.6");
+                    if (ee.compareTo(javaSE16) < 0) {
+                        ee = javaSE16;
+                    }
+                } catch (UnknownEnvironmentException e) {
+                    // Continue
+                }
+            }
+
+            return ee;
+         } catch (UnknownEnvironmentException e) {
+             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..98add9d 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 {
+                             + configuration.toString());
+                 }
+ 
+-                addTargetEnvironments(result, project, configuration);
+                // Use the defined environments only in local mode with tycho.local.keepTarget
+                if (System.getProperty("maven.local.mode") == null || System.getProperty("tycho.local.keepTarget") != null) {
+                    addTargetEnvironments(result, project, configuration);
+                }
+ 
+                 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
+--- 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;
+ import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+ import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
+ import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.JavadirWorkspaceReader;
+ 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;
+ 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 {
+     }
+ 
+     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();
+            DefaultArtifact newArtifact = new DefaultArtifact(artifact.getGroupId()
+                    + ":" + artifact.getArtifactId()
+                    + ":" + artifact.getType()
+                    + ":" + artifact.getVersion());
+            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());
+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
+--- 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
+         tpBuilder.setProjectLocation(project.getBasedir());
+         tpBuilder.setIncludePackedArtifacts(configuration.isIncludePackedArtifacts());
+ 
+        // Add Fedora Local P2 Repository when running in local mode
+        if (System.getProperty("maven.local.mode") != null) {
+            String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo";
+            try {
+                tpBuilder.addP2Repository(new URI(uri));
+            } catch (URISyntaxException e) {
+                getLogger().warn("Unable to resolve repository URI : " + uri, e);
+            }
+        }
+
+         addThisReactorProjectToTargetPlatform(session, project, configuration, tpBuilder);
+ 
+         addOtherReactorProjectsToTargetPlatform(project, reactorProjects, tpBuilder);
+-- 
+1.7.11.4
+
--- a/tycho.spec
+++ b/tycho.spec
@ -1,35 +1,41 @@
+%global eclipsedir %{_libdir}/eclipse
 %global bootstrap 0

-%global e_osgi org.eclipse.osgi
-%global e_osgi_v 3.6.0.v20100517
-%global e_core org.eclipse.jdt.core
-%global e_core_v 3.6.0.v_A58
+%if %{bootstrap}
+%global snap -SNAPSHOT
+%else
+%global snap %{nil}
+%endif

 Name:           tycho
-Version:        0.10.0
-Release:        4%{?dist}
+Version:        0.15.0
+Release:        6%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven

 Group:          Development/Libraries
 # license file is missing but all files having some licensing information are ASL 2.0
 License:        ASL 2.0
 URL:            http://tycho.sonatype.org/
-# git clone git://github.com/sonatype/sonatype-tycho
-# git archive --prefix="tycho-0.10.0/" --format=tar tycho-0.10.0 | xz > tycho-0.10.0.tar.xz
-Source0:        %{name}-%{version}.tar.xz
+Source0:        http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.15.x.tar.bz2

 # this is a workaround for maven-plugin-plugin changes that happened after
 # version 2.4.3 (impossible to have empty mojo created as aggregate). This
 # should be fixed upstream properly
 Source1:        EmptyMojo.java
-
 # we need to make sure we are using maven 3 deps
 Source2:        depmap.xml
-%if %{bootstrap}
-Source3:        maven-repo.tar.bz2
-%endif
+Source3:        copy-platform-all

-Patch0:         0001-Remove-tycho-testing-harness.patch
+Patch0:	%{name}-fix-build.patch
+Patch1:	%{name}-fix-surefire.patch
+Patch2:	%{name}-use-custom-resolver.patch
+Patch3:	%{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.
+%if %{bootstrap}
+Patch4:	%{name}-bootstrap.patch
+%endif

 BuildArch:      noarch

@ -37,6 +43,7 @@ BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
 BuildRequires:  maven
 BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-dependency-plugin
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-javadoc-plugin
@ -45,21 +52,22 @@ BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-shared-verifier
 BuildRequires:  maven-shared-osgi
 BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit
+BuildRequires:  maven-surefire-provider-junit4
+BuildRequires:  maven-verifier-plugin
 BuildRequires:  plexus-containers-component-metadata
 BuildRequires:  eclipse-jdt
 BuildRequires:  decentxml
-%if ! %{bootstrap}
-BuildRequires:  tycho
-%endif
+BuildRequires:	%{name}

 Requires:       jpackage-utils
 Requires:       decentxml
 Requires:       maven
+Requires:       maven-dependency-plugin
+Requires:       maven-shared-verifier
+Requires:       maven-surefire-provider-junit4
 Requires:       eclipse-jdt

-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
-

 %description
 Tycho is a set of Maven plugins and extensions for building Eclipse
@ -97,112 +105,172 @@ Requires:       jpackage-utils
 This package contains the API documentation for %{name}.

 %prep
-%setup -q
-%patch0 -p1 -b .harness
+%setup -q -n %{name}-0.15.x

+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%if %{bootstrap}
+%patch4 -p1
+%endif
+
+find tycho-core -iname '*html' -delete

 # place empty mojo in place
 mkdir -p tycho-maven-plugin/src/main/java/org/fedoraproject
 pushd tycho-maven-plugin/src/main/java/org/fedoraproject
 cp %{SOURCE1} .
 popd
-mkdir -p tycho-bootstrap-maven-plugin/src/main/java/org/fedoraproject
-pushd tycho-bootstrap-maven-plugin/src/main/java/org/fedoraproject
-cp %{SOURCE1} .
-popd
-
-# remove dependency on non-existent jars from deltapack
-sed -i '/equinox.security.\(macosx\|win32\)/d' \
-       tycho-p2/tycho-p2-runtime/tycho-p2-runtime.product
-
-
-%if %{bootstrap}
-tar xf %{SOURCE3}
-%endif
-
-# prepare directories for eclipse symlinks
-mkdir -p .m2/org/sonatype/tycho
-mkdir -p .m2/org/sonatype/tycho/%{e_osgi}/%{e_osgi_v}/
-mkdir -p .m2/org/sonatype/tycho/%{e_core}/%{e_core_v}/
-
-# maven resolver doesn't know how to resolve from directories other than _javadir
-pushd .m2/org/sonatype/tycho
-ln -sf %{_libdir}/eclipse/plugins/org.eclipse.osgi_*.jar \
-       %{e_osgi}/%{e_osgi_v}/%{e_osgi}-%{e_osgi_v}.jar
-ln -sf %{_libdir}/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \
-       %{e_core}/%{e_core_v}/%{e_core}-%{e_core_v}.jar
-popd

 %build
-export TYCHO_TARGET_PLATFORM=%{_libdir}/eclipse
-
-# not needed when bootstrap is 0, but we build it anyway
-mvn-rpmbuild -Dmaven.test.skip=true \
-          -Dmaven.local.depmap.file=%{SOURCE2} \
-          -Pbootstrap-1 \
-          -Dtycho.targetPlatform=$TYCHO_TARGET_PLATFORM install
-
-mvn-rpmbuild -Dmaven.test.skip=true \
-          -Dmaven.local.depmap.file=%{SOURCE2} \
-          -Pbootstrap-2 \
-          -Dtycho.targetPlatform=$TYCHO_TARGET_PLATFORM install javadoc:aggregate
+export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
+mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} install javadoc:aggregate

 %install

 mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-for mod in maven-osgi-{compiler,packaging,source}-plugin maven-tycho-plugin \
-           target-platform-configuration tycho-bootstrap-maven-plugin  \
-           tycho-compiler-jdt tycho-equinox tycho-maven-plugin \
-           tycho-osgi-components tycho-release/tycho-{enforcer-rules,versions-plugin} \
-           tycho-p2/org.sonatype.tycho.{noopsecurity,p2{,.impl,.maven.repository,.publisher}}\
-           tycho-p2/tycho-p2-{director-plugin,facade,plugin,publisher-plugin,runtime} \
-           tycho-surefire/{maven-osgi-test-plugin,org.sonatype.tycho.surefire.{junit,junit4,osgibooter}};do
+
+# pom and jar installation
+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-bundles/org*  \
+           tycho-surefire/{tycho-surefire-plugin,org.eclipse.tycho.surefire.{osgibooter,junit,junit4}}; do
   echo $mod
   aid=`basename $mod`
-   suff=".jar"
-   if [ "$aid" == "tycho-p2-runtime" ];then
-      suff=".zip"
-   fi
   install -pm 644 $mod/pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
-   install -m 644 $mod/target/$aid-%{version}$suff %{buildroot}%{_javadir}/%{name}/$aid$suff
-   %add_to_maven_depmap org.sonatype.tycho $aid %{version} JPP/%{name} $aid
+   install -m 644 $mod/target/$aid-%{version}%{snap}.jar %{buildroot}%{_javadir}/%{name}/$aid.jar
+   %add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
 done

-for pommod in tycho-p2 tycho-surefire;do
-   install -pm 644 $pommod/pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$pommod.pom
-   %add_to_maven_depmap org.sonatype.tycho $pommod %{version} JPP/%{name} $pommod
+# pom installation
+for pommod in tycho-p2 tycho-bundles tycho-surefire \
+              tycho-release sisu-equinox; do
+   aid=`basename $pommod`
+   install -pm 644 $pommod/pom.xml \
+               $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
+   %add_maven_depmap JPP.%{name}-$aid.pom -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
 done

+# p2 runtime
+pushd tycho-bundles/tycho-bundles-external
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-bundles-external.pom
+install -m 644 target/tycho-bundles-external-%{version}*.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-bundles-external.zip
+%add_maven_depmap JPP.%{name}-tycho-bundles-external.pom %{name}/tycho-bundles-external.zip -a "org.eclipse.tycho:tycho-bundles-external,org.sonatype.tycho:tycho-bundles-external"
+popd
+
+# main
 install -pm 644 pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-main.pom
-%add_to_maven_depmap org.sonatype.tycho %{name} %{version} JPP/%{name} main
+%add_maven_depmap JPP.%{name}-main.pom -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"

 # javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}

-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all

 %files
-%defattr(-,root,root,-)
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/%{name}
 %{_javadir}/%{name}/
 %doc README.md

 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}

 %changelog
+* Fri Aug 24 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-6
+- Non-bootstrap build.
+
+* Fri Aug 24 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-5.1
+- Set BREE to at least JavaSE-1.6 for all eclipse packaging types.
+- Remove unneeded workaround for JSR14 incompatibility of JDK 1.7.
+
+* Wed Aug 22 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-4.1
+- Fix local mode resolution bug.
+- Update spec file to honour new java packaging guidelines.
+
+* Thu Aug 9 2012 Roland Grunberg <rgrunber@redhat.com> 0.16.0-4
+- Non-bootstrap build.
+
+* Thu Aug 9 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-3.1
+- Add tycho.local.keepTarget flag to bypass ignoring environments.
+
+* Tue Jul 31 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-3
+- Non-bootstrap build.
+
+* Tue Jul 31 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-2.1
+- Ignore defined environments in local mode.
+
+* Mon Jul 30 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-2
+- Non-bootstrap build.
+
+* Mon Jul 30 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-1.1
+- Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
+
+* Thu Jul 26 2012 Roland Grunberg <rgrunber@redhat.com> 0.15.0-1
+- Update to 0.15.0.
+- Set BREE to at least JavaSE-1.6 for Eclipse feature bundles.
+
+* Wed Jul 25 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-7
+- Non-bootstrap build.
+
+* Mon Jul 23 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-6
+- Detect OSGi jars using presence of Bundle-SymbolicName entry (BZ #838513).
+
+* Mon Jun 11 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-5
+- Non-bootstrap build.
+
+* Tue May 29 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-4.1
+- Fix Tycho Surfire to run Eclipse test bundles.
+- Implement automatic creation of a system p2 repository.
+- Allow building SWT fragments (BZ #380934).
+
+* Wed May 23 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-4
+- Non-bootstrap build.
+
+* Thu May 17 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-3.1
+- Set BREE to be at least JavaSE-1.6 for Eclipse OSGi bundles.
+
+* Wed May 16 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-3
+- Non-bootstrap build.
+
+* Wed Apr 25 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-2.1
+- Implement a custom resolver when running in local mode.
+- Use upstream solution for BZ #372395 to fix the build.
+
+* Wed Apr 4 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-2
+- Non-bootstrap build.
+
+* Tue Mar 27 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-1.1
+- Add missing tycho-testing-harness to be packaged.
+
+* Fri Mar 9 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.1-1
+- Update to 0.14.1 upstream tag.
+- Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.
+
+* Thu Feb 16 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.0-4
+- Non-bootstrap build.
+
+* Tue Feb 14 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.0-3
+- Update to 0.14.0 upstream tag.
+
+* Thu Feb 9 2012 Roland Grunberg <rgrunber@redhat.com> 0.14.0-2
+- Non-bootstrap build.
+
+* Wed Feb 01 2012 Roland Grunberg <rgrunber@redhat.com> - 0.14.0-1
+- Update to 0.14.0.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.10.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

+* Fri May 27 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.12.0-0.1.a74b1717
+- Update to new version do bootstrap from scratch
+
 * Fri May 6 2011 Alexander Kurtakov <akurtako@redhat.com> 0.10.0-3
 - Non-bootstrap build.
Author	SHA1	Message	Date
Roland Grunberg	e6684ba081	Non-bootstrap build.	2012-08-24 15:46:19 -04:00
Roland Grunberg	fbb0a38308	Remove unneeded workaround for JSR14 incompatibility of JDK 1.7. Fedora Eclipse now compiles all JSR14 upstream bundles with a target of 1.5, allowing us to leave in place parts of Tycho code that use those particular libraries with generics.	2012-08-24 11:02:52 -04:00
Roland Grunberg	2cd60a3709	Set BREE to at least JavaSE-1.6 for all eclipse packaging types. We set the BREE to JavaSE-1.6 for 'eclipse-plugin', 'eclipse-test-plugin', and 'eclipse-feature' packaging types but we should do this for all packaging types. (eg. 'eclipse-repository', 'eclipse-application', 'eclipse-update-site')	2012-08-24 10:58:19 -04:00
Roland Grunberg	8a43dfc967	Update spec file to honour new java packaging guidelines.	2012-08-22 11:41:59 -04:00
Roland Grunberg	fe09c6eecf	Fix local mode resolution bug.	2012-08-22 11:41:53 -04:00
Roland Grunberg	b843e8e21f	Non-bootstrap build.	2012-08-10 11:42:36 -04:00
Roland Grunberg	633ff16ae2	Add tycho.local.keepTarget flag to bypass ignoring environments. By default a build in local mode should ignore the user-defined environments and use the system's environment. In some cases it may be necessary to bypass this functionality.	2012-08-09 13:08:54 -04:00
Roland Grunberg	f7d0f4b940	Non-bootstrap build.	2012-07-31 21:59:30 -04:00
Roland Grunberg	8520b94c73	Ignore defined environments in local mode. When running Tycho in local mode, dependencies will be resolved for all environments defined in target-platform-configuration. Only the running environment should be used.	2012-07-31 21:14:21 -04:00
Roland Grunberg	e7b7aa27e4	Non-bootstrap build.	2012-07-30 20:52:23 -04:00
Roland Grunberg	8f8436e842	Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars. When the path to the plugins/features folder for a set of bundles is "%%{_datadir}/eclipse/dropins/${name}" (missing the additional eclipse folder), the linking of its jars will fail.	2012-07-30 16:36:18 -04:00
Roland Grunberg	c524d3cc4a	Update to 0.15.0.	2012-07-27 12:28:33 -04:00
Roland Grunberg	aeca7de63a	Non-bootstrap build.	2012-07-27 11:50:16 -04:00
Roland Grunberg	d9fe733c79	Detect OSGi jars using presence of the Bundle-SymbolicName entry.	2012-07-27 11:49:28 -04:00
Roland Grunberg	fca17a767a	Non-bootstrap build.	2012-06-13 17:03:49 -04:00
Roland Grunberg	1c43d75aec	Only create system p2 repository when running in local mode.	2012-06-12 15:27:38 -04:00
Roland Grunberg	350cd55d4c	Allow for building SWT fragments (BZ #380934 ).	2012-06-12 15:27:15 -04:00
Roland Grunberg	c658ed4f34	Implement automatic creation of a system p2 repository. Automatically create a local p2 repository of all bundles on the system so that they may be used for local dependency resolution. This is done using a modified version of Eclipse's copy-platform script.	2012-06-12 15:25:04 -04:00
Roland Grunberg	e6b1e7eea4	Fix Surfire test plugin. When running an Eclipse bundle's tests, Tycho Surefire resolves its runtime dependencies using a class loader, which is in fact just looking through Bundle-ClassPath. As a result, it must copy over and include system jars in its Bundle-ClassPath. We use Fedora system jars to satisfy these dependencies but even these jars differ slightly in terms of provided classes.	2012-06-12 15:24:45 -04:00
Roland Grunberg	84b4d8b2fa	Non-bootstrap build.	2012-05-30 15:30:56 -04:00
Roland Grunberg	c6e0bc76a5	Set BREE to at least JavaSE-1.6 when building OSGi bundles. Since Fedora 17, we need an Execution Environment of at least JavaSE-1.6 for Eclipse bundles. Eclipse Juno platform bundles depend on javax.annotation. In Fedora this is provided by geronimo-annotation, but has a dependency on javax.lang.model (since 1.6).	2012-05-30 12:41:54 -04:00
Roland Grunberg	c0ea585831	Non-bootstrap build.	2012-05-22 14:24:13 -04:00
Roland Grunberg	3b5d761830	Implement a custom resolver when running in local mode. When running in local mode, dependencies should be resolved by looking on the local system. Remote repositories should be ignored.	2012-05-04 15:37:35 -04:00
Roland Grunberg	f9960f4753	Non-bootstrap build.	2012-04-11 16:40:07 -04:00
Roland Grunberg	5244fdf4f2	Add missing tycho-testing-harness to be packaged.	2012-04-11 11:31:21 -04:00
Roland Grunberg	db1821ef63	- Update to 0.14.1 upstream tag.	2012-03-10 21:44:58 -05:00
Roland Grunberg	5e0606170b	Stop symlinking o.e.osgi and o.e.jdt.core into the m2 cache.	2012-03-10 21:42:54 -05:00
Roland Grunberg	01b678250d	Non-bootstrap build.	2012-02-17 10:29:59 -05:00
Roland Grunberg	1c67f6dcc7	Update to 0.14.0 upstream release tag.	2012-02-17 09:43:20 -05:00
Roland Grunberg	989e61a9f9	Non-bootstrap build.	2012-02-09 22:36:24 -05:00
Roland Grunberg	6bd21088fd	Build 0.14.0	2012-02-09 16:22:35 -05:00
Stanislav Ochotnicky	8c80e73d75	Add bootstrap-repo creating script	2012-02-09 16:22:24 -05:00
Stanislav Ochotnicky	1e7b69f955	Scratch commit for 0.13 update	2012-02-09 16:22:09 -05:00