diff --git a/sources b/sources index 9374a3d..720ab34 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ ac8c931e958eb696da26f82eeb10ffea maven-repo.tar.xz -336c6a9cae94df32da549e8fb7ce7473 org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab.tar.bz2 +7f89f1b9b37cca4977a7c839abfd31fd tycho-0.17.x.tar.bz2 diff --git a/tycho-bootstrap.patch b/tycho-bootstrap.patch index da147f4..c60e202 100644 --- a/tycho-bootstrap.patch +++ b/tycho-bootstrap.patch @@ -1,867 +1,867 @@ diff --git a/pom.xml b/pom.xml -index 41e8bdf..6c04bfd 100644 +index 2822951..3ca551f 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT pom Tycho (Incubation) diff --git a/sisu-equinox/pom.xml b/sisu-equinox/pom.xml -index b7db347..63dc8de 100644 +index 63dc8de..b7db347 100644 --- a/sisu-equinox/pom.xml +++ b/sisu-equinox/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT sisu-equinox diff --git a/sisu-equinox/sisu-equinox-api/pom.xml b/sisu-equinox/sisu-equinox-api/pom.xml -index 9adad77..faaa7e0 100644 +index faaa7e0..9adad77 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT sisu-equinox-api diff --git a/sisu-equinox/sisu-equinox-embedder/pom.xml b/sisu-equinox/sisu-equinox-embedder/pom.xml -index 4f3268d..c4faf98 100644 +index c4faf98..4f3268d 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT sisu-equinox-embedder diff --git a/sisu-equinox/sisu-equinox-launching/pom.xml b/sisu-equinox/sisu-equinox-launching/pom.xml -index 6742941..1f58fe0 100644 +index 1f58fe0..6742941 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT sisu-equinox-launching diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml -index 67beabe..47c20ea 100644 +index 47c20ea..67beabe 100644 --- a/target-platform-configuration/pom.xml +++ b/target-platform-configuration/pom.xml @@ -17,7 +17,7 @@ tycho org.eclipse.tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT target-platform-configuration diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml -index 5fa695c..01815d8 100644 +index cd0fb9a..27e15a9 100644 --- a/tycho-artifactcomparator/pom.xml +++ b/tycho-artifactcomparator/pom.xml @@ -16,7 +16,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 cd6303d..2fd877c 100644 +index 2fd877c..cd6303d 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 011f8d9..0623476 100644 +index 0623476..011f8d9 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 c72f2e5..b55f695 100644 +index b55f695..c72f2e5 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 333f4be..1feed73 100644 +index 1feed73..333f4be 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 e3a119e..8af27eb 100644 +index 8af27eb..e3a119e 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 8cc7d93..92692cc 100644 +index 92692cc..8cc7d93 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 898d6c0..ebadfd1 100644 +index ebadfd1..898d6c0 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 1d2ce7e..45e0acd 100644 +index 45e0acd..1d2ce7e 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 fc38d0c..99454f8 100644 +index c66eee6..fde01c0 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 1b267cb..42b3819 100644 +index 42b3819..1b267cb 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 3bc2ac0..4e489de 100644 +index 4e489de..3bc2ac0 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 3700864..236aefa 100644 +index 236aefa..3700864 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 0af92d6..a9601a7 100644 +index a9601a7..0af92d6 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.0.qualifier Bundle-RequiredExecutionEnvironment: J2SE-1.5 Fragment-Host: org.eclipse.tycho.p2.resolver.impl Require-Bundle: org.junit, 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 47e308d..95eda35 100644 +index 95eda35..47e308d 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 f17107d..8eedc97 100644 +index 8eedc97..f17107d 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 f9ec095..8ce7fe1 100644 +index 8ce7fe1..f9ec095 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 06f8b77..21597cd 100644 +index 21597cd..06f8b77 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 cd41d86..172129b 100644 +index 172129b..cd41d86 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 d337405..e546847 100644 +index e546847..d337405 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 f3e3154..eb40f79 100644 +index eb40f79..f3e3154 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 766dc78..d6a3c0f 100644 +index d6a3c0f..766dc78 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 8f4600f..155792f 100644 +index 155792f..8f4600f 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 ea9d748..bff6996 100644 +index bff6996..ea9d748 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 a69e064..0f5158d 100644 +index 0f5158d..a69e064 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 5e6ab7e..4c24309 100644 +index 4c24309..5e6ab7e 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 c207704..d8d4aee 100644 +index d8d4aee..c207704 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT org.eclipse.tycho.test.utils diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml -index dc44c77..386414d 100644 +index 386414d..dc44c77 100644 --- a/tycho-bundles/pom.xml +++ b/tycho-bundles/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-bundles diff --git a/tycho-bundles/tycho-bundles-external/pom.xml b/tycho-bundles/tycho-bundles-external/pom.xml -index 5e977b8..3207f9f 100644 +index 3207f9f..5e977b8 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 4733ad0..466aba6 100644 +index 9bc34bb..7316053 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 76fca16..52ba169 100644 +index 52ba169..76fca16 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT .. diff --git a/tycho-bundles/tycho-standalone-p2-director/pom.xml b/tycho-bundles/tycho-standalone-p2-director/pom.xml -index b6b0c9b..acaa17e 100644 +index acaa17e..b6b0c9b 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-standalone-p2-director diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml -index 8a12fde..fa6c17c 100644 +index 3857d62..9872fd7 100644 --- a/tycho-compiler-jdt/pom.xml +++ b/tycho-compiler-jdt/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-compiler-jdt diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml -index 0c8160b..6695f26 100644 +index 6695f26..0c8160b 100644 --- a/tycho-compiler-plugin/pom.xml +++ b/tycho-compiler-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-compiler-plugin diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml -index 1c4f3a8..4d06441 100644 +index 95f31fc..6f936b9 100644 --- a/tycho-core/pom.xml +++ b/tycho-core/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-core diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml -index 11a2063..cf3a53d 100644 +index cf3a53d..11a2063 100644 --- a/tycho-embedder-api/pom.xml +++ b/tycho-embedder-api/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-embedder-api diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml -index 504c4bd..4a296d5 100644 +index 4a296d5..504c4bd 100644 --- a/tycho-its/pom.xml +++ b/tycho-its/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-its diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml -index 2f8d41b..d54aa09 100644 +index d54aa09..2f8d41b 100644 --- a/tycho-maven-plugin/pom.xml +++ b/tycho-maven-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-maven-plugin diff --git a/tycho-metadata-model/pom.xml b/tycho-metadata-model/pom.xml -index 9ea1262..0b2da1b 100644 +index 0b2da1b..9ea1262 100644 --- a/tycho-metadata-model/pom.xml +++ b/tycho-metadata-model/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-metadata-model diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml -index fd0b562..a8a996b 100644 +index a8a996b..fd0b562 100644 --- a/tycho-p2/pom.xml +++ b/tycho-p2/pom.xml @@ -17,7 +17,7 @@ tycho org.eclipse.tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 c195fb0..8243628 100644 +index 8243628..c195fb0 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 eb24017..b0d9910 100644 +index b0d9910..eb24017 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-p2-facade diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml -index 9d30f82..7f17f2e 100644 +index 7f17f2e..9d30f82 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 74bca61..a4d6464 100644 +index a4d6464..74bca61 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 e0d2387..3b83a27 100644 +index 3b83a27..e0d2387 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-p2-repository-plugin diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml -index 5f31f6f..babc099 100644 +index babc099..5f31f6f 100644 --- a/tycho-packaging-plugin/pom.xml +++ b/tycho-packaging-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-packaging-plugin diff --git a/tycho-pomgenerator-plugin/pom.xml b/tycho-pomgenerator-plugin/pom.xml -index 2335234..521489b 100644 +index 521489b..2335234 100644 --- a/tycho-pomgenerator-plugin/pom.xml +++ b/tycho-pomgenerator-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-pomgenerator-plugin diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml -index 8094816..c531618 100644 +index c531618..8094816 100644 --- a/tycho-release/pom.xml +++ b/tycho-release/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-release diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml -index e3444f6..d066280 100644 +index d066280..e3444f6 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-versions-plugin diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml -index 2d0fa37..b15fe71 100644 +index b15fe71..2d0fa37 100644 --- a/tycho-source-plugin/pom.xml +++ b/tycho-source-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 f9c5bc1..e1afc7e 100644 +index 5274861..6d0559a 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 cbeeaf0..a15c972 100644 +index 51cb8af..42c4a97 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 fa146d5..1b27a6c 100644 +index 890a069..de18fd6 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 d88a349..bcb4d39 100644 +index c526a3a..71ba06e 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 29a160d..a4831a6 100644 +index 3a83088..752b471 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.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 eb9104e..678fb0c 100644 +index 10f68c1..6a7f598 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.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 4913119..ceb4814 100644 +index d035572..24107e1 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.13.jar, jars/maven-surefire-common-2.13.jar, jars/plexus-utils-3.0.jar --Bundle-Version: 0.17.0.qualifier -+Bundle-Version: 0.17.0 +-Bundle-Version: 0.17.0 ++Bundle-Version: 0.17.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 555eef8..9ac6c89 100644 +index d9f9263..bb5ba5e 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT org.eclipse.tycho.surefire.osgibooter diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml -index 985e8f3..4f9d39f 100644 +index 16534eb..aab6422 100644 --- a/tycho-surefire/pom.xml +++ b/tycho-surefire/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-surefire diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml -index de9f60d..d620d92 100644 +index d47ad8d..2f8c3fa 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.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-surefire-plugin diff --git a/tycho-testing-harness/pom.xml b/tycho-testing-harness/pom.xml -index 8eee619..074ab6d 100644 +index 074ab6d..8eee619 100644 --- a/tycho-testing-harness/pom.xml +++ b/tycho-testing-harness/pom.xml @@ -17,7 +17,7 @@ tycho org.eclipse.tycho -- 0.17.0-SNAPSHOT -+ 0.17.0 +- 0.17.0 ++ 0.17.0-SNAPSHOT tycho-testing-harness diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch index 2eadefe..f101889 100644 --- a/tycho-fix-build.patch +++ b/tycho-fix-build.patch @@ -1,4 +1,4 @@ -From c26ae38c86a8d8084323214326518795bdfc9417 Mon Sep 17 00:00:00 2001 +From d5cf464057b6b835847732bad53f401c847e7533 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. @@ -21,14 +21,19 @@ Update to using Jetty 9 API. Fix to build with Plexus Compiler 2.2 API. +Use Hamcrest 1.1 API only. + Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 --- pom.xml | 9 ++--- tycho-artifactcomparator/pom.xml | 4 +-- - .../META-INF/MANIFEST.MF | 2 +- - .../META-INF/MANIFEST.MF | 2 +- + .../local/TemporaryLocalMavenRepository.java | 6 +--- + .../resolver/ProjectorResolutionStrategyTest.java | 4 +-- .../p2/target/ee/CustomEEResolutionHandler.java | 2 +- - .../org/eclipse/tycho/test/util/HttpServer.java | 5 +-- + .../org/eclipse/tycho/test/util/HttpServer.java | 8 +++-- + .../org/eclipse/tycho/test/util/LogVerifier.java | 4 +-- + .../org/eclipse/tycho/test/util/P2Context.java | 8 +---- + .../org/eclipse/tycho/test/util/TychoMatchers.java | 5 +-- .../tycho-bundles-external.product | 1 - .../p2 Director.product | 1 - tycho-compiler-jdt/pom.xml | 4 --- @@ -38,10 +43,10 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 .../core/maven/TychoMavenLifecycleParticipant.java | 4 ++- .../tycho/test/AbstractTychoIntegrationTest.java | 11 +++--- .../tycho/testing/EmptyLifecycleExecutor.java | 8 +++++ - 15 files changed, 52 insertions(+), 51 deletions(-) + 18 files changed, 62 insertions(+), 67 deletions(-) diff --git a/pom.xml b/pom.xml -index 5776b0e..0aa43ea 100644 +index 2822951..fd9920b 100644 --- a/pom.xml +++ b/pom.xml @@ -208,12 +208,12 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \ @@ -72,7 +77,7 @@ index 5776b0e..0aa43ea 100644 surefire-booter 2.10 diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml -index 27e15a9..5fa695c 100644 +index cd0fb9a..01815d8 100644 --- a/tycho-artifactcomparator/pom.xml +++ b/tycho-artifactcomparator/pom.xml @@ -24,7 +24,7 @@ @@ -91,32 +96,41 @@ index 27e15a9..5fa695c 100644 - \ No newline at end of file + -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 e65eb5b..fc38d0c 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 -@@ -6,7 +6,7 @@ Bundle-Version: 0.17.0.qualifier - Bundle-Vendor: %providerName - Bundle-RequiredExecutionEnvironment: J2SE-1.5 - Fragment-Host: org.eclipse.tycho.p2.maven.repository --Require-Bundle: org.junit4;bundle-version="4.8.1", -+Require-Bundle: org.junit;bundle-version="4.8.1", - org.eclipse.equinox.p2.publisher;bundle-version="1.2.0", - org.eclipse.equinox.ds;bundle-version="1.4.0", - org.eclipse.tycho.p2.resolver.impl -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 80be496..0af92d6 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 -@@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.tycho.p2.resolver.impl.test;singleton:=true - Bundle-Version: 0.17.0.qualifier - Bundle-RequiredExecutionEnvironment: J2SE-1.5 - Fragment-Host: org.eclipse.tycho.p2.resolver.impl --Require-Bundle: org.junit4, -+Require-Bundle: org.junit, - org.eclipse.equinox.ds, - org.eclipse.equinox.p2.transport.ecf - Bundle-ActivationPolicy: lazy +diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java +index 40c5fc0..c344056 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java ++++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/TemporaryLocalMavenRepository.java +@@ -53,11 +53,7 @@ public class TemporaryLocalMavenRepository extends ExternalResource { + + public File getLocalRepositoryRoot() { + if (repoRoot == null) { +- try { +- repoRoot = tempManager.newFolder("repository"); +- } catch (IOException e) { +- throw new RuntimeException(e); +- } ++ repoRoot = tempManager.newFolder("repository"); + } + return repoRoot; + } +diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java +index e39ae93..ee27774 100644 +--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java ++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/ProjectorResolutionStrategyTest.java +@@ -11,11 +11,11 @@ + + package org.eclipse.tycho.p2.resolver; + +-import static org.hamcrest.CoreMatchers.containsString; +-import static org.hamcrest.CoreMatchers.hasItem; + import static org.hamcrest.core.Is.is; + import static org.junit.Assert.assertThat; + import static org.junit.Assert.fail; ++import static org.junit.internal.matchers.IsCollectionContaining.hasItem; ++import static org.junit.matchers.JUnitMatchers.containsString; + + import java.util.ArrayList; + import java.util.Collection; 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 @@ -131,13 +145,16 @@ index 87c9e11..927cea5 100644 } else if (PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE.equals(namespace)) { result.add(new SystemCapability(Type.JAVA_PACKAGE, name, version)); diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java -index 1a27b00..eb110dc 100644 +index 57b4e10..47423e5 100644 --- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java +++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/HttpServer.java -@@ -20,9 +20,10 @@ import java.util.Random; - import org.eclipse.jetty.security.ConstraintMapping; - import org.eclipse.jetty.security.ConstraintSecurityHandler; - import org.eclipse.jetty.security.HashLoginService; +@@ -17,9 +17,13 @@ import java.util.List; + import java.util.Map; + import java.util.Random; + ++import org.eclipse.jetty.security.ConstraintMapping; ++import org.eclipse.jetty.security.ConstraintSecurityHandler; ++import org.eclipse.jetty.security.HashLoginService; +import org.eclipse.jetty.server.AbstractNetworkConnector; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Server; @@ -145,21 +162,86 @@ index 1a27b00..eb110dc 100644 +import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; - import org.eclipse.jetty.util.security.Constraint; -@@ -68,7 +69,7 @@ public class HttpServer { + import org.junit.rules.ExternalResource; +@@ -77,7 +81,7 @@ public class HttpServer extends ExternalResource { - private static HttpServer doStartServer(String username, String password, int port) throws Exception { - Server server = new Server(); + private static RunningServer startServerOnPort(int port) throws Exception { + Server jetty = new Server(); - Connector connector = new SocketConnector(); -+ AbstractNetworkConnector connector = new ServerConnector(server); ++ AbstractNetworkConnector connector = new ServerConnector(jetty); connector.setPort(port); - server.addConnector(connector); + jetty.addConnector(connector); + +diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java +index e1bae59..414d155 100644 +--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java ++++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/LogVerifier.java +@@ -70,9 +70,9 @@ public class LogVerifier extends Verifier { + MemoryLog logger; + + boolean expectNoErrors = true; +- List> loggedErrorsMatchers = new ArrayList>(); ++ List> loggedErrorsMatchers = new ArrayList>(); + boolean expectNoWarnings = false; +- List> loggedWarningsMatchers = new ArrayList>(); ++ List> loggedWarningsMatchers = new ArrayList>(); + + MemoryLog getInitializedLogger() { + if (logger == null) { +diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java +index 283f9d0..ac34dda 100644 +--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java ++++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/P2Context.java +@@ -10,8 +10,6 @@ + *******************************************************************************/ + package org.eclipse.tycho.test.util; + +-import java.io.IOException; +- + import org.eclipse.equinox.p2.core.IProvisioningAgent; + import org.eclipse.equinox.p2.core.ProvisionException; + import org.junit.Rule; +@@ -45,11 +43,7 @@ public final class P2Context extends ExternalResource { + */ + public IProvisioningAgent getAgent() throws ProvisionException { + if (agent == null) { +- try { +- agent = Activator.createProvisioningAgent(tempManager.newFolder("p2agent").toURI()); +- } catch (IOException e) { +- throw new RuntimeException(e); +- } ++ agent = Activator.createProvisioningAgent(tempManager.newFolder("p2agent").toURI()); + } + return agent; + } +diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java +index 9454823..6526bf1 100644 +--- a/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java ++++ b/tycho-bundles/org.eclipse.tycho.test.utils/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java +@@ -16,8 +16,8 @@ import java.util.List; + import org.hamcrest.CoreMatchers; + import org.hamcrest.Description; + import org.hamcrest.Matcher; +-import org.hamcrest.TypeSafeMatcher; +-import org.hamcrest.core.SubstringMatcher; ++import org.junit.internal.matchers.SubstringMatcher; ++import org.junit.internal.matchers.TypeSafeMatcher; + import org.junit.matchers.JUnitMatchers; + + /** +@@ -26,6 +26,7 @@ import org.junit.matchers.JUnitMatchers; + * @see CoreMatchers + * @see JUnitMatchers + */ ++@SuppressWarnings("restriction") + public class TychoMatchers { + /** diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product -index dea801e..4733ad0 100644 +index 9bc34bb..f22a55c 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 @@ +@@ -42,7 +42,6 @@ @@ -168,10 +250,10 @@ index dea801e..4733ad0 100644 diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product -index dd80b5e..797b4ba 100644 +index 62b354d..11f65fb 100644 --- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product +++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product -@@ -41,7 +41,6 @@ +@@ -42,7 +42,6 @@ @@ -180,7 +262,7 @@ index dd80b5e..797b4ba 100644 diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml -index 9872fd7..8a12fde 100644 +index 3857d62..fa6c17c 100644 --- a/tycho-compiler-jdt/pom.xml +++ b/tycho-compiler-jdt/pom.xml @@ -38,10 +38,6 @@ @@ -195,7 +277,7 @@ index 9872fd7..8a12fde 100644 plexus-compiler-api diff --git a/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java b/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java -index f87983d..d5b1ca7 100644 +index f87983d..718e2fc 100644 --- a/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java +++ b/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java @@ -28,9 +28,10 @@ import java.util.regex.Pattern; @@ -203,8 +285,8 @@ index f87983d..d5b1ca7 100644 import org.codehaus.plexus.compiler.AbstractCompiler; import org.codehaus.plexus.compiler.CompilerConfiguration; -import org.codehaus.plexus.compiler.CompilerError; -+import org.codehaus.plexus.compiler.CompilerMessage; import org.codehaus.plexus.compiler.CompilerException; ++import org.codehaus.plexus.compiler.CompilerMessage; import org.codehaus.plexus.compiler.CompilerOutputStyle; +import org.codehaus.plexus.compiler.CompilerResult; import org.codehaus.plexus.component.annotations.Component; @@ -328,7 +410,7 @@ index f87983d..d5b1ca7 100644 } diff --git a/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java b/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java -index a6ffdcd..0f0b912 100644 +index 74ba22c..7b3603d 100644 --- a/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java +++ b/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java @@ -29,7 +29,7 @@ import org.apache.maven.plugin.AbstractMojo; @@ -396,7 +478,7 @@ index 3efb896..cccb6ff 100644 } diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java -index 5c4dcb3..9830aee 100644 +index df63b2f..510db0a 100644 --- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java +++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/AbstractTychoIntegrationTest.java @@ -97,12 +97,11 @@ public abstract class AbstractTychoIntegrationTest { diff --git a/tycho-fix-surefire.patch b/tycho-fix-surefire.patch index 13c864f..9523f5b 100644 --- a/tycho-fix-surefire.patch +++ b/tycho-fix-surefire.patch @@ -1,4 +1,4 @@ -From 315e4a7a7e116d7c85749449e7f9d2729fc4d0a5 Mon Sep 17 00:00:00 2001 +From 8a790e6ca3fe8beee86883ea6d8d33854b197a44 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. @@ -24,10 +24,10 @@ 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 63da107..27d4a2b 100644 +index 6d6fcf3..43a798a 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.17.0.qualifier +@@ -6,6 +6,7 @@ Bundle-Version: 0.17.0 Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -38,7 +38,7 @@ index 63da107..27d4a2b 100644 + jars/common-junit3-2.13.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 42c4a97..cbeeaf0 100644 +index 51cb8af..a15c972 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,10 +54,10 @@ index 42c4a97..cbeeaf0 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 b5a9203..fa146d5 100644 +index 2821621..1b27a6c 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.17.0.qualifier +@@ -6,7 +6,9 @@ Bundle-Version: 0.17.0 Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -69,7 +69,7 @@ index b5a9203..fa146d5 100644 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 71ba06e..d88a349 100644 +index c526a3a..bcb4d39 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,7 +90,7 @@ index 71ba06e..d88a349 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 3aad05e..29a160d 100644 +index 522c40f..a4831a6 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 @@ -105,7 +105,7 @@ index 3aad05e..29a160d 100644 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 1c465a7..eb9104e 100644 +index 5fc2106..678fb0c 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 1c465a7..eb9104e 100644 -- -1.7.11.7 +1.8.1.4 diff --git a/tycho-maven-surefire.patch b/tycho-maven-surefire.patch index 0409f49..a7c20a2 100644 --- a/tycho-maven-surefire.patch +++ b/tycho-maven-surefire.patch @@ -1,4 +1,4 @@ -From 62a1273b971ccd9fdba754c22469613bbf09d868 Mon Sep 17 00:00:00 2001 +From 47bdd92d667cacf94d903e4677bc53c350f8e293 Mon Sep 17 00:00:00 2001 From: Jan Sievers Date: Tue, 4 Sep 2012 16:02:52 +0200 Subject: [PATCH] POC 386481 update maven surefire to latest version 2.13 @@ -42,7 +42,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 6d0559a..63da107 100644 +index 5274861..6d6fcf3 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" @@ -64,10 +64,10 @@ 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 de18fd6..b5a9203 100644 +index 890a069..2821621 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.17.0.qualifier +@@ -6,7 +6,7 @@ Bundle-Version: 0.17.0 Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6 @@ -88,10 +88,10 @@ 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 752b471..3aad05e 100644 +index 3a83088..522c40f 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.17.0.qualifier +@@ -6,11 +6,14 @@ Bundle-Version: 0.17.0 Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ClassPath: ., @@ -123,7 +123,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 6a7f598..1c465a7 100644 +index 10f68c1..5fc2106 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 @@ @@ -382,7 +382,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 24107e1..4913119 100644 +index d035572..ceb4814 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", @@ -395,11 +395,11 @@ index 24107e1..4913119 100644 + jars/surefire-api-2.13.jar, + jars/maven-surefire-common-2.13.jar, + jars/plexus-utils-3.0.jar - Bundle-Version: 0.17.0.qualifier + Bundle-Version: 0.17.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 bb5ba5e..555eef8 100644 +index d9f9263..9ac6c89 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 @@ @@ -503,7 +503,7 @@ index 791221b..72a5f75 100644 /* diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml -index aab6422..985e8f3 100644 +index 16534eb..4f9d39f 100644 --- a/tycho-surefire/pom.xml +++ b/tycho-surefire/pom.xml @@ -26,7 +26,7 @@ @@ -516,7 +516,7 @@ index aab6422..985e8f3 100644 diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml -index 2f8c3fa..de9f60d 100644 +index d47ad8d..d620d92 100644 --- a/tycho-surefire/tycho-surefire-plugin/pom.xml +++ b/tycho-surefire/tycho-surefire-plugin/pom.xml @@ -96,5 +96,10 @@ @@ -531,7 +531,7 @@ index 2f8c3fa..de9f60d 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 57abaec..127d55b 100644 +index 5ac5427..340f562 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; @@ -554,7 +554,7 @@ index 57abaec..127d55b 100644 import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.ToolchainManager; import org.codehaus.plexus.util.FileUtils; -@@ -629,6 +631,27 @@ public class TestMojo extends AbstractMojo { +@@ -737,6 +739,27 @@ public class TestMojo extends AbstractMojo { providerProperties.put("perCoreThreadCount", String.valueOf(perCoreThreadCount)); providerProperties.put("useUnlimitedThreads", String.valueOf(useUnlimitedThreads)); } @@ -582,7 +582,7 @@ index 57abaec..127d55b 100644 for (Map.Entry entry : providerProperties.entrySet()) { surefireProps.put("__provider." + entry.getKey(), entry.getValue()); } -@@ -673,7 +696,7 @@ public class TestMojo extends AbstractMojo { +@@ -783,7 +806,7 @@ public class TestMojo extends AbstractMojo { case 0: getLog().info("All tests passed!"); break; @@ -591,7 +591,7 @@ index 57abaec..127d55b 100644 String message = "No tests found."; if (failIfNoTests) { throw new MojoFailureException(message); -@@ -681,7 +704,7 @@ public class TestMojo extends AbstractMojo { +@@ -791,7 +814,7 @@ public class TestMojo extends AbstractMojo { getLog().warn(message); } break; @@ -614,5 +614,5 @@ index 8358883..625b6fc 100644 public Version getVersion() { -- -1.7.11.7 +1.8.1.4 diff --git a/tycho-remove-units.patch b/tycho-remove-units.patch index 8db9675..c25274b 100644 --- a/tycho-remove-units.patch +++ b/tycho-remove-units.patch @@ -1,15 +1,20 @@ -diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target -index 3436ba6..da4da36 100644 +diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target +index a014278..2b54ed8 100644 --- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target +++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -@@ -2,10 +2,6 @@ - +@@ -2,15 +2,10 @@ + -- -- -- -- - +- +- +- +- + + + + +- + diff --git a/tycho-set-reactor-cache-version.patch b/tycho-set-reactor-cache-version.patch index 11f9237..fe7e3c7 100644 --- a/tycho-set-reactor-cache-version.patch +++ b/tycho-set-reactor-cache-version.patch @@ -1,13 +1,13 @@ diff --git a/pom.xml b/pom.xml -index afe83e3..2cc9a6a 100644 +index fd9920b..8a469d6 100644 --- a/pom.xml +++ b/pom.xml @@ -145,7 +145,7 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \ - 1.0.500.v20120522-1651 + 1.0.600.v20130227-1643 - 0.16.0 -+ 0.17.0 ++ 0.17.0-SNAPSHOT diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index 5c0b6b4..a6cd10a 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -1,4 +1,4 @@ -From e27cbf1ed27cbe225d92510f4e9afd5088d36dce Mon Sep 17 00:00:00 2001 +From dcf9f210ba54345cfe85ba91ea0d18f617cd6940 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. @@ -24,14 +24,13 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b .../tycho/p2/target/TargetDefinitionResolver.java | 11 +++-- .../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++-- tycho-core/pom.xml | 5 ++ - .../ee/ExecutionEnvironmentConfigurationImpl.java | 2 +- .../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++ .../tycho/core/osgitools/AbstractTychoProject.java | 24 ++++++++++ .../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++- .../DefaultTargetPlatformConfigurationReader.java | 6 ++- .../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 +++++++ .../p2/resolver/P2TargetPlatformResolver.java | 11 +++++ - 10 files changed, 165 insertions(+), 11 deletions(-) + 9 files changed, 164 insertions(+), 10 deletions(-) diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java index 6ea8a81..e90d279 100644 @@ -144,7 +143,7 @@ index 3b8b9ab..b98c254 100644 if (includeLocalMavenRepo && logger.isDebugEnabled()) { IQueryResult locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS, diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml -index 6f936b9..1c4f3a8 100644 +index 95f31fc..4d06441 100644 --- a/tycho-core/pom.xml +++ b/tycho-core/pom.xml @@ -146,6 +146,11 @@ @@ -159,19 +158,6 @@ index 6f936b9..1c4f3a8 100644 org.eclipse.tycho -diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java -index d14cb48..51c7a98 100644 ---- a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java -+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java -@@ -18,7 +18,7 @@ import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration; - import org.eclipse.tycho.core.ee.shared.SystemCapability; - - public class ExecutionEnvironmentConfigurationImpl implements ExecutionEnvironmentConfiguration { -- private static final String DEFAULT_EXECUTION_ENVIRONMENT = "J2SE-1.5"; -+ private static final String DEFAULT_EXECUTION_ENVIRONMENT = "JavaSE-1.6"; - - private static final int PRIMARY = 0; - private static final int SECONDARY = 1; 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 cccb6ff..fb8bf78 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java @@ -260,7 +246,7 @@ index 695133d..ad25d9c 100644 return (TargetPlatform) project.getContextValue(TychoConstants.CTX_TARGET_PLATFORM); } 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 f818671..18ae1b4 100644 +index ab40599..3e64271 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 @@ -45,7 +45,9 @@ import org.eclipse.tycho.core.BundleProject; @@ -273,7 +259,7 @@ index f818671..18ae1b4 100644 import org.eclipse.tycho.core.ee.shared.ExecutionEnvironment; import org.eclipse.tycho.core.ee.shared.ExecutionEnvironmentConfiguration; import org.eclipse.tycho.core.facade.BuildPropertiesParser; -@@ -492,6 +494,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro +@@ -487,6 +489,7 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro String pdeProfile = getEclipsePluginProject(DefaultReactorProject.adapt(project)).getBuildProperties() .getJreCompilationProfile(); if (pdeProfile != null) { @@ -281,7 +267,7 @@ index f818671..18ae1b4 100644 sink.setProfileConfiguration(pdeProfile.trim(), "build.properties"); } else { -@@ -509,7 +512,31 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro +@@ -504,7 +507,31 @@ public class OsgiBundleProject extends AbstractTychoProject implements BundlePro if (envs.isEmpty()) { return null; } diff --git a/tycho.spec b/tycho.spec index ffee8f7..a273375 100644 --- a/tycho.spec +++ b/tycho.spec @@ -2,20 +2,21 @@ # Set this if Tycho and Eclipse are not in buildroot %global bootstrap 0 # When building version under development (non-release) -%global snap -SNAPSHOT +# %%global snap -SNAPSHOT +%global snap %{nil} %define __requires_exclude osgi* Name: tycho Version: 0.17.0 -Release: 0.11.git3351b1%{?dist} +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/ -Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab.tar.bz2 +Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.17.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 @@ -124,7 +125,7 @@ Requires: jpackage-utils This package contains the API documentation for %{name}. %prep -%setup -q -n org.eclipse.tycho-3351b14f403a08c0e6765081b88b877bf31fcdab +%setup -q -n %{name}-0.17.x %patch0 -p1 %patch1 -p1 @@ -267,6 +268,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar %{_javadocdir}/%{name} %changelog +* Tue Apr 2 2013 Roland Grunberg 0.17.0-1 +- Update to 0.17.0 Release. + * Mon Mar 18 2013 Roland Grunberg 0.17.0-0.11.git3351b1 - Non-bootstrap build.