[tycho] Add maven-clean-plugin to Requires.
by Roland Grunberg
commit 702c45696f6503913bcba186f9bfc602fe3a8672
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue Aug 7 13:11:57 2012 -0400
Add maven-clean-plugin to Requires.
tycho.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 0dfb272..4841b3c 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -63,6 +63,7 @@ BuildRequires: %{name}
Requires: jpackage-utils
Requires: decentxml
Requires: maven
+Requires: maven-clean-plugin
Requires: maven-dependency-plugin
Requires: maven-shared-verifier
Requires: maven-surefire-provider-junit4
11 years, 8 months
[tycho] Update to 0.16.0 SNAPSHOT.
by Roland Grunberg
commit 50be185d5222796775f00cd20d76c38712521737
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue Aug 7 10:44:21 2012 -0400
Update to 0.16.0 SNAPSHOT.
.gitignore | 1 +
sources | 2 +-
tycho-bootstrap.patch | 430 ++++++++++++++++++++++-----------------
tycho-fix-build.patch | 114 ++++++++++-
tycho-fix-surefire.patch | 102 +++++++---
tycho-maven-surefire.patch | 50 +++--
tycho-use-custom-resolver.patch | 79 ++++----
tycho.spec | 35 ++--
8 files changed, 515 insertions(+), 298 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b116f49..54ca1a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz
tycho-0.14.0.tar.bz2
/tycho-0.14.x.tar.bz2
/tycho-0.15.x.tar.bz2
+/org.eclipse.tycho-df2c3591ae0e641a8d12c13ca9c1058eaf8439b2.tar.bz2
diff --git a/sources b/sources
index d112730..0e882cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a238f4ebd99940ea798475d760152634 tycho-0.15.x.tar.bz2
+7a11dc2efbcc5904ad8d5c199fcee33a org.eclipse.tycho-df2c3591ae0e641a8d12c13ca9c1058eaf8439b2.tar.bz2
diff --git a/tycho-bootstrap.patch b/tycho-bootstrap.patch
index ef2ff00..ee7765a 100644
--- a/tycho-bootstrap.patch
+++ b/tycho-bootstrap.patch
@@ -1,815 +1,867 @@
diff --git a/pom.xml b/pom.xml
-index 4b59631..ef016a8 100644
+index 3a27718..a4a3ed1 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
<packaging>pom</packaging>
<name>Tycho (Incubation)</name>
diff --git a/sisu-equinox/pom.xml b/sisu-equinox/pom.xml
-index eb03656..357e880 100644
+index d5770b2..de8536e 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 0fefe9f..0f0b76f 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 08cea80..b04fe7c 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 5ffa76e..7d9b6da 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index a7a8629..ce749e7 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
</parent>
<artifactId>target-platform-configuration</artifactId>
+diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
+index a6ff6f7..a638bac 100644
+--- a/tycho-artifactcomparator/pom.xml
++++ b/tycho-artifactcomparator/pom.xml
+@@ -16,7 +16,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho</artifactId>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
+ </parent>
+ <artifactId>tycho-artifactcomparator</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
+index 16677f5..86dae92 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
+-Bundle-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
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
+index 2cffad0..e87c76b 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 739b3e7..e5f7e32 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
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
+index dac02f4..050d6ba 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index c418a01..6807552 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
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
+index c7702de..d2e77ed 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 0d6d0d2..665eb95 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
+-Bundle-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Require-Bundle: org.eclipse.equinox.security;bundle-version="1.0.100"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml
-index 2f4c2ee..4108494 100644
+index 1d71dbb..2aa0e42 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 2d52b8f..442da34 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.tycho.p2.maven.repository,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml
-index ecf5c9b..62239e2 100644
+index 296a0f6..85310b8 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 0143eeb..304024a 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml
-index 2367577..c31b8e8 100644
+index 15ac2aa..6bc1516 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 8fd7fbb..b4608ea 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Fragment-Host: org.eclipse.tycho.p2.resolver.impl
Require-Bundle: org.junit4,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml
-index 81b949a..718e67c 100644
+index ef860c8..3f2e02a 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 4385b6e..ea64604 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Bundle-Activator: org.eclipse.tycho.p2.impl.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.equinox.security;bundle-version="1.0.100",
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml
-index 21ea1c7..9a258fd 100644
+index 56fd319..c5ce76b 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 7650b0a..1334979 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
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
+index 7f3d500..c487ff1 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 50637e7..9fdeedd 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Bundle-Name: Tycho p2 Tools Bundle (Incubation)
Bundle-ManifestVersion: 2
Bundle-Description: Implementation of tools for generating, copying, and using p2 repositories in Tycho
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml
-index 5676655..f204689 100644
+index 98cb0bf..ae6eb2c 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index cddb8c5..db3c200 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
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
+index 53ed0f0..32bf52a 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index c24cd6c..7f07fca 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Fragment-Host: org.eclipse.tycho.p2.tools.impl
Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)",
diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml
-index c19b17b..00494f2 100644
+index 1fc80fc..7abd0c4 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 285ebe7..7a2e68c 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-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
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
+index 9d3b589..50998ae 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 8e4f857..6071dc1 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 46f50a4..aa0b727 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 8b54310..9e53672 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">
+-<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.16.0.qualifier" useFeatures="false" includeLaunchers="false">
++<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.16.0" 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
+index ab65018..8027cd7 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
<relativePath>..</relativePath>
</parent>
+diff --git a/tycho-bundles/tycho-standalone-p2-director/pom.xml b/tycho-bundles/tycho-standalone-p2-director/pom.xml
+index c8fd41b..f5e7e8d 100644
+--- a/tycho-bundles/tycho-standalone-p2-director/pom.xml
++++ b/tycho-bundles/tycho-standalone-p2-director/pom.xml
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-bundles</artifactId>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
+ </parent>
+
+ <artifactId>tycho-standalone-p2-director</artifactId>
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
-index 6a1102b..31bf702 100644
+index c373e6a..712e431 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 48086c8..6fe696f 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
</parent>
<artifactId>tycho-compiler-plugin</artifactId>
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
-index f72348a..51731fe 100644
+index b3aa4b1..c3d5288 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
</parent>
<artifactId>tycho-core</artifactId>
diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml
-index 5d5ce09..c9f88f1 100644
+index 8221ee1..bffb15a 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
</parent>
<artifactId>tycho-embedder-api</artifactId>
diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml
-index bd177bb..c958570 100644
+index 5c56be6..030888b 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
</parent>
<artifactId>tycho-its</artifactId>
diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml
-index 4fc5fdd..20cc720 100644
+index d0f4887..bf3448f 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 3c294ce..940ab1a 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
</parent>
<artifactId>tycho-metadata-model</artifactId>
diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml
-index 9c67a98..d58cfea 100644
+index 69fd0cc..1beff0b 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 8e69cea..9f5ea22 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 9dea239..9a6d1e8 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index bcaa69d..549c9ae 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 3e633db..f412b33 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 608b023..d018877 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index de329c9..7e72161 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 8447652..01ac8bc 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
</parent>
<artifactId>tycho-pomgenerator-plugin</artifactId>
diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml
-index 105ea56..b7827e3 100644
+index 304c0a6..5c331ca 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 6b5d4fe..5cd1956 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index b0f47ca..206a28d 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index c7767ba..74437ab 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
+-Bundle-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
-index f5699bc..c77dd03 100644
+index 188c45c..9ff127c 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index 632039f..c6fcd7f 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
+-Bundle-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
-index d5f35cb..beda338 100644
+index f7e6791..ace0538 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
</parent>
<artifactId>org.eclipse.tycho.surefire.junit4</artifactId>
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+index 50d53dd..680c4eb 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+@@ -2,7 +2,7 @@ Manifest-Version: 1.0
+ Bundle-ManifestVersion: 2
+ Bundle-Name: Tycho Surefire OSGi JUnit4.7 Runner (Incubation)
+ Bundle-SymbolicName: org.eclipse.tycho.surefire.junit47;singleton:=true
+-Bundle-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
+ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ClassPath: .,
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+index 9be536a..336c8ac 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+@@ -17,7 +17,7 @@
+ <parent>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire</artifactId>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
+ </parent>
+
+ <artifactId>org.eclipse.tycho.surefire.junit47</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
+index d510010..ce8fc7d 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,7 +8,7 @@ Bundle-ClassPath: .,
jars/surefire-api-2.10.jar,
jars/plexus-utils-3.0.jar,
jars/maven-surefire-common-2.10.jar
--Bundle-Version: 0.15.0
-+Bundle-Version: 0.15.0.qualifier
+-Bundle-Version: 0.16.0.qualifier
++Bundle-Version: 0.16.0
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
-index 275c95e..5b9bf35 100644
+index b6040a5..0c7c7a0 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index fe415d7..eab06be 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index a9e2f1d..8a099eb 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</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
+index d2d0250..3bc2251 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>
+- <version>0.16.0-SNAPSHOT</version>
++ <version>0.16.0</version>
</parent>
<artifactId>tycho-testing-harness</artifactId>
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index ca0efe0..ff6347c 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,4 +1,4 @@
-From b67b6a5ab67eea4cb69d259fb7140a54355df61d Mon Sep 17 00:00:00 2001
+From 2d1e009c256c26c8b1bf66dace56bb7a8436c236 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH 1/4] Fix the Tycho build to work on Fedora.
@@ -10,18 +10,27 @@ JSR14. Many Eclipse OSGi bundles use JSR14 for a build target but since
JDK 1.7 ignores certain information (eg. generics) we must be careful
when using those libraries.
+Remove org.eclipse.equinox.concurrent until present in Fedora Eclipse.
+
+Fix API issues with org.objectweb.asm (Need 4.0 but only have 3.0).
+
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
pom.xml | 5 -----
- tycho-bundles/tycho-bundles-target/tycho.target | 2 --
+ tycho-artifactcomparator/pom.xml | 6 +++---
+ .../tycho/zipcomparator/internal/ClassfileComparator.java | 2 +-
+ .../tycho-bundles-external/tycho-bundles-external.product | 1 -
+ tycho-bundles/tycho-bundles-target/tycho.target | 4 ----
+ .../tycho-standalone-p2-director/p2 Director.product | 1 -
tycho-compiler-jdt/pom.xml | 4 ----
.../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------
.../tycho/core/osgitools/StandalonePluginConverterTest.java | 8 ++++----
+ .../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
.../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
- 6 files changed, 18 insertions(+), 21 deletions(-)
+ 11 files changed, 27 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 69e68c6..7cfb0cf 100644
+index dc7c1f5..1868f9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,11 +221,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
@@ -36,21 +45,82 @@ index 69e68c6..7cfb0cf 100644
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-booter</artifactId>
<version>2.10</version>
+diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
+index 775107a..a6ff6f7 100644
+--- a/tycho-artifactcomparator/pom.xml
++++ b/tycho-artifactcomparator/pom.xml
+@@ -23,8 +23,8 @@
+ <dependencies>
+ <dependency>
+ <!-- CQ https://dev.eclipse.org/ipzilla/show_bug.cgi?id=6591 -->
+- <groupId>org.ow2.asm</groupId>
+- <artifactId>asm-debug-all</artifactId>
++ <groupId>asm</groupId>
++ <artifactId>asm-all</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+@@ -54,4 +54,4 @@
+ </plugin>
+ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
+diff --git a/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java b/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
+index 6944b03..a3a9825 100644
+--- a/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
++++ b/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
+@@ -61,7 +61,7 @@ public class ClassfileComparator implements ContentsComparator {
+ private String disassemble(byte[] bytes) {
+ ClassReader reader = new ClassReader(bytes);
+ ClassNode clazz = new ClassNode();
+- reader.accept(clazz, Opcodes.ASM4 | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
++ reader.accept(clazz, (4 << 16 | 0 << 8 | 0) | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+
+ // inner class list gets reordered during pack200 normalization
+ if (clazz.innerClasses != null) {
+diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+index 3e584f5..8b54310 100644
+--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
++++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+@@ -41,7 +41,6 @@
+ <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
+ <plugin id="org.eclipse.equinox.app"/>
+ <plugin id="org.eclipse.equinox.common"/>
+- <plugin id="org.eclipse.equinox.concurrent"/>
+ <plugin id="org.eclipse.equinox.ds"/>
+ <plugin id="org.eclipse.equinox.frameworkadmin"/>
+ <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
-index 1cd9a7b..48eb53a 100644
+index d23b885..1437dbd 100644
--- a/tycho-bundles/tycho-bundles-target/tycho.target
+++ b/tycho-bundles/tycho-bundles-target/tycho.target
-@@ -4,8 +4,6 @@
- <target name="Target platform for Tycho's bundles" sequenceNumber="2">
+@@ -4,10 +4,6 @@
+ <target name="Target platform for Tycho's bundles" sequenceNumber="7">
<locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
--<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120426-1529-7P7OFvNFLWUl7UmDUz0O8_a2"/>
--<unit id="org.eclipse.sdk.ide" version="4.2.0.I20120503-1800"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.2milestones/"/>
+-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120522-1813-7P7OG2BFLWUl7UmbVUO9iCm"/>
+-<unit id="org.eclipse.sdk.ide" version="4.2.0.I20120608-1400"/>
+-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120522-1813-85FAcGbBFoYTldHrOJw3cF4q"/>
+-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N89H_mGMMn84Osz0TAoT279BRQD"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.2"/>
</location>
</locations>
+diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
+index dd80b5e..797b4ba 100644
+--- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
++++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
+@@ -41,7 +41,6 @@
+ <plugin id="org.eclipse.ecf.ssl" fragment="true"/>
+ <plugin id="org.eclipse.equinox.app"/>
+ <plugin id="org.eclipse.equinox.common"/>
+- <plugin id="org.eclipse.equinox.concurrent"/>
+ <plugin id="org.eclipse.equinox.ds"/>
+ <plugin id="org.eclipse.equinox.frameworkadmin"/>
+ <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
-index 9f7bdd7..6a1102b 100644
+index 01b9a9e..c373e6a 100644
--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
@@ -38,10 +38,6 @@
@@ -150,6 +220,28 @@ index 42db7f6..a145c57 100644
assertEquals(originalManifest.size(), writtenManifest.size());
for (Enumeration<String> keys = writtenManifest.keys(); keys.hasMoreElements();) {
String key = keys.nextElement();
+diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
+index 5c4dcb3..9830aee 100644
+--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
++++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java
+@@ -97,12 +97,11 @@ public abstract class AbstractTychoIntegrationTest {
+ verifier.getCliOptions().add(customOptions);
+ }
+
+- if (System.getProperty(SYSPROP_STATELOCATION) != null) {
+- verifier.setForkJvm(false);
+- String m2eresolver = System.getProperty("tychodev-maven.ext.class.path"); // XXX
+- if (m2eresolver != null) {
+- verifier.addCliOption("-Dmaven.ext.class.path=" + m2eresolver);
+- }
++ String m2eState = System.getProperty("m2eclipse.workspace.state");
++ String m2eResolver = System.getProperty("m2eclipse.workspace.resolver");
++
++ if (m2eState != null && m2eResolver != null) {
++ verifier.getVerifierProperties().put("m2eclipse.workspace.state", m2eState);
+ }
+
+ return verifier;
diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
index a9d80d3..3ddbe9c 100644
--- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
diff --git a/tycho-fix-surefire.patch b/tycho-fix-surefire.patch
index 16f525e..a10c7bc 100644
--- a/tycho-fix-surefire.patch
+++ b/tycho-fix-surefire.patch
@@ -1,4 +1,4 @@
-From 35f7704c0086224e2f307f6e8d0469911d120136 Mon Sep 17 00:00:00 2001
+From 15d879a19f9704b823d38dfc390ba23ef666a422 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 29 May 2012 14:27:27 -0400
Subject: [PATCH 2/4] Resolve all necessary dependencies for Tycho Surefire.
@@ -12,20 +12,25 @@ of provided classes. This patch addresses this issue.
Basically, the jars added to the Bundle-ClassPath in this patch, provide
the additional classes that are in the original jars used upstream.
+
+Change-Id: I678a961226d5ca27542a2b79a069b995cd3613eb
---
- pom.xml | 2 +-
- .../META-INF/MANIFEST.MF | 5 +++--
- .../build.properties | 2 +-
- .../org.eclipse.tycho.surefire.junit/pom.xml | 5 +++++
- .../META-INF/MANIFEST.MF | 4 +++-
- .../build.properties | 2 +-
- .../org.eclipse.tycho.surefire.junit4/pom.xml | 10 ++++++++++
- .../META-INF/MANIFEST.MF | 3 ++-
- .../org.eclipse.tycho.surefire.osgibooter/pom.xml | 5 +++++
- 9 files changed, 31 insertions(+), 7 deletions(-)
+ pom.xml | 2 +-
+ .../org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF | 5 +++--
+ .../org.eclipse.tycho.surefire.junit/build.properties | 2 +-
+ tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml | 5 +++++
+ .../org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF | 4 +++-
+ .../org.eclipse.tycho.surefire.junit4/build.properties | 2 +-
+ tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml | 10 ++++++++++
+ .../org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF | 4 +++-
+ .../org.eclipse.tycho.surefire.junit47/build.properties | 2 ++
+ tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml | 10 ++++++++++
+ .../org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF | 3 ++-
+ tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml | 5 +++++
+ 12 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 69e68c6..42ffc40 100644
+index 1868f9a..3a27718 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
@@ -38,10 +43,10 @@ index 69e68c6..42ffc40 100644
<wagonVersion>1.0-beta-6</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
-index 1417c3a..f9f6cd2 100644
+index c9281d6..c7767ba 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
-@@ -6,6 +6,7 @@ Bundle-Version: 0.15.0
+@@ -6,6 +6,7 @@ Bundle-Version: 0.16.0.qualifier
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@@ -63,10 +68,10 @@ index 499ce76..fe88b19 100644
+ jars/,\
plugin.properties
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
-index b917533..f5699bc 100644
+index f9feec9..188c45c 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
-@@ -47,6 +47,11 @@
+@@ -44,6 +44,11 @@
<artifactId>surefire-junit3</artifactId>
<version>${surefire-version}</version>
</artifactItem>
@@ -79,10 +84,10 @@ index b917533..f5699bc 100644
</configuration>
</execution>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
-index fdf4e6a..de38fb3 100644
+index c2e019c..632039f 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
-@@ -6,7 +6,9 @@ Bundle-Version: 0.15.0
+@@ -6,7 +6,9 @@ Bundle-Version: 0.16.0.qualifier
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@@ -105,10 +110,10 @@ index b787149..fe88b19 100644
+ jars/,\
plugin.properties
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
-index 0039fc4..d5f35cb 100644
+index f1f821e..f7e6791 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
-@@ -71,6 +71,16 @@
+@@ -44,6 +44,16 @@
<artifactId>surefire-junit4</artifactId>
<version>${surefire-version}</version>
</artifactItem>
@@ -125,8 +130,57 @@ index 0039fc4..d5f35cb 100644
</artifactItems>
</configuration>
</execution>
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+index 59d4c36..50d53dd 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+@@ -6,7 +6,9 @@ Bundle-Version: 0.16.0.qualifier
+ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0"
+ Bundle-RequiredExecutionEnvironment: J2SE-1.5
+ Bundle-ClassPath: .,
+- jars/surefire-junit47-2.10.jar
++ jars/surefire-junit47-2.10.jar,
++ jars/common-junit3-2.10.jar,
++ jars/common-junit4-2.10.jar
+ Import-Package: junit.framework;version="[4.7,5)",
+ org.junit;version="[4.7,5)",
+ org.junit.runner;version="[4.7,5)",
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/build.properties b/tycho-surefire/org.eclipse.tycho.surefire.junit47/build.properties
+index 716961d..ad4ed57 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/build.properties
++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/build.properties
+@@ -11,6 +11,8 @@
+ bin.includes = .,\
+ META-INF/,\
+ jars/surefire-junit47-2.10.jar,\
++ jars/common-junit3-2.10.jar,\
++ jars/common-junit4-2.10.jar,\
+ plugin.properties,\
+ about.html,\
+ about_files/
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+index 61beabb..9be536a 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+@@ -44,6 +44,16 @@
+ <artifactId>surefire-junit47</artifactId>
+ <version>${surefire-version}</version>
+ </artifactItem>
++ <artifactItem>
++ <groupId>org.apache.maven.surefire</groupId>
++ <artifactId>common-junit4</artifactId>
++ <version>${surefire-version}</version>
++ </artifactItem>
++ <artifactItem>
++ <groupId>org.apache.maven.surefire</groupId>
++ <artifactId>common-junit3</artifactId>
++ <version>${surefire-version}</version>
++ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
-index 06c99c9..c2c4c8c 100644
+index 9c418b3..1bdb8cb 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
@@ -136,11 +190,11 @@ index 06c99c9..c2c4c8c 100644
- jars/surefire-api-2.10.jar
+ jars/surefire-api-2.10.jar,
+ jars/plexus-utils-3.0.jar
- Bundle-Version: 0.15.0
+ Bundle-Version: 0.16.0.qualifier
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
-index 4b65c4a..7a13f1d 100644
+index 9582aef..87f1f23 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -52,6 +52,11 @@
@@ -156,5 +210,5 @@ index 4b65c4a..7a13f1d 100644
</configuration>
</execution>
--
-1.7.7.6
+1.7.11.2
diff --git a/tycho-maven-surefire.patch b/tycho-maven-surefire.patch
index 76d852e..ad4286e 100644
--- a/tycho-maven-surefire.patch
+++ b/tycho-maven-surefire.patch
@@ -1,4 +1,4 @@
-From 038d1819e9b9880783ce187023e1404f5ea12db7 Mon Sep 17 00:00:00 2001
+From e907892903141709326414a573d8703a5dccef47 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 10:12:53 -0400
Subject: [PATCH 3/4] Upstream builds against maven-surefire 2.10 but in
@@ -6,15 +6,29 @@ Subject: [PATCH 3/4] Upstream builds against maven-surefire 2.10 but in
Change-Id: I69ceee1cb2abe86bc6ca080ddde6676bf995347a
---
- .../META-INF/MANIFEST.MF | 3 ++-
- .../org.eclipse.tycho.surefire.osgibooter/pom.xml | 7 +++++++
- .../surefire/osgibooter/OsgiSurefireBooter.java | 15 ++++++++-------
- .../osgibooter/TychoClasspathConfiguration.java | 5 +++++
- .../java/org/eclipse/tycho/surefire/TestMojo.java | 4 ++--
- 5 files changed, 24 insertions(+), 10 deletions(-)
+ .../surefire/junitcore/OsgiEnabledJUnitCoreProvider.java | 2 +-
+ .../META-INF/MANIFEST.MF | 3 ++-
+ .../org.eclipse.tycho.surefire.osgibooter/pom.xml | 7 +++++++
+ .../tycho/surefire/osgibooter/OsgiSurefireBooter.java | 15 ++++++++-------
+ .../surefire/osgibooter/TychoClasspathConfiguration.java | 5 +++++
+ .../main/java/org/eclipse/tycho/surefire/TestMojo.java | 4 ++--
+ 6 files changed, 25 insertions(+), 11 deletions(-)
+diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreProvider.java b/tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreProvider.java
+index eaa8dc4..ea3a628 100644
+--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreProvider.java
++++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreProvider.java
+@@ -115,7 +115,7 @@ public class OsgiEnabledJUnitCoreProvider
+ org.junit.runner.notification.RunListener jUnit4RunListener = new OsgiEnabledJUnitCoreRunListener( listener, testSetMap );
+ customRunListeners.add( 0, jUnit4RunListener );
+
+- JUnitCoreWrapper.execute( testsToRun, jUnitCoreParameters, customRunListeners );
++ JUnitCoreWrapper.execute( testsToRun, jUnitCoreParameters, customRunListeners, null );
+ return reporterFactory.close();
+ }
+
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
-index c2c4c8c..9fa7626 100644
+index 1bdb8cb..d510010 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Eclipse-AutoStart: true
@@ -24,11 +38,11 @@ index c2c4c8c..9fa7626 100644
- jars/plexus-utils-3.0.jar
+ jars/plexus-utils-3.0.jar,
+ jars/maven-surefire-common-2.10.jar
- Bundle-Version: 0.15.0
+ Bundle-Version: 0.16.0.qualifier
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
-index 7a13f1d..275c95e 100644
+index 87f1f23..b6040a5 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -56,6 +56,13 @@
@@ -46,10 +60,10 @@ index 7a13f1d..275c95e 100644
</artifactItems>
</configuration>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
-index 8d46bdb..162a706 100644
+index 791221b..dcd1244 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java
-@@ -26,13 +26,14 @@ import java.util.Set;
+@@ -27,13 +27,14 @@ import java.util.Set;
import org.apache.maven.surefire.booter.ClassLoaderConfiguration;
import org.apache.maven.surefire.booter.ProviderConfiguration;
import org.apache.maven.surefire.booter.StartupConfiguration;
@@ -66,7 +80,7 @@ index 8d46bdb..162a706 100644
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-@@ -63,22 +64,22 @@ public class OsgiSurefireBooter {
+@@ -64,22 +65,22 @@ public class OsgiSurefireBooter {
boolean printSummary = true;
boolean disableXmlReport = false;
ClassLoader testClassLoader = getBundleClassLoader(plugin);
@@ -84,7 +98,7 @@ index 8d46bdb..162a706 100644
TestRequest testRequest = new TestRequest(null, testClassesDir, null);
- ProviderConfiguration providerConfiguration = new ProviderConfiguration(dirScannerParams, failIfNoTests,
+ ProviderConfiguration providerConfiguration = new ProviderConfiguration(dirScannerParams, RunOrderParameters.DEFAULT(), failIfNoTests,
- reporterConfig, null, testRequest, new Properties(), null);
+ reporterConfig, null, testRequest, extractProviderProperties(testProps), null);
StartupReportConfiguration startupReportConfig = new StartupReportConfiguration(useFile, printSummary,
StartupReportConfiguration.PLAIN_REPORT_FORMAT, redirectTestOutputToFile, disableXmlReport, reportsDir,
- trimStacktrace);
@@ -111,10 +125,10 @@ index c94d3ea..6c732a5 100644
return testClassLoader;
}
diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
-index a8857f1..83f0e0f 100644
+index 77288dd..9cc2e49 100644
--- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
+++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
-@@ -589,7 +589,7 @@ public class TestMojo extends AbstractMojo {
+@@ -670,7 +670,7 @@ public class TestMojo extends AbstractMojo {
case 0:
getLog().info("All tests passed!");
break;
@@ -123,7 +137,7 @@ index a8857f1..83f0e0f 100644
String message = "No tests found.";
if (failIfNoTests) {
throw new MojoFailureException(message);
-@@ -597,7 +597,7 @@ public class TestMojo extends AbstractMojo {
+@@ -678,7 +678,7 @@ public class TestMojo extends AbstractMojo {
getLog().warn(message);
}
break;
@@ -133,5 +147,5 @@ index a8857f1..83f0e0f 100644
+ " for the individual test results.";
if (testFailureIgnore) {
--
-1.7.7.6
+1.7.11.2
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index 3a03e75..bdff1c7 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From 9a323780512a16b0ed3e095d4b0954ed2780fe3d Mon Sep 17 00:00:00 2001
+From d5aa6d0a1a2ed5f56e2df61094a541fb92ada771 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@@ -21,18 +21,18 @@ running in local mode.
Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
---
- .../tycho/p2/target/TargetDefinitionResolver.java | 8 +++--
+ .../tycho/p2/target/TargetDefinitionResolver.java | 10 ++++--
.../tycho/p2/target/TargetPlatformBuilderImpl.java | 6 ++++
.../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++++
- .../core/osgitools/EclipseFeatureProject.java | 22 +++++++++++++
- .../tycho/core/osgitools/OsgiBundleProject.java | 38 +++++++++++++++++++++-
+ .../core/osgitools/EclipseFeatureProject.java | 22 ++++++++++++
+ .../tycho/core/osgitools/OsgiBundleProject.java | 42 ++++++++++++++++++++--
.../DefaultTargetPlatformConfigurationReader.java | 5 ++-
- .../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 17 ++++++++++
+ .../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 15 ++++++++
.../p2/resolver/P2TargetPlatformResolver.java | 10 ++++++
- 8 files changed, 118 insertions(+), 4 deletions(-)
+ 8 files changed, 120 insertions(+), 6 deletions(-)
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
-index 6a85c49..d9d6055 100644
+index 5fdc6a1..838e267 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
@@ -24,6 +24,7 @@ import org.eclipse.core.runtime.CoreException;
@@ -43,14 +43,16 @@ index 6a85c49..d9d6055 100644
import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.ProvisionException;
import org.eclipse.equinox.p2.metadata.IInstallableUnit;
-@@ -100,8 +101,11 @@ public class TargetDefinitionResolver {
+@@ -103,9 +104,12 @@ public class TargetDefinitionResolver {
List<IMetadataRepository> metadataRepositories = new ArrayList<IMetadataRepository>();
for (Repository repository : iuLocationDefinition.getRepositories()) {
+- repositoryIdManager.addMapping(repository.getId(), repository.getLocation());
- artifactRepositories.add(repository.getLocation());
- metadataRepositories.add(loadRepository(repository));
+ // We cannot resolve a non-file URI in local mode
+ if (System.getProperty("maven.local.mode") == null || URIUtil.isFileURI(repository.getLocation())) {
++ repositoryIdManager.addMapping(repository.getId(), repository.getLocation());
+ artifactRepositories.add(repository.getLocation());
+ metadataRepositories.add(loadRepository(repository));
+ }
@@ -58,22 +60,22 @@ index 6a85c49..d9d6055 100644
IQueryable<IInstallableUnit> locationUnits = new CompoundQueryable<IInstallableUnit>(
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
-index e4b4084..8d58a3c 100644
+index fa1cfab..23cdb5d 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
-@@ -225,6 +225,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
+@@ -223,6 +223,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
IMetadataRepository metadataRepository = null;
IArtifactRepository artifactRepository = null;
+ // We cannot resolve a non-file URI in local mode while offline
-+ if (System.getProperty("maven.local.mode") != null && offline && !URIUtil.isFileURI(location)) {
++ if (System.getProperty("maven.local.mode") != null && offline && !URIUtil.isFileURI(location.getURL())) {
+ return;
+ }
+
+
try {
- // TODO always log that a p2 repository is added to the target platform somewhere; used to be either from p2 or the following line
- // logger.info("Adding repository (cached) " + location.toASCIIString());
+ remoteRepositoryIdManager.addMapping(location.getId(), location.getURL());
+
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
index 0dd2fd4..15669a6 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@@ -109,13 +111,13 @@ index 0dd2fd4..15669a6 100644
resolver.setupProject(session, project, DefaultReactorProject.adapt(project));
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java
-index 060a844..dbbe51a 100644
+index 0fe42a6..1bc3a6e 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/EclipseFeatureProject.java
@@ -21,6 +21,9 @@ import org.eclipse.tycho.core.ArtifactDependencyVisitor;
import org.eclipse.tycho.core.ArtifactDependencyWalker;
- import org.eclipse.tycho.core.TargetEnvironment;
import org.eclipse.tycho.core.TychoProject;
+ import org.eclipse.tycho.core.facade.TargetEnvironment;
+import org.eclipse.tycho.core.UnknownEnvironmentException;
+import org.eclipse.tycho.core.utils.ExecutionEnvironment;
+import org.eclipse.tycho.core.utils.ExecutionEnvironmentUtils;
@@ -147,13 +149,16 @@ index 060a844..dbbe51a 100644
+
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
-index fe6383f..d037faf 100644
+index c4b783e..e83dd72 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
-@@ -505,6 +505,28 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
+@@ -525,12 +525,50 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
+ if (envs.isEmpty()) {
+ return null;
}
-
- ExecutionEnvironment manifestMinimalEE = Collections.min(envs);
+- return Collections.min(envs);
++
++ ExecutionEnvironment manifestMinimalEE = Collections.min(envs);
+ ExecutionEnvironment tmp;
+
+ if (System.getProperty("maven.local.mode") != null) {
@@ -176,10 +181,8 @@ index fe6383f..d037faf 100644
+ // Continue
+ }
+ }
-
- if (buildMinimalEE == null) {
- return manifestMinimalEE;
-@@ -515,7 +537,21 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro
++ return manifestMinimalEE;
+ }
protected ExecutionEnvironment getExecutionEnvironment(MavenProject project, String profile) {
try {
@@ -203,7 +206,7 @@ index fe6383f..d037faf 100644
throw new RuntimeException("Unknown execution environment specified in build.properties of project "
+ project, e);
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
-index aad664a..87fe760 100644
+index c2997bc..9c1f5c8 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
@@ -66,7 +66,10 @@ public class DefaultTargetPlatformConfigurationReader {
@@ -219,10 +222,10 @@ index aad664a..87fe760 100644
setTargetPlatformResolver(result, configuration);
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java
-index 15b3fff..c8f14df 100644
+index ff4c14a..de02644 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java
-@@ -23,6 +23,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
+@@ -22,6 +22,7 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolutionRequest;
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
@@ -230,19 +233,18 @@ index 15b3fff..c8f14df 100644
import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
-@@ -38,6 +39,7 @@ import org.codehaus.plexus.util.FileUtils;
- import org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator;
+@@ -38,6 +39,7 @@ import org.eclipse.sisu.equinox.embedder.EquinoxRuntimeLocator;
+ import org.eclipse.tycho.dev.DevWorkspaceResolver;
import org.eclipse.tycho.locking.facade.FileLockService;
import org.eclipse.tycho.locking.facade.FileLocker;
+import org.sonatype.aether.util.artifact.DefaultArtifact;
@Component(role = EquinoxRuntimeLocator.class)
public class TychoP2RuntimeLocator implements EquinoxRuntimeLocator {
-@@ -158,6 +160,21 @@ public class TychoP2RuntimeLocator implements EquinoxRuntimeLocator {
- }
+@@ -189,6 +191,19 @@ public class TychoP2RuntimeLocator implements EquinoxRuntimeLocator {
+ Artifact artifact = repositorySystem.createArtifact(dependency.getGroupId(), dependency.getArtifactId(),
+ dependency.getVersion(), dependency.getType());
- private File resolveArtifact(MavenSession session, Artifact artifact) throws MavenExecutionException {
-+
+ // If we are in local mode, find the artifact on the system
+ if (System.getProperty("maven.local.mode") != null) {
+ JavadirWorkspaceReader wReader = new JavadirWorkspaceReader();
@@ -253,18 +255,17 @@ index 15b3fff..c8f14df 100644
+ File file = wReader.findArtifact(newArtifact);
+ if (file != null) {
+ artifact.setFile(file);
-+ return file;
+ }
+ }
+
- List<ArtifactRepository> repositories = new ArrayList<ArtifactRepository>();
- for (MavenProject project : session.getProjects()) {
- repositories.addAll(project.getPluginArtifactRepositories());
+ ArtifactResolutionRequest request = new ArtifactResolutionRequest();
+ request.setArtifact(artifact);
+ request.setResolveRoot(true).setResolveTransitively(false);
diff --git a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
-index ea06289..0768fd0 100644
+index 4db1bd4..b45a4ea 100644
--- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
+++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
-@@ -206,6 +206,16 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp
+@@ -193,6 +193,16 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp
tpBuilder.setProjectLocation(project.getBasedir());
tpBuilder.setIncludePackedArtifacts(configuration.isIncludePackedArtifacts());
@@ -272,7 +273,7 @@ index ea06289..0768fd0 100644
+ if (System.getProperty("maven.local.mode") != null) {
+ String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo";
+ try {
-+ tpBuilder.addP2Repository(new URI(uri));
++ tpBuilder.addP2Repository(new MavenRepositoryLocation(uri, new URI(uri)));
+ } catch (URISyntaxException e) {
+ getLogger().warn("Unable to resolve repository URI : " + uri, e);
+ }
diff --git a/tycho.spec b/tycho.spec
index abdf0db..0dfb272 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,21 +1,22 @@
%global bootstrap 0
+%global sha df2c3591ae0e641a8d12c13ca9c1058eaf8439b2
%if %{bootstrap}
-%global snap -SNAPSHOT
-%else
%global snap %{nil}
+%else
+%global snap -SNAPSHOT
%endif
Name: tycho
-Version: 0.15.0
-Release: 3%{?dist}
+Version: 0.16.0
+Release: 1.df2c35%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
# license file is missing but all files having some licensing information are ASL 2.0
License: ASL 2.0
URL: http://tycho.sonatype.org/
-Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.15....
+Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/org.eclipse...
# this is a workaround for maven-plugin-plugin changes that happened after
# version 2.4.3 (impossible to have empty mojo created as aggregate). This
@@ -30,17 +31,17 @@ Patch1: %{name}-fix-surefire.patch
# Upstream builds against maven-surefire 2.10 but in rawhide we have 2.12
Patch2: %{name}-maven-surefire.patch
Patch3: %{name}-use-custom-resolver.patch
-Patch4: %{name}-fix-swt.patch
# Set some temporary build version so that the bootstrapped build has
# a different version from the nonbootstrapped. Otherwise there will
# be cyclic dependencies.
-Patch5: %{name}-bootstrap.patch
+Patch4: %{name}-bootstrap.patch
BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: java-devel
BuildRequires: maven
+BuildRequires: maven-clean-plugin
BuildRequires: maven-compiler-plugin
BuildRequires: maven-dependency-plugin
BuildRequires: maven-install-plugin
@@ -107,15 +108,14 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-0.15.x
+%setup -q -n org.eclipse.tycho-%{sha}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
%if %{bootstrap}
-%patch5 -p1
+%patch4 -p1
%endif
find tycho-core -iname '*html' -delete
@@ -128,19 +128,19 @@ popd
%build
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
-mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} install javadoc:aggregate
+mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -Dmaven.test.skip=true install javadoc:aggregate
%install
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
- tycho-{core,embedder-api,testing-harness} \
- sisu-equinox/sisu-equinox{-api,-launching,-embedder} \
- tycho-{metadata-model,p2/tycho-p2-{director-plugin,facade,plugin,{publisher,repository}-plugin}} \
- tycho-{maven,packaging,pomgenerator,source}-plugin tycho-release/tycho-versions-plugin \
+ tycho-{artifactcomparator,core,embedder-api,metadata-model,testing-harness} \
+ sisu-equinox/sisu-equinox{-api,-launching,-embedder} \
+ tycho-p2/tycho-p2-{facade,plugin,{director,publisher,repository}-plugin} \
+ tycho-{maven,packaging,pomgenerator,release/tycho-versions,source}-plugin \
tycho-bundles/org* \
- tycho-surefire/{tycho-surefire-plugin,org.eclipse.tycho.surefire.{osgibooter,junit,junit4}}; do
+ tycho-surefire/{tycho-surefire-plugin,org.eclipse.tycho.surefire.{osgibooter,junit,junit4{,7}}}; do
echo $mod
aid=`basename $mod`
install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
@@ -194,6 +194,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
%{_javadocdir}/%{name}
%changelog
+* Thu Aug 2 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-1.df2c35
+- Update to 0.16.0 SNAPSHOT.
+
* Tue Jul 31 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-3
- Non-bootstrap build.
11 years, 8 months
[stringtemplate4] Fix file permissions
by Mikolaj Izdebski
commit ed0b65bbb24cc4ceeca65810589037c7f146beb1
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 7 14:31:08 2012 +0200
Fix file permissions
stringtemplate4.spec | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/stringtemplate4.spec b/stringtemplate4.spec
index 645398b..bf03008 100644
--- a/stringtemplate4.spec
+++ b/stringtemplate4.spec
@@ -2,7 +2,7 @@
Name: stringtemplate4
Version: 4.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A Java template engine
URL: http://www.stringtemplate.org/
Source0: http://www.stringtemplate.org/download/%{pkgname}-%{version}-src.zip
@@ -68,11 +68,13 @@ ant build-jar
%javadoc -d javadoc -public `find build/src build/gen -name '*.java'`
%install
-install -D dist/ST-%{version}.jar \
- %{buildroot}%{_datadir}/java/%{name}.jar
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 dist/ST-%{version}.jar \
+ %{buildroot}%{_javadir}/%{name}.jar
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -90,6 +92,9 @@ cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.0.4-4
+- Fix file permissions
+
* Thu Jul 26 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 4.0.4-3
- Fix build. stringtemplate4 now needs itself to build so add it to
classpath
11 years, 8 months
[apache-commons-digester] General package cleanup
by Stanislav Ochotnicky
commit 64d8e0dadee6b284cbd4684fd70303ce4f49be48
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 7 14:12:57 2012 +0200
General package cleanup
- Fix file permissions
- Install LICENSE and NOTICE with javadoc package
apache-commons-digester.spec | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/apache-commons-digester.spec b/apache-commons-digester.spec
index 6190fa4..ea8b561 100644
--- a/apache-commons-digester.spec
+++ b/apache-commons-digester.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.8.1
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: XML to Java object mapping module
Group: Development/Libraries
License: ASL 2.0
@@ -62,7 +62,8 @@ mvn-rpmbuild install javadoc:javadoc
%install
# jars
-install -pD -T target/%{short_name}-%{version}.jar \
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 target/%{short_name}-%{version}.jar \
%{buildroot}%{_javadir}/%{short_name}.jar
ln -s %{short_name}.jar %{buildroot}/%{_javadir}/%{name}.jar
@@ -71,7 +72,8 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
# pom
-install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}"
%files
@@ -81,9 +83,14 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%{_javadir}/*
%files javadoc
+%doc LICENSE.txt NOTICE.txt
%{_javadocdir}/%{name}
%changelog
+* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.8.1-12
+- Fix file permissions
+- Install LICENSE and NOTICE with javadoc package
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.8.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 8 months
[apache-commons-codec] General package cleanup
by Stanislav Ochotnicky
commit d801e43822f8f548b6e48af6ca213309f69b6ebf
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 7 14:11:19 2012 +0200
General package cleanup
- Enable tests
- Install NOTICE with javadoc package
- Fix file permissions
- Remove versioned symlinks
apache-commons-codec.spec | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/apache-commons-codec.spec b/apache-commons-codec.spec
index 815ca6b..74b8ece 100644
--- a/apache-commons-codec.spec
+++ b/apache-commons-codec.spec
@@ -3,7 +3,7 @@
Name: apache-%{short_name}
Version: 1.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Implementations of common encoders and decoders
Group: Development/Libraries
License: ASL 2.0
@@ -57,20 +57,21 @@ Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release}
sed -i 's/\r//' RELEASE-NOTES*.txt LICENSE.txt NOTICE.txt
%build
-mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:javadoc
+mvn-rpmbuild install javadoc:javadoc
%install
# jars
-install -pD -T target/%{short_name}-%{version}.jar \
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 target/%{short_name}-%{version}.jar \
%{buildroot}%{_javadir}/%{short_name}.jar
-(cd %{buildroot}%{_javadir} && for jar in *; do ln -sf ${jar} `echo $jar| sed "s|%{short_name}|%{name}|g"`; done)
# javadocs
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
# pom
-install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "%{short_name}:%{short_name}"
%files
@@ -80,10 +81,16 @@ install -pD -T -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
%{_javadir}/*
%files javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
%{_javadocdir}/%{name}
%changelog
+* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 1.6-4
+- Enable tests
+- Install NOTICE with javadoc package
+- Fix file permissions
+- Remove versioned symlinks
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 8 months
[maven-release] Remove BR: maven-scm-test
by Stanislav Ochotnicky
commit 6cd9ea69cd0b81c2e653833b4c35f5cb12b201ca
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 7 11:36:22 2012 +0200
Remove BR: maven-scm-test
maven-release.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/maven-release.spec b/maven-release.spec
index a71252a..770498a 100644
--- a/maven-release.spec
+++ b/maven-release.spec
@@ -1,6 +1,6 @@
Name: maven-release
Version: 2.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Release a project updating the POM and tagging in the SCM
Group: Development/Libraries
@@ -15,7 +15,6 @@ BuildRequires: java-devel
BuildRequires: jpackage-utils
BuildRequires: maven
BuildRequires: maven-scm
-BuildRequires: maven-scm-test
BuildRequires: maven-antrun-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
@@ -88,6 +87,7 @@ EOT
%build
+# Skip tests because we don't have dependencies (jmock)
mvn-rpmbuild -e -Dmaven.test.skip=true install javadoc:aggregate
@@ -133,6 +133,9 @@ install -pm 644 %{name}-plugin/pom.xml \
%changelog
+* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2.1-4
+- Remove BR: maven-scm-test
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 8 months
[maven-wagon] Remove BR: ganymed-ssh2
by Mikolaj Izdebski
commit 50b733eefd1c1f6a231f2520ef1f1d06453ea41d
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Aug 7 12:39:44 2012 +0200
Remove BR: ganymed-ssh2
maven-wagon.spec | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/maven-wagon.spec b/maven-wagon.spec
index 66460ad..37e5f1b 100644
--- a/maven-wagon.spec
+++ b/maven-wagon.spec
@@ -32,7 +32,7 @@
Name: maven-%{bname}
Version: 1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 0
Summary: Tools to manage artifacts and deployment
License: ASL 2.0
@@ -61,11 +61,9 @@ BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-enforcer-plugin
#BuildRequires: maven2-default-skin
BuildRequires: plexus-containers-component-metadata
-BuildRequires: maven-scm-test
BuildRequires: xerces-j2
BuildRequires: classworlds
BuildRequires: nekohtml
-BuildRequires: ganymed-ssh2
BuildRequires: apache-commons-codec
BuildRequires: apache-commons-collections
BuildRequires: apache-commons-net
@@ -82,7 +80,6 @@ BuildRequires: xml-commons-apis
BuildRequires: easymock
BuildRequires: jsoup
-Requires: ganymed-ssh2
Requires: jakarta-commons-httpclient
Requires: apache-commons-net
#Requires: jakarta-slide-webdavclient
@@ -277,6 +274,9 @@ install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%doc %{_docdir}/%{name}-%{version}
%changelog
+* Tue Aug 7 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:1.0-6
+- Remove BR: ganymed-ssh2
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 8 months