From 8c01993313ed29ef5b23d12b3854e7a36a264153 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Oct 19 2012 18:09:14 +0000 Subject: Update to 0.16.0 Release. --- diff --git a/.gitignore b/.gitignore index 9c24e28..3f6ae8c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,8 @@ /maven-repo.tar.bz2 -/tycho-0.10.0.tar.xz -maven-repo.tar.xz -tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz -tycho-0.14.0.tar.bz2 -/tycho-0.14.x.tar.bz2 -/tycho-0.15.x.tar.bz2 /org.eclipse.tycho-* +/tycho-*.xz +/tycho-*.bz2 +maven-repo.tar.xz *.src.rpm /noarch /.project diff --git a/sources b/sources index 5143db1..2b2ef89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6b2889160641b8470bc12fd50b3ee3fa org.eclipse.tycho-d7f8850f746dd72e0a97c1fdf32c06ce794fb83d.tar.bz2 +0707feda6deccd62248a88caa0e120a5 tycho-0.16.x.tar.bz2 diff --git a/tycho-bootstrap.patch b/tycho-bootstrap.patch index eb07ca7..74cec4b 100644 --- a/tycho-bootstrap.patch +++ b/tycho-bootstrap.patch @@ -1,867 +1,867 @@ diff --git a/pom.xml b/pom.xml -index 1868f9a..61ff701 100644 +index ed2d224..87098a2 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT pom Tycho (Incubation) diff --git a/sisu-equinox/pom.xml b/sisu-equinox/pom.xml -index d5770b2..de8536e 100644 +index de8536e..d5770b2 100644 --- a/sisu-equinox/pom.xml +++ b/sisu-equinox/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT sisu-equinox diff --git a/sisu-equinox/sisu-equinox-api/pom.xml b/sisu-equinox/sisu-equinox-api/pom.xml -index 0fefe9f..0f0b76f 100644 +index 0f0b76f..0fefe9f 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT sisu-equinox-api diff --git a/sisu-equinox/sisu-equinox-embedder/pom.xml b/sisu-equinox/sisu-equinox-embedder/pom.xml -index 08cea80..b04fe7c 100644 +index b04fe7c..08cea80 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT sisu-equinox-embedder diff --git a/sisu-equinox/sisu-equinox-launching/pom.xml b/sisu-equinox/sisu-equinox-launching/pom.xml -index 5ffa76e..7d9b6da 100644 +index 7d9b6da..5ffa76e 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT sisu-equinox-launching diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml -index a7a8629..ce749e7 100644 +index ce749e7..a7a8629 100644 --- a/target-platform-configuration/pom.xml +++ b/target-platform-configuration/pom.xml @@ -17,7 +17,7 @@ tycho org.eclipse.tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT target-platform-configuration diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml -index 11bcb70..720feb5 100644 +index 720feb5..11bcb70 100644 --- a/tycho-artifactcomparator/pom.xml +++ b/tycho-artifactcomparator/pom.xml @@ -16,7 +16,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-artifactcomparator 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 16677f5..86dae92 100644 +index 86dae92..16677f5 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.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 2cffad0..e87c76b 100644 +index e87c76b..2cffad0 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.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 22e8105..2ec4dcb 100644 +index 2ec4dcb..22e8105 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Bundle-Name: Tycho Core Maven/OSGi Shared Classes (Incubation) Bundle-Vendor: %providerName Export-Package: org.eclipse.tycho.artifacts, diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml -index dac02f4..050d6ba 100644 +index 050d6ba..dac02f4 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.core.shared 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 c418a01..6807552 100644 +index 6807552..c418a01 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Bundle-Name: Tycho Embedder API Maven/OSGi Shared Classes (Incubation) Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml -index c7702de..d2e77ed 100644 +index d2e77ed..c7702de 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.embedder.shared 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 0d6d0d2..665eb95 100644 +index 665eb95..0d6d0d2 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Require-Bundle: org.eclipse.equinox.security;bundle-version="1.0.100" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml -index 1d71dbb..2aa0e42 100644 +index 2aa0e42..1d71dbb 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.noopsecurity 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 9ac1b2c..4f71bc1 100644 +index 4f71bc1..9ac1b2c 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: J2SE-1.5 Fragment-Host: 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 296a0f6..85310b8 100644 +index 85310b8..296a0f6 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.p2.maven.repository.tests 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 f4b71b6..5a23f51 100644 +index 5a23f51..f4b71b6 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.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 15ac2aa..6bc1516 100644 +index 6bc1516..15ac2aa 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT 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 8fd7fbb..b4608ea 100644 +index b4608ea..8fd7fbb 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Fragment-Host: org.eclipse.tycho.p2.resolver.impl Require-Bundle: org.junit4, diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml -index ef860c8..3f2e02a 100644 +index 3f2e02a..ef860c8 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.p2.resolver.impl.test 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 4385b6e..ea64604 100644 +index 861d2d3..9a32ccf 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.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 56fd319..c5ce76b 100644 +index c5ce76b..56fd319 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.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 7650b0a..1334979 100644 +index 5c2c2c2..dd29ccd 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Bundle-Name: Tycho p2 Resolver Maven/OSGi Shared Classes (Incubation) Bundle-ManifestVersion: 2 Bundle-Description: Tycho integrates Maven with Eclipse and OSGi diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml -index 7f3d500..c487ff1 100644 +index c487ff1..7f3d500 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.p2.resolver.shared 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 50637e7..9fdeedd 100644 +index d784af5..4cadf4e 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Bundle-Name: Tycho p2 Tools Bundle (Incubation) Bundle-ManifestVersion: 2 Bundle-Description: Implementation of tools for generating, copying, and using p2 repositories in Tycho diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml -index 98cb0bf..ae6eb2c 100644 +index ae6eb2c..98cb0bf 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.p2.tools.impl 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 cddb8c5..db3c200 100644 +index db3c200..cddb8c5 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Bundle-Name: Tycho p2 Tools Maven/OSGi Shared Classes (Incubation) Bundle-ManifestVersion: 2 Bundle-Description: Exposes tools for manipulating p2 data, which are implemented in OSGi bundles, to Maven plug-ins diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml -index 53ed0f0..32bf52a 100644 +index 32bf52a..53ed0f0 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.p2.tools.shared 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 c24cd6c..7f07fca 100644 +index 7f07fca..c24cd6c 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Fragment-Host: org.eclipse.tycho.p2.tools.impl Require-Bundle: org.junit;bundle-version="[4.8.1,5.0.0)", diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml -index 1fc80fc..7abd0c4 100644 +index 7abd0c4..1fc80fc 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.p2.tools.tests 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 285ebe7..7a2e68c 100644 +index 7a2e68c..285ebe7 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.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 9d3b589..50998ae 100644 +index 50998ae..9d3b589 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.test.utils diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml -index 8e4f857..6071dc1 100644 +index 6071dc1..8e4f857 100644 --- a/tycho-bundles/pom.xml +++ b/tycho-bundles/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-bundles diff --git a/tycho-bundles/tycho-bundles-external/pom.xml b/tycho-bundles/tycho-bundles-external/pom.xml -index 46f50a4..aa0b727 100644 +index aa0b727..46f50a4 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-bundles-external diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product -index 8b54310..9e53672 100644 +index 9e53672..8b54310 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 --git a/tycho-bundles/tycho-bundles-target/pom.xml b/tycho-bundles/tycho-bundles-target/pom.xml -index ab65018..8027cd7 100644 +index 8027cd7..ab65018 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT .. diff --git a/tycho-bundles/tycho-standalone-p2-director/pom.xml b/tycho-bundles/tycho-standalone-p2-director/pom.xml -index c8fd41b..f5e7e8d 100644 +index f5e7e8d..c8fd41b 100644 --- a/tycho-bundles/tycho-standalone-p2-director/pom.xml +++ b/tycho-bundles/tycho-standalone-p2-director/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho-bundles -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-standalone-p2-director diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml -index c373e6a..712e431 100644 +index 712e431..c373e6a 100644 --- a/tycho-compiler-jdt/pom.xml +++ b/tycho-compiler-jdt/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-compiler-jdt diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml -index 48086c8..6fe696f 100644 +index 6fe696f..48086c8 100644 --- a/tycho-compiler-plugin/pom.xml +++ b/tycho-compiler-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-compiler-plugin diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml -index b3aa4b1..c3d5288 100644 +index c3d5288..b3aa4b1 100644 --- a/tycho-core/pom.xml +++ b/tycho-core/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-core diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml -index 8221ee1..bffb15a 100644 +index bffb15a..8221ee1 100644 --- a/tycho-embedder-api/pom.xml +++ b/tycho-embedder-api/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-embedder-api diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml -index 5c56be6..030888b 100644 +index 030888b..5c56be6 100644 --- a/tycho-its/pom.xml +++ b/tycho-its/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-its diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml -index d0f4887..bf3448f 100644 +index bf3448f..d0f4887 100644 --- a/tycho-maven-plugin/pom.xml +++ b/tycho-maven-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-maven-plugin diff --git a/tycho-metadata-model/pom.xml b/tycho-metadata-model/pom.xml -index 3c294ce..940ab1a 100644 +index 940ab1a..3c294ce 100644 --- a/tycho-metadata-model/pom.xml +++ b/tycho-metadata-model/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-metadata-model diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml -index 69fd0cc..1beff0b 100644 +index 1beff0b..69fd0cc 100644 --- a/tycho-p2/pom.xml +++ b/tycho-p2/pom.xml @@ -17,7 +17,7 @@ tycho org.eclipse.tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-p2 diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml -index 8e69cea..9f5ea22 100644 +index 9f5ea22..8e69cea 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-p2-director-plugin diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml -index 9dea239..9a6d1e8 100644 +index 9a6d1e8..9dea239 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-p2-facade diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml -index bcaa69d..549c9ae 100644 +index 549c9ae..bcaa69d 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-p2-plugin diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml -index 3e633db..f412b33 100644 +index f412b33..3e633db 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-p2-publisher-plugin diff --git a/tycho-p2/tycho-p2-repository-plugin/pom.xml b/tycho-p2/tycho-p2-repository-plugin/pom.xml -index 608b023..d018877 100644 +index d018877..608b023 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-p2-repository-plugin diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml -index de329c9..7e72161 100644 +index 7e72161..de329c9 100644 --- a/tycho-packaging-plugin/pom.xml +++ b/tycho-packaging-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-packaging-plugin diff --git a/tycho-pomgenerator-plugin/pom.xml b/tycho-pomgenerator-plugin/pom.xml -index 8447652..01ac8bc 100644 +index 01ac8bc..8447652 100644 --- a/tycho-pomgenerator-plugin/pom.xml +++ b/tycho-pomgenerator-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-pomgenerator-plugin diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml -index 304c0a6..5c331ca 100644 +index 5c331ca..304c0a6 100644 --- a/tycho-release/pom.xml +++ b/tycho-release/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-release diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml -index 6b5d4fe..5cd1956 100644 +index 5cd1956..6b5d4fe 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-versions-plugin diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml -index b0f47ca..206a28d 100644 +index 206a28d..b0f47ca 100644 --- a/tycho-source-plugin/pom.xml +++ b/tycho-source-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-source-plugin 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 73c0ef9..dc89431 100644 +index ad76bc9..264dedd 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++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 diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml -index 188c45c..9ff127c 100644 +index 9ff127c..188c45c 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.surefire.junit 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 85ecad7..0227c8c 100644 +index 916938b..4e46d83 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.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++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 diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml -index ecf287c..4701d48 100644 +index 4701d48..ecf287c 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.surefire.junit4 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 8176947..fb00291 100644 +index d0ddf01..f77581e 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 +-Bundle-Version: 0.16.0 ++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: ., diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml -index dd3b995..df730e1 100644 +index df730e1..dd3b995 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 @@ org.eclipse.tycho tycho-surefire -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.surefire.junit47 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 92eaa7f..7f3481e 100644 +index 51abc8d..d893a61 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.12.3.jar, - jars/maven-surefire-common-2.12.3.jar, + jars/surefire-api-2.12.4.jar, + jars/maven-surefire-common-2.12.4.jar, jars/plexus-utils-3.0.jar --Bundle-Version: 0.16.0.qualifier -+Bundle-Version: 0.16.0 +-Bundle-Version: 0.16.0 ++Bundle-Version: 0.16.0.qualifier Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation) Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.tycho.surefire.osgibooter;singleton:=true diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml -index ef1cbcc..23829a2 100644 +index 23829a2..ef1cbcc 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT org.eclipse.tycho.surefire.osgibooter diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml -index a3ff67f..79a1a2d 100644 +index 24e51d3..a7c914d 100644 --- a/tycho-surefire/pom.xml +++ b/tycho-surefire/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-surefire diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml -index e24eb32..2970388 100644 +index 2970388..e24eb32 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.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-surefire-plugin diff --git a/tycho-testing-harness/pom.xml b/tycho-testing-harness/pom.xml -index d2d0250..3bc2251 100644 +index 3bc2251..d2d0250 100644 --- a/tycho-testing-harness/pom.xml +++ b/tycho-testing-harness/pom.xml @@ -17,7 +17,7 @@ tycho org.eclipse.tycho -- 0.16.0-SNAPSHOT -+ 0.16.0 +- 0.16.0 ++ 0.16.0-SNAPSHOT tycho-testing-harness diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch index c4ab83c..03a99ea 100644 --- a/tycho-fix-build.patch +++ b/tycho-fix-build.patch @@ -1,7 +1,7 @@ -From e82aad8024d9cddf6e997292c190cf4347f773ce Mon Sep 17 00:00:00 2001 +From 1f2c5e307b8d8d2a46ee5eb32359e33d9db3c225 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 12 Jun 2012 09:56:38 -0400 -Subject: [PATCH] Fix the Tycho build to work on Fedora. +Subject: [PATCH 1/4] Fix the Tycho build to work on Fedora. Minor fixes of limited scope needed to have Tycho building on Fedora. @@ -18,6 +18,7 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 --- pom.xml | 5 ----- tycho-artifactcomparator/pom.xml | 4 ++-- + .../eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.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 - @@ -25,13 +26,13 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 .../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++- .../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------ .../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++ - 9 files changed, 18 insertions(+), 24 deletions(-) + 10 files changed, 19 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml -index dc7c1f5..1868f9a 100644 +index afe83e3..ed2d224 100644 --- a/pom.xml +++ b/pom.xml -@@ -221,11 +221,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \ +@@ -226,11 +226,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \ ${jdtVersion} @@ -44,7 +45,7 @@ index dc7c1f5..1868f9a 100644 surefire-booter 2.10 diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml -index 775107a..11bcb70 100644 +index 0a4ed6d..720feb5 100644 --- a/tycho-artifactcomparator/pom.xml +++ b/tycho-artifactcomparator/pom.xml @@ -24,7 +24,7 @@ @@ -63,8 +64,21 @@ index 775107a..11bcb70 100644 - \ No newline at end of file + +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java +index 87c9e11..927cea5 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java +@@ -59,7 +59,7 @@ class CustomEEResolutionHandler extends ExecutionEnvironmentResolutionHandler { + String name = capability.getName(); + String version = capability.getVersion().toString(); + +- if (JREAction.NAMESPACE_OSGI_EE.equals(namespace)) { ++ if ("osgi.ee".equals(namespace)) { + result.add(new SystemCapability(Type.OSGI_EE, name, version)); + } else if (PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE.equals(namespace)) { + result.add(new SystemCapability(Type.JAVA_PACKAGE, name, version)); 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 +index b12ff8c..9e53672 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 @@ @@ -76,18 +90,18 @@ index 3e584f5..8b54310 100644 diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target -index d23b885..1437dbd 100644 +index 3436ba6..da4da36 100644 --- a/tycho-bundles/tycho-bundles-target/tycho.target +++ b/tycho-bundles/tycho-bundles-target/tycho.target -@@ -4,10 +4,6 @@ - +@@ -2,10 +2,6 @@ + - -- -- -- -- - + +- +- +- +- + diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product @@ -103,7 +117,7 @@ index dd80b5e..797b4ba 100644 diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml -index 01b9a9e..c373e6a 100644 +index 4212cbb..712e431 100644 --- a/tycho-compiler-jdt/pom.xml +++ b/tycho-compiler-jdt/pom.xml @@ -38,10 +38,6 @@ @@ -174,5 +188,5 @@ index a9d80d3..3ddbe9c 100644 throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, -- -1.7.11.4 +1.7.11.7 diff --git a/tycho-fix-surefire.patch b/tycho-fix-surefire.patch index da4604f..37643c4 100644 --- a/tycho-fix-surefire.patch +++ b/tycho-fix-surefire.patch @@ -1,7 +1,7 @@ -From e0f650e736c27c6872082a153561c0739b19edc7 Mon Sep 17 00:00:00 2001 +From 58563564e8c97ac3d25daff9f15812ade423ea6b Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Fri, 21 Sep 2012 10:58:09 -0400 -Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire. +Subject: [PATCH 3/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 @@ -24,21 +24,21 @@ Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF -index 66c569d..73c0ef9 100644 +index 4be0ccf..ad76bc9 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.16.0.qualifier +@@ -6,6 +6,7 @@ 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 -Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)" --Bundle-ClassPath: jars/surefire-junit3-2.12.3.jar +-Bundle-ClassPath: jars/surefire-junit3-2.12.4.jar +Require-Bundle: org.junit;bundle-version="[3.8.0,4.9.0)" -+Bundle-ClassPath: jars/surefire-junit3-2.12.3.jar, -+ jars/common-junit3-2.12.3.jar ++Bundle-ClassPath: jars/surefire-junit3-2.12.4.jar, ++ jars/common-junit3-2.12.4.jar Bundle-Vendor: %providerName diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml -index f9feec9..188c45c 100644 +index dce4c4f..9ff127c 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml @@ -44,6 +44,11 @@ @@ -54,22 +54,22 @@ index f9feec9..188c45c 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 8acb207..85ecad7 100644 +index 774a85f..916938b 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.16.0.qualifier +@@ -6,7 +6,9 @@ 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 --Bundle-ClassPath: jars/surefire-junit4-2.12.3.jar -+Bundle-ClassPath: jars/surefire-junit4-2.12.3.jar, -+ jars/common-junit3-2.12.3.jar, -+ jars/common-junit4-2.12.3.jar +-Bundle-ClassPath: jars/surefire-junit4-2.12.4.jar ++Bundle-ClassPath: jars/surefire-junit4-2.12.4.jar, ++ jars/common-junit3-2.12.4.jar, ++ jars/common-junit4-2.12.4.jar Import-Package: junit.framework;version="3.0.0", org.junit;version="4.0.0", org.junit.runner;version="4.0.0", diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml -index f1f821e..ecf287c 100644 +index 92ba3fb..4701d48 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml @@ -44,6 +44,16 @@ @@ -90,22 +90,22 @@ index f1f821e..ecf287c 100644 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 50ed65d..8176947 100644 +index 9e16141..d0ddf01 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF @@ -8,7 +8,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: ., - jars/surefire-junit47-2.12.3.jar, - jars/common-junit48-2.12.3.jar, -- jars/surefire-grouper-2.12.3.jar -+ jars/surefire-grouper-2.12.3.jar, -+ jars/common-junit3-2.12.3.jar, -+ jars/common-junit4-2.12.3.jar + jars/surefire-junit47-2.12.4.jar, + jars/common-junit48-2.12.4.jar, +- jars/surefire-grouper-2.12.4.jar ++ jars/surefire-grouper-2.12.4.jar, ++ jars/common-junit3-2.12.4.jar, ++ jars/common-junit4-2.12.4.jar Import-Package: junit.framework;version="3.0.0", org.junit;version="[4.7,5)", org.junit.runner;version="[4.7,5)", diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml -index 623631d..dd3b995 100644 +index 45b5c65..df730e1 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml @@ -54,6 +54,16 @@ @@ -126,5 +126,5 @@ index 623631d..dd3b995 100644 -- -1.7.11.4 +1.7.11.7 diff --git a/tycho-maven-surefire.patch b/tycho-maven-surefire.patch index 65ede3c..20bdc83 100644 --- a/tycho-maven-surefire.patch +++ b/tycho-maven-surefire.patch @@ -1,8 +1,8 @@ -From fadaca9cd7c89634ee6bf0676fdf6cb0a0013f3a Mon Sep 17 00:00:00 2001 +From a8596cd76899fd684fa7ad21ef6fbda17dd0e7ef Mon Sep 17 00:00:00 2001 From: Jan Sievers Date: Tue, 4 Sep 2012 16:02:52 +0200 -Subject: [PATCH 1/3] POC 386481 update maven surefire to latest version - 2.12.3 +Subject: [PATCH 2/4] POC 386481 update maven surefire to latest version + 2.12.4 while SUREFIRE-825 and SUREFIRE-876 are fixed, there are several new problems: @@ -43,7 +43,7 @@ Change-Id: Ibcb439a24add880c4cdafe67b42e29ca3cb14ff1 delete mode 100644 tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreRunListener.java 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 c9281d6..66c569d 100644 +index ada8852..4be0ccf 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 @@ -7,5 +7,5 @@ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0" @@ -51,7 +51,7 @@ index c9281d6..66c569d 100644 JavaSE-1.6 Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)" -Bundle-ClassPath: jars/surefire-junit3-2.10.jar -+Bundle-ClassPath: jars/surefire-junit3-2.12.3.jar ++Bundle-ClassPath: jars/surefire-junit3-2.12.4.jar Bundle-Vendor: %providerName diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties b/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties index 499ce76..fe88b19 100644 @@ -65,15 +65,15 @@ index 499ce76..fe88b19 100644 + jars/,\ plugin.properties 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 c7ba8a9..8acb207 100644 +index ac40634..774a85f 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,7 @@ Bundle-Version: 0.16.0.qualifier +@@ -6,7 +6,7 @@ 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 -Bundle-ClassPath: jars/surefire-junit4-2.10.jar -+Bundle-ClassPath: jars/surefire-junit4-2.12.3.jar ++Bundle-ClassPath: jars/surefire-junit4-2.12.4.jar Import-Package: junit.framework;version="3.0.0", org.junit;version="4.0.0", org.junit.runner;version="4.0.0", @@ -89,17 +89,17 @@ index b787149..fe88b19 100644 + jars/,\ plugin.properties 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 14fb3ff..50ed65d 100644 +index 578ad2c..9e16141 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,11 +6,14 @@ Bundle-Version: 0.16.0.qualifier +@@ -6,11 +6,14 @@ Bundle-Version: 0.16.0 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.12.3.jar, -+ jars/common-junit48-2.12.3.jar, -+ jars/surefire-grouper-2.12.3.jar ++ jars/surefire-junit47-2.12.4.jar, ++ jars/common-junit48-2.12.4.jar, ++ jars/surefire-grouper-2.12.4.jar Import-Package: junit.framework;version="3.0.0", org.junit;version="[4.7,5)", org.junit.runner;version="[4.7,5)", @@ -124,7 +124,7 @@ index 716961d..2589258 100644 about_files/ -source.. = src/ diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml -index 61beabb..623631d 100644 +index 44c3e8a..45b5c65 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 @@ @@ -383,7 +383,7 @@ index fb6bede..0000000 - -} 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 9c418b3..92eaa7f 100644 +index 00f8fee..51abc8d 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 @@ -4,8 +4,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2", @@ -392,15 +392,15 @@ index 9c418b3..92eaa7f 100644 Bundle-ClassPath: ., - jars/surefire-booter-2.10.jar, - jars/surefire-api-2.10.jar -+ jars/surefire-booter-2.12.3.jar, -+ jars/surefire-api-2.12.3.jar, -+ jars/maven-surefire-common-2.12.3.jar, ++ jars/surefire-booter-2.12.4.jar, ++ jars/surefire-api-2.12.4.jar, ++ jars/maven-surefire-common-2.12.4.jar, + jars/plexus-utils-3.0.jar - Bundle-Version: 0.16.0.qualifier + Bundle-Version: 0.16.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 9582aef..ef1cbcc 100644 +index 100806a..23829a2 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml @@ -52,6 +52,16 @@ @@ -505,7 +505,7 @@ index 791221b..736e4a7 100644 * See TestMojo#mergeProviderProperties */ diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml -index fe415d7..a3ff67f 100644 +index eab06be..24e51d3 100644 --- a/tycho-surefire/pom.xml +++ b/tycho-surefire/pom.xml @@ -26,7 +26,7 @@ @@ -513,12 +513,12 @@ index fe415d7..a3ff67f 100644 - 2.10 -+ 2.12.3 ++ 2.12.4 diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml -index a9e2f1d..e24eb32 100644 +index 8a099eb..2970388 100644 --- a/tycho-surefire/tycho-surefire-plugin/pom.xml +++ b/tycho-surefire/tycho-surefire-plugin/pom.xml @@ -96,5 +96,10 @@ @@ -533,7 +533,7 @@ index a9e2f1d..e24eb32 100644 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 77288dd..74efa24 100644 +index a676571..112131d 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 @@ -18,6 +18,7 @@ import java.io.IOException; @@ -556,7 +556,7 @@ index 77288dd..74efa24 100644 import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; import org.codehaus.plexus.util.FileUtils; -@@ -626,6 +628,27 @@ public class TestMojo extends AbstractMojo { +@@ -628,6 +630,27 @@ public class TestMojo extends AbstractMojo { providerProperties.put("perCoreThreadCount", String.valueOf(perCoreThreadCount)); providerProperties.put("useUnlimitedThreads", String.valueOf(useUnlimitedThreads)); } @@ -584,7 +584,7 @@ index 77288dd..74efa24 100644 for (Map.Entry entry : providerProperties.entrySet()) { surefireProps.put("__provider." + entry.getKey(), entry.getValue()); } -@@ -670,7 +693,7 @@ public class TestMojo extends AbstractMojo { +@@ -672,7 +695,7 @@ public class TestMojo extends AbstractMojo { case 0: getLog().info("All tests passed!"); break; @@ -593,7 +593,7 @@ index 77288dd..74efa24 100644 String message = "No tests found."; if (failIfNoTests) { throw new MojoFailureException(message); -@@ -678,7 +701,7 @@ public class TestMojo extends AbstractMojo { +@@ -680,7 +703,7 @@ public class TestMojo extends AbstractMojo { getLog().warn(message); } break; @@ -616,5 +616,5 @@ index 8358883..625b6fc 100644 public Version getVersion() { -- -1.7.11.4 +1.7.11.7 diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index f1d72da..032594e 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -1,7 +1,7 @@ -From 4df42326a0bc35ec82cda69c5d74e9b5d55d30d7 Mon Sep 17 00:00:00 2001 +From ca217d64af47188160fa99bec91b89a1f577f700 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Tue, 12 Jun 2012 10:38:51 -0400 -Subject: [PATCH] Implement a custom resolver for Tycho in local mode. +Subject: [PATCH 4/4] Implement a custom resolver for Tycho in local mode. When running in local mode, dependencies should be resolved by looking on the local system. Remote repositories should be ignored unless @@ -60,7 +60,7 @@ index 5cc8718..5513dda 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 d1cd5da..1cc4050 100644 +index 9265839..cdae9e7 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 @@ -38,6 +38,9 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent; @@ -73,7 +73,7 @@ index d1cd5da..1cc4050 100644 import org.eclipse.equinox.p2.query.IQueryResult; import org.eclipse.equinox.p2.query.QueryUtil; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; -@@ -231,6 +234,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { +@@ -224,6 +227,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { IMetadataRepository metadataRepository = null; IArtifactRepository artifactRepository = null; @@ -86,7 +86,7 @@ index d1cd5da..1cc4050 100644 try { remoteRepositoryIdManager.addMapping(location.getId(), location.getURL()); -@@ -367,12 +376,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { +@@ -364,12 +373,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { result.addAll(contentPart.getUnits()); } @@ -283,7 +283,7 @@ index fb73469..efe97ae 100644 } 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 e5efab5..8628d7a 100644 +index 5c4a26f..9f93b3b 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java @@ -64,7 +64,10 @@ public class DefaultTargetPlatformConfigurationReader { @@ -339,7 +339,7 @@ index 9935c5f..0885aea 100644 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 0d4d61e..ef3264d 100644 +index 2ce9113..48e690a 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 @@ -191,6 +191,16 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp @@ -360,5 +360,5 @@ index 0d4d61e..ef3264d 100644 addOtherReactorProjectsToTargetPlatform(project, reactorProjects, tpBuilder); -- -1.7.11.4 +1.7.11.7 diff --git a/tycho.spec b/tycho.spec index 2a8b654..d2b0108 100644 --- a/tycho.spec +++ b/tycho.spec @@ -1,4 +1,3 @@ -%global sha d7f8850f746dd72e0a97c1fdf32c06ce794fb83d # When building version under development (non-release) # %%global snap -SNAPSHOT @@ -6,14 +5,14 @@ Name: tycho Version: 0.16.0 -Release: 12.d7f885%{?dist} +Release: 13%{?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/org.eclipse.tycho-%{sha}.tar.bz2 +Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.16.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 @@ -54,7 +53,6 @@ BuildRequires: maven-shared-osgi BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-provider-junit BuildRequires: maven-surefire-provider-junit4 -BuildRequires: maven-verifier-plugin BuildRequires: objectweb-asm4 BuildRequires: plexus-containers-component-metadata BuildRequires: eclipse-jdt @@ -108,7 +106,7 @@ Requires: jpackage-utils This package contains the API documentation for %{name}. %prep -%setup -q -n org.eclipse.tycho-%{sha} +%setup -q -n %{name}-0.16.x %patch0 -p1 %patch1 -p1 @@ -211,6 +209,10 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all %{_javadocdir}/%{name} %changelog +* Wed Oct 17 2012 Roland Grunberg 0.16.0-13 +- Build Tycho properly in one RPM build. +- Update to 0.16.0 Release. + * Thu Oct 11 2012 Roland Grunberg 0.16.0-12.d7f885 - Non-bootstrap build.