diff --git a/.gitignore b/.gitignore index 29f39f9..b116f49 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ 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 diff --git a/sources b/sources index b9465b6..d112730 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -819980acb31e0c06dca4fdd8320c39c1 tycho-0.14.x.tar.bz2 +a238f4ebd99940ea798475d760152634 tycho-0.15.x.tar.bz2 diff --git a/tycho-bootstrap.patch b/tycho-bootstrap.patch index 0592128..ef2ff00 100644 --- a/tycho-bootstrap.patch +++ b/tycho-bootstrap.patch @@ -1,728 +1,815 @@ -diff -rauN tycho-0.14.x.old/pom.xml tycho-0.14.x/pom.xml ---- tycho-0.14.x.old/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/pom.xml 2012-03-30 14:49:39.000000000 -0400 +diff --git a/pom.xml b/pom.xml +index 4b59631..ef016a8 100644 +--- a/pom.xml ++++ b/pom.xml @@ -63,7 +63,7 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT pom - Tycho (Incubation) -diff -rauN tycho-0.14.x.old/sisu-equinox/pom.xml tycho-0.14.x/sisu-equinox/pom.xml ---- tycho-0.14.x.old/sisu-equinox/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/sisu-equinox/pom.xml 2012-03-30 14:49:39.000000000 -0400 + Tycho (Incubation) +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT sisu-equinox -diff -rauN tycho-0.14.x.old/sisu-equinox/sisu-equinox-api/pom.xml tycho-0.14.x/sisu-equinox/sisu-equinox-api/pom.xml ---- tycho-0.14.x.old/sisu-equinox/sisu-equinox-api/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/sisu-equinox/sisu-equinox-api/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho sisu-equinox -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT sisu-equinox-api -diff -rauN tycho-0.14.x.old/sisu-equinox/sisu-equinox-embedder/pom.xml tycho-0.14.x/sisu-equinox/sisu-equinox-embedder/pom.xml ---- tycho-0.14.x.old/sisu-equinox/sisu-equinox-embedder/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/sisu-equinox/sisu-equinox-embedder/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho sisu-equinox -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT sisu-equinox-embedder -diff -rauN tycho-0.14.x.old/sisu-equinox/sisu-equinox-launching/pom.xml tycho-0.14.x/sisu-equinox/sisu-equinox-launching/pom.xml ---- tycho-0.14.x.old/sisu-equinox/sisu-equinox-launching/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/sisu-equinox/sisu-equinox-launching/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho sisu-equinox -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT sisu-equinox-launching -diff -rauN tycho-0.14.x.old/target-platform-configuration/pom.xml tycho-0.14.x/target-platform-configuration/pom.xml ---- tycho-0.14.x.old/target-platform-configuration/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/target-platform-configuration/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ tycho org.eclipse.tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT target-platform-configuration -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 +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 @@ + + org.eclipse.tycho + tycho-bundles +- 0.15.0 ++ 0.15.0-SNAPSHOT + + + org.eclipse.tycho.core.shared.tests +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.core.shared -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -2,7 +2,7 @@ - Bundle-ManifestVersion: 2 - Bundle-Name: Tycho Core Maven/OSGi Shared Classes Tests (Incubation) - Bundle-SymbolicName: org.eclipse.tycho.core.shared.tests --Bundle-Version: 0.14.1 -+Bundle-Version: 0.14.1.qualifier - Fragment-Host: org.eclipse.tycho.core.shared - Bundle-RequiredExecutionEnvironment: J2SE-1.5 - Require-Bundle: org.junit;bundle-version="4.8.2" -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml 2012-03-30 14:49:39.000000000 -0400 -@@ -17,7 +17,7 @@ - - org.eclipse.tycho - tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT - - - org.eclipse.tycho.core.shared.tests -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.embedder.shared -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -2,7 +2,7 @@ +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.noopsecurity -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -2,7 +2,7 @@ - Bundle-ManifestVersion: 2 - Bundle-Name: Tycho Maven/p2 Repository Integration (Incubation) - Bundle-SymbolicName: org.eclipse.tycho.p2.maven.repository;singleton:=true --Bundle-Version: 0.14.1 -+Bundle-Version: 0.14.1.qualifier - Bundle-Vendor: %providerName - Bundle-RequiredExecutionEnvironment: J2SE-1.5 - Bundle-ActivationPolicy: lazy -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml 2012-03-30 14:49:39.000000000 -0400 -@@ -17,7 +17,7 @@ - - org.eclipse.tycho - tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT - - - org.eclipse.tycho.p2.maven.repository -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -2,7 +2,7 @@ +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.p2.maven.repository.tests -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -2,7 +2,7 @@ +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 p2 Resolver Bundle (Incubation) - Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl;singleton:=true --Bundle-Version: 0.14.1 -+Bundle-Version: 0.14.1.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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml 2012-03-30 14:49:39.000000000 -0400 + 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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT - org.eclipse.tycho.p2.resolver.impl -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -2,7 +2,7 @@ + org.eclipse.tycho.p2.maven.repository +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.p2.resolver.impl.test -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -5,7 +5,7 @@ +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 @@ + + org.eclipse.tycho + tycho-bundles +- 0.15.0 ++ 0.15.0-SNAPSHOT + + + org.eclipse.tycho.p2.resolver.impl +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.p2.resolver.shared -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.p2.tools.impl -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.p2.tools.shared -diff -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -2,7 +2,7 @@ +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml ---- tycho-0.14.x.old/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.p2.tools.tests -diff -rauN tycho-0.14.x.old/tycho-bundles/pom.xml tycho-0.14.x/tycho-bundles/pom.xml ---- tycho-0.14.x.old/tycho-bundles/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ + + org.eclipse.tycho + tycho-bundles +- 0.15.0 ++ 0.15.0-SNAPSHOT + + + org.eclipse.tycho.test.utils +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-bundles -diff -rauN tycho-0.14.x.old/tycho-bundles/tycho-bundles-external/pom.xml tycho-0.14.x/tycho-bundles/tycho-bundles-external/pom.xml ---- tycho-0.14.x.old/tycho-bundles/tycho-bundles-external/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/tycho-bundles-external/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-bundles-external -diff -rauN tycho-0.14.x.old/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product tycho-0.14.x/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product ---- tycho-0.14.x.old/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product 2012-03-30 14:49:39.000000000 -0400 +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 @@ -- -+ +- ++ -diff -rauN tycho-0.14.x.old/tycho-bundles/tycho-bundles-target/pom.xml tycho-0.14.x/tycho-bundles/tycho-bundles-target/pom.xml ---- tycho-0.14.x.old/tycho-bundles/tycho-bundles-target/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-bundles/tycho-bundles-target/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-bundles -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT .. -diff -rauN tycho-0.14.x.old/tycho-compiler-jdt/pom.xml tycho-0.14.x/tycho-compiler-jdt/pom.xml ---- tycho-0.14.x.old/tycho-compiler-jdt/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-compiler-jdt/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-compiler-jdt -diff -rauN tycho-0.14.x.old/tycho-compiler-plugin/pom.xml tycho-0.14.x/tycho-compiler-plugin/pom.xml ---- tycho-0.14.x.old/tycho-compiler-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-compiler-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-compiler-plugin -diff -rauN tycho-0.14.x.old/tycho-core/pom.xml tycho-0.14.x/tycho-core/pom.xml ---- tycho-0.14.x.old/tycho-core/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-core/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-core -diff -rauN tycho-0.14.x.old/tycho-embedder-api/pom.xml tycho-0.14.x/tycho-embedder-api/pom.xml ---- tycho-0.14.x.old/tycho-embedder-api/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-embedder-api/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-embedder-api -diff -rauN tycho-0.14.x.old/tycho-its/pom.xml tycho-0.14.x/tycho-its/pom.xml ---- tycho-0.14.x.old/tycho-its/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-its/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-its -diff -rauN tycho-0.14.x.old/tycho-maven-plugin/pom.xml tycho-0.14.x/tycho-maven-plugin/pom.xml ---- tycho-0.14.x.old/tycho-maven-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-maven-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-maven-plugin -diff -rauN tycho-0.14.x.old/tycho-metadata-model/pom.xml tycho-0.14.x/tycho-metadata-model/pom.xml ---- tycho-0.14.x.old/tycho-metadata-model/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-metadata-model/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-metadata-model -diff -rauN tycho-0.14.x.old/tycho-p2/pom.xml tycho-0.14.x/tycho-p2/pom.xml ---- tycho-0.14.x.old/tycho-p2/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-p2/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ tycho org.eclipse.tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-p2 -diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-director-plugin/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-director-plugin/pom.xml ---- tycho-0.14.x.old/tycho-p2/tycho-p2-director-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-p2/tycho-p2-director-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-p2 -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-p2-director-plugin -diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-facade/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-facade/pom.xml ---- tycho-0.14.x.old/tycho-p2/tycho-p2-facade/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-p2/tycho-p2-facade/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-p2 -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-p2-facade -diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-plugin/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-plugin/pom.xml ---- tycho-0.14.x.old/tycho-p2/tycho-p2-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-p2/tycho-p2-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-p2 -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-p2-plugin -diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-publisher-plugin/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-publisher-plugin/pom.xml ---- tycho-0.14.x.old/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-p2/tycho-p2-publisher-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-p2 -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-p2-publisher-plugin -diff -rauN tycho-0.14.x.old/tycho-p2/tycho-p2-repository-plugin/pom.xml tycho-0.14.x/tycho-p2/tycho-p2-repository-plugin/pom.xml ---- tycho-0.14.x.old/tycho-p2/tycho-p2-repository-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-p2/tycho-p2-repository-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-p2 -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-p2-repository-plugin -diff -rauN tycho-0.14.x.old/tycho-packaging-plugin/pom.xml tycho-0.14.x/tycho-packaging-plugin/pom.xml ---- tycho-0.14.x.old/tycho-packaging-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-packaging-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-packaging-plugin -diff -rauN tycho-0.14.x.old/tycho-pomgenerator-plugin/pom.xml tycho-0.14.x/tycho-pomgenerator-plugin/pom.xml ---- tycho-0.14.x.old/tycho-pomgenerator-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-pomgenerator-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-pomgenerator-plugin -diff -rauN tycho-0.14.x.old/tycho-release/pom.xml tycho-0.14.x/tycho-release/pom.xml ---- tycho-0.14.x.old/tycho-release/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-release/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-release -diff -rauN tycho-0.14.x.old/tycho-release/tycho-versions-plugin/pom.xml tycho-0.14.x/tycho-release/tycho-versions-plugin/pom.xml ---- tycho-0.14.x.old/tycho-release/tycho-versions-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-release/tycho-versions-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-release -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-versions-plugin -diff -rauN tycho-0.14.x.old/tycho-source-plugin/pom.xml tycho-0.14.x/tycho-source-plugin/pom.xml ---- tycho-0.14.x.old/tycho-source-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-source-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-source-plugin -diff -rauN tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -2,7 +2,7 @@ +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml ---- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-surefire -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.surefire.junit -diff -rauN tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -2,7 +2,7 @@ +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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml ---- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-surefire -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.surefire.junit4 -diff -rauN tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF ---- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-03-30 14:49:39.000000000 -0400 -@@ -7,7 +7,7 @@ +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,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.14.1 -+Bundle-Version: 0.14.1.qualifier +-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 -rauN tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml ---- tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-surefire -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT org.eclipse.tycho.surefire.osgibooter -diff -rauN tycho-0.14.x.old/tycho-surefire/pom.xml tycho-0.14.x/tycho-surefire/pom.xml ---- tycho-0.14.x.old/tycho-surefire/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-surefire/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-surefire -diff -rauN tycho-0.14.x.old/tycho-surefire/tycho-surefire-plugin/pom.xml tycho-0.14.x/tycho-surefire/tycho-surefire-plugin/pom.xml ---- tycho-0.14.x.old/tycho-surefire/tycho-surefire-plugin/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-surefire/tycho-surefire-plugin/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ org.eclipse.tycho tycho-surefire -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-surefire-plugin -diff -rauN tycho-0.14.x.old/tycho-testing-harness/pom.xml tycho-0.14.x/tycho-testing-harness/pom.xml ---- tycho-0.14.x.old/tycho-testing-harness/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ tycho-0.14.x/tycho-testing-harness/pom.xml 2012-03-30 14:49:39.000000000 -0400 +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 @@ tycho org.eclipse.tycho -- 0.14.1 -+ 0.14.1-SNAPSHOT +- 0.15.0 ++ 0.15.0-SNAPSHOT tycho-testing-harness diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch index 3265ec3..ca0efe0 100644 --- a/tycho-fix-build.patch +++ b/tycho-fix-build.patch @@ -1,23 +1,129 @@ ---- ./tycho-0.14.0.old/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java 2012-02-06 10:26:59.000000000 -0500 -+++ ./tycho-0.14.0/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java 2012-02-10 16:25:37.000000000 -0500 -@@ -37,6 +37,14 @@ - return null; +From b67b6a5ab67eea4cb69d259fb7140a54355df61d Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Tue, 12 Jun 2012 09:56:38 -0400 +Subject: [PATCH 1/4] Fix the Tycho build to work on Fedora. + +Minor fixes of limited scope needed to have Tycho building on Fedora. + +As of Fedora 17, the default JRE is JDK 1.7. This does not support +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. + +Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 +--- + pom.xml | 5 ----- + tycho-bundles/tycho-bundles-target/tycho.target | 2 -- + tycho-compiler-jdt/pom.xml | 4 ---- + .../java/org/eclipse/tycho/core/osgitools/OsgiManifest.java | 12 ++++++------ + .../tycho/core/osgitools/StandalonePluginConverterTest.java | 8 ++++---- + .../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++ + 6 files changed, 18 insertions(+), 21 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 \ + ${jdtVersion} + + +- org.eclipse.tycho +- org.eclipse.jdt.compiler.apt +- ${jdtAptVersion} +- +- + org.apache.maven.surefire + surefire-booter + 2.10 +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 @@ + + + +- +- + + + +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 @@ + org.eclipse.jdt.core + + +- org.eclipse.tycho +- org.eclipse.jdt.compiler.apt +- +- + org.codehaus.plexus + plexus-compiler-api + +diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java +index 2859ab7..993cc58 100644 +--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java ++++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java +@@ -25,7 +25,7 @@ public class OsgiManifest { + private static final ExecutionEnvironment[] EMPTY_EXEC_ENV = new ExecutionEnvironment[0]; + + private String location; +- private Headers headers; ++ private Headers headers; + + // cache for parsed values of commonly used headers + private String bundleSymbolicName; +@@ -78,7 +78,7 @@ public class OsgiManifest { } -+ 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, ---- ./tycho-0.14.0.old/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java 2012-02-06 10:26:59.000000000 -0500 -+++ ./tycho-0.14.0/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java 2012-02-10 15:39:49.723000889 -0500 -@@ -36,7 +36,7 @@ + private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException { +- String value = headers.get(headerKey); ++ String value = (String)headers.get(headerKey); + if (value == null) { + throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found"); + } +@@ -100,12 +100,12 @@ public class OsgiManifest { + && "dir".equals(bundleShapeElements[0].getValue()); + } + +- public Headers getHeaders() { ++ public Headers getHeaders() { + return headers; + } + + public String getValue(String key) { +- return headers.get(key); ++ return (String)headers.get(key); + } + + public String getBundleSymbolicName() { +@@ -141,7 +141,7 @@ public class OsgiManifest { + } + + private ManifestElement[] parseHeader(String key) { +- String value = headers.get(key); ++ String value = (String)headers.get(key); + if (value == null) { + return null; + } +@@ -154,7 +154,7 @@ public class OsgiManifest { + + public ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException { + try { +- return ManifestElement.parseHeader(key, headers.get(key)); ++ return ManifestElement.parseHeader(key, (String)headers.get(key)); + } catch (BundleException e) { + throw new OsgiManifestParserException(location, e); + } +diff --git a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java +index 42db7f6..a145c57 100644 +--- a/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java ++++ b/tycho-core/src/test/java/org/eclipse/tycho/core/osgitools/StandalonePluginConverterTest.java +@@ -36,7 +36,7 @@ public class StandalonePluginConverterTest { converter.convertManifest(new File("src/test/resources/targetplatforms/pre-3.0/plugins/testjar_1.0.0.jar"), mf, false, "3.2", true, null); Assert.assertTrue(mf.isFile()); @@ -26,7 +132,7 @@ Assert.assertEquals("testjar", headers.get("Bundle-SymbolicName")); } -@@ -44,14 +44,14 @@ +@@ -44,14 +44,14 @@ public class StandalonePluginConverterTest { public void testWriteManifest() throws PluginConversionException, BundleException, IOException { File tmpManifestFile = folder.newFile("testManifest"); Hashtable manifestToWrite = new Hashtable(); @@ -44,81 +150,25 @@ assertEquals(originalManifest.size(), writtenManifest.size()); for (Enumeration keys = writtenManifest.keys(); keys.hasMoreElements();) { String key = keys.nextElement(); ---- ./tycho-0.14.0.old/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java 2012-02-06 10:26:59.000000000 -0500 -+++ ./tycho-0.14.0/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java 2012-02-10 15:36:32.000000000 -0500 -@@ -25,7 +25,7 @@ - private static final ExecutionEnvironment[] EMPTY_EXEC_ENV = new ExecutionEnvironment[0]; - - private String location; -- private Headers headers; -+ private Headers headers; - - // cache for parsed values of commonly used headers - private String bundleSymbolicName; -@@ -78,7 +78,7 @@ +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; } - private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException { -- String value = headers.get(headerKey); -+ String value = (String)headers.get(headerKey); - if (value == null) { - throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found"); - } -@@ -100,12 +100,12 @@ - && "dir".equals(bundleShapeElements[0].getValue()); - } - -- public Headers getHeaders() { -+ public Headers getHeaders() { - return headers; - } - - public String getValue(String key) { -- return headers.get(key); -+ return (String)headers.get(key); - } - - public String getBundleSymbolicName() { -@@ -141,7 +141,7 @@ - } - - private ManifestElement[] parseHeader(String key) { -- String value = headers.get(key); -+ String value = (String)headers.get(key); - if (value == null) { - return null; - } -@@ -154,7 +154,7 @@ - - public ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException { - try { -- return ManifestElement.parseHeader(key, headers.get(key)); -+ return ManifestElement.parseHeader(key, (String)headers.get(key)); - } catch (BundleException e) { - throw new OsgiManifestParserException(location, e); - } ---- ./tycho-0.14.x.old/tycho-core/src/main/java/org/eclipse/tycho/core/utils/EEVersion.java 2012-02-24 06:40:15.000000000 -0500 -+++ ./tycho-0.14.x/tycho-core/src/main/java/org/eclipse/tycho/core/utils/EEVersion.java 2012-05-03 14:09:09.000000000 -0400 -@@ -18,7 +18,7 @@ - public enum EEType { - - // order is significant for comparison -- OSGI_MINIMUM("OSGi/Minimum"), CDC_FOUNDATION("CDC/Foundation"), JAVA_SE("JavaSE"); -+ OSGI_MINIMUM("OSGi/Minimum"), CDC_FOUNDATION("CDC/Foundation"), JRE("JRE"), JAVA_SE("JavaSE"); - - private final String profileName; - ---- ./tycho-0.14.x.old/tycho-core/src/main/java/org/eclipse/tycho/core/utils/ExecutionEnvironment.java 2012-02-24 06:40:15.000000000 -0500 -+++ ./tycho-0.14.x/tycho-core/src/main/java/org/eclipse/tycho/core/utils/ExecutionEnvironment.java 2012-05-03 14:09:09.000000000 -0400 -@@ -50,8 +50,9 @@ - - private EEVersion parseEEVersion(String systemCaps) { - if (systemCaps == null && "JRE-1.1".equals(profileName)) { -- // system capabilities entry is missing for JRE-1.1 -- return new EEVersion(Version.parseVersion("1.1"), EEType.JAVA_SE); -+ // system capabilities entry is missing for JRE-1.1 -+ // TODO remove workaround when https://bugs.eclipse.org/377277 is fixed -+ return new EEVersion(Version.parseVersion("1.1"), EEType.JRE); - } - List eeVersions = new ArrayList(); - try { ++ 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.2 + diff --git a/tycho-fix-surefire.patch b/tycho-fix-surefire.patch index 2419e2d..16f525e 100644 --- a/tycho-fix-surefire.patch +++ b/tycho-fix-surefire.patch @@ -1,7 +1,7 @@ -From 5ddb88911071664de0e07f7f247aeeaedecc8cab Mon Sep 17 00:00:00 2001 +From 35f7704c0086224e2f307f6e8d0469911d120136 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 29 May 2012 14:27:27 -0400 -Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire. +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 @@ -25,7 +25,7 @@ the additional classes that are in the original jars used upstream. 9 files changed, 31 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml -index e9d8624..ca20999 100644 +index 69e68c6..42ffc40 100644 --- a/pom.xml +++ b/pom.xml @@ -79,7 +79,7 @@ @@ -38,10 +38,10 @@ index e9d8624..ca20999 100644 1.0-beta-6 1.3 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 9264109..a27abe4 100644 +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.14.1 +@@ -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 @@ -63,7 +63,7 @@ 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 2a4afc8..ae35035 100644 +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 @@ @@ -79,10 +79,10 @@ index 2a4afc8..ae35035 100644 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 bbb54a8..82e66d1 100644 +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.14.1 +@@ -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 @@ -105,7 +105,7 @@ 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 08ab16a..2ed7c3a 100644 +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 @@ @@ -126,7 +126,7 @@ index 08ab16a..2ed7c3a 100644 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 fda57c6..ab5de08 100644 +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", @@ -136,11 +136,11 @@ index fda57c6..ab5de08 100644 - jars/surefire-api-2.10.jar + jars/surefire-api-2.10.jar, + jars/plexus-utils-3.0.jar - Bundle-Version: 0.14.1 + 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 cd5b2d7..d1d24da 100644 +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 @@ diff --git a/tycho-maven-surefire.patch b/tycho-maven-surefire.patch index e321083..76d852e 100644 --- a/tycho-maven-surefire.patch +++ b/tycho-maven-surefire.patch @@ -1,29 +1,55 @@ ---- ./tycho-0.14.x.old/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java 2012-02-24 06:40:15.000000000 -0500 -+++ ./tycho-0.14.x/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java 2012-03-09 15:52:27.000000000 -0500 -@@ -594,7 +594,7 @@ - case 0: - getLog().info("All tests passed!"); - break; -- case RunResult.NO_TESTS: -+ case 254: - String message = "No tests found."; - if (failIfNoTests) { - throw new MojoFailureException(message); ---- ./tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-02-24 06:40:15.000000000 -0500 -+++ ./tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF 2012-03-09 14:53:53.000000000 -0500 -@@ -6,7 +6,8 @@ +From 038d1819e9b9880783ce187023e1404f5ea12db7 Mon Sep 17 00:00:00 2001 +From: Roland Grunberg +Date: Tue, 12 Jun 2012 10:12:53 -0400 +Subject: [PATCH 3/4] Upstream builds against maven-surefire 2.10 but in + rawhide we have 2.12. + +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(-) + +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 +--- 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 Bundle-ClassPath: ., jars/surefire-booter-2.10.jar, jars/surefire-api-2.10.jar, - jars/plexus-utils-3.0.jar + jars/plexus-utils-3.0.jar, + jars/maven-surefire-common-2.10.jar - Bundle-Version: 0.14.1 + Bundle-Version: 0.15.0 Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation) Bundle-ManifestVersion: 2 ---- ./tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java 2012-02-24 06:40:15.000000000 -0500 -+++ ./tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/OsgiSurefireBooter.java 2012-03-09 15:44:34.000000000 -0500 -@@ -26,13 +26,14 @@ +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 +--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml ++++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml +@@ -56,6 +56,13 @@ + org.codehaus.plexus + plexus-utils + ${plexusUtilsVersion} ++ ++ ++ ++ org.apache.maven.surefire ++ maven-surefire-common ++ ${surefire-version} ++ + + + +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 +--- 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; import org.apache.maven.surefire.booter.ClassLoaderConfiguration; import org.apache.maven.surefire.booter.ProviderConfiguration; import org.apache.maven.surefire.booter.StartupConfiguration; @@ -40,7 +66,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -@@ -63,22 +64,22 @@ +@@ -63,22 +64,22 @@ public class OsgiSurefireBooter { boolean printSummary = true; boolean disableXmlReport = false; ClassLoader testClassLoader = getBundleClassLoader(plugin); @@ -68,25 +94,11 @@ startupReportConfig); RunResult result = surefireStarter.runSuitesInProcess(); ---- ./tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-02-24 06:40:15.000000000 -0500 -+++ ./tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml 2012-03-09 14:45:54.987999986 -0500 -@@ -56,6 +56,13 @@ - org.codehaus.plexus - plexus-utils - ${plexusUtilsVersion} -+ -+ -+ -+ org.apache.maven.surefire -+ maven-surefire-common -+ ${surefire-version} -+ - - - ---- ./tycho-0.14.x.old/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/TychoClasspathConfiguration.java 2012-02-24 06:40:15.000000000 -0500 -+++ ./tycho-0.14.x/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/TychoClasspathConfiguration.java 2012-05-29 16:45:39.000000000 -0400 -@@ -30,6 +30,11 @@ +diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/TychoClasspathConfiguration.java b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/TychoClasspathConfiguration.java +index c94d3ea..6c732a5 100644 +--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/TychoClasspathConfiguration.java ++++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/src/main/java/org/eclipse/tycho/surefire/osgibooter/TychoClasspathConfiguration.java +@@ -30,6 +30,11 @@ public class TychoClasspathConfiguration extends ClasspathConfiguration { } @Override @@ -98,3 +110,28 @@ public ClassLoader createTestClassLoader() throws SurefireExecutionException { 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 +--- 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 { + case 0: + getLog().info("All tests passed!"); + break; +- case RunResult.NO_TESTS: ++ case 254: + String message = "No tests found."; + if (failIfNoTests) { + throw new MojoFailureException(message); +@@ -597,7 +597,7 @@ public class TestMojo extends AbstractMojo { + getLog().warn(message); + } + break; +- case RunResult.FAILURE: ++ case 255: + String errorMessage = "There are test failures.\n\nPlease refer to " + reportsDirectory + + " for the individual test results."; + if (testFailureIgnore) { +-- +1.7.7.6 + diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index c1adedc..e44de14 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -1,6 +1,6 @@ -From 7d87e41ad0f3356b74d93be8588ef69539edcc91 Mon Sep 17 00:00:00 2001 +From 6f332ba550f5d0b29a929503b0d7ca386d337f9c Mon Sep 17 00:00:00 2001 From: Roland Grunberg -Date: Thu, 7 Jun 2012 16:41:33 -0400 +Date: Tue, 12 Jun 2012 10:38:51 -0400 Subject: [PATCH] Implement a custom resolver for Tycho in local mode. When running in local mode, dependencies should be resolved by looking @@ -16,18 +16,19 @@ 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). -Change-Id: I0609a1caecad753d811c5a93183547b33737657f +Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b --- - .../tycho/p2/target/TargetDefinitionResolver.java | 8 +++- - .../tycho/p2/target/TargetPlatformBuilderImpl.java | 5 +++ - .../core/maven/TychoMavenLifecycleParticipant.java | 15 ++++++++ - .../tycho/core/osgitools/OsgiBundleProject.java | 38 +++++++++++++++++++- - .../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 17 +++++++++ - .../p2/resolver/P2TargetPlatformResolver.java | 10 +++++ - 6 files changed, 90 insertions(+), 3 deletions(-) + .../tycho/p2/target/TargetDefinitionResolver.java | 8 +++-- + .../tycho/p2/target/TargetPlatformBuilderImpl.java | 6 ++++ + .../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++++ + .../core/osgitools/EclipseFeatureProject.java | 22 +++++++++++++ + .../tycho/core/osgitools/OsgiBundleProject.java | 38 +++++++++++++++++++++- + .../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 17 ++++++++++ + .../p2/resolver/P2TargetPlatformResolver.java | 10 ++++++ + 7 files changed, 114 insertions(+), 3 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 2d7d3b9..c628e6e 100644 +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; @@ -53,23 +54,24 @@ index 2d7d3b9..c628e6e 100644 IQueryable locationUnits = new CompoundQueryable( 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 9da87bb..5785029 100644 +index e4b4084..8d58a3c 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 -@@ -255,6 +255,11 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { - return; - } +@@ -225,6 +225,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 { - metadataRepository = metadataRepositoryManager.loadRepository(location, monitor); - metadataRepositories.add(metadataRepository); + // 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()); 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 80810d6..24efc87 100644 +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 @@ @@ -77,10 +79,10 @@ index 80810d6..24efc87 100644 import java.io.File; +import java.io.IOException; + import java.util.HashSet; import java.util.List; - - import org.apache.maven.AbstractMavenLifecycleParticipant; -@@ -51,6 +52,21 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic + import java.util.Set; +@@ -55,6 +56,21 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic registerExecutionListener(session); configureComponents(session); @@ -99,11 +101,49 @@ index 80810d6..24efc87 100644 + } + } + - List projects = session.getProjects(); for (MavenProject project : projects) { 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 +--- 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.UnknownEnvironmentException; ++import org.eclipse.tycho.core.utils.ExecutionEnvironment; ++import org.eclipse.tycho.core.utils.ExecutionEnvironmentUtils; + import org.eclipse.tycho.model.Feature; + + @Component(role = TychoProject.class, hint = org.eclipse.tycho.ArtifactKey.TYPE_ECLIPSE_FEATURE) +@@ -49,4 +52,23 @@ public class EclipseFeatureProject extends AbstractArtifactBasedProject { + Feature.loadFeature(project.getBasedir()); + } + ++ @Override ++ public ExecutionEnvironment getExecutionEnvironment(MavenProject project) { ++ ExecutionEnvironment ee = super.getExecutionEnvironment(project); ++ ++ 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; ++ } ++ + } 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 8d18453..051913e 100644 +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 @@ -201,12 +241,12 @@ index 15b3fff..c8f14df 100644 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 d4bcc9a..57ae997 100644 +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 -@@ -204,6 +204,16 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp - ee != null ? ee.getProfileName() : null, configuration.isDisableP2Mirrors()); +@@ -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) { @@ -222,5 +262,5 @@ index d4bcc9a..57ae997 100644 addOtherReactorProjectsToTargetPlatform(project, reactorProjects, tpBuilder); -- -1.7.7.6 +1.7.11.2 diff --git a/tycho.spec b/tycho.spec index b9d02fe..240d0b5 100644 --- a/tycho.spec +++ b/tycho.spec @@ -7,16 +7,15 @@ %endif Name: tycho -Version: 0.14.1 -Release: 7%{?dist} +Version: 0.15.0 +Release: 1%{?dist} Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven Group: Development/Libraries # license file is missing but all files having some licensing information are ASL 2.0 License: ASL 2.0 URL: http://tycho.sonatype.org/ -# http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.14.x.tar.bz2 -Source0: %{name}-0.14.x.tar.bz2 +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 @@ -35,9 +34,7 @@ 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. -%if %{bootstrap} Patch5: %{name}-bootstrap.patch -%endif BuildArch: noarch @@ -65,6 +62,7 @@ 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 @@ -109,11 +107,11 @@ Requires: jpackage-utils This package contains the API documentation for %{name}. %prep -%setup -q -n %{name}-0.14.x +%setup -q -n %{name}-0.15.x -%patch0 -p2 +%patch0 -p1 %patch1 -p1 -%patch2 -p2 +%patch2 -p1 %patch3 -p1 %patch4 -p1 %if %{bootstrap} @@ -130,10 +128,7 @@ popd %build export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m" -export TYCHO_TARGET_PLATFORM=%{_eclipse_base} -mvn-rpmbuild -Dmaven.local.debug=true -X -Dmaven.test.skip=true \ - -Dmaven.local.depmap.file=%{SOURCE2} \ - -Dtycho.targetPlatform=$TYCHO_TARGET_PLATFORM install javadoc:aggregate +mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} install javadoc:aggregate %install @@ -199,6 +194,10 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all %{_javadocdir}/%{name} %changelog +* Thu Jul 26 2012 Roland Grunberg 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 0.14.1-7 - Non-bootstrap build.