From 1731ca32e87eda672f843af3c9eebcb0586ff7a8 Mon Sep 17 00:00:00 2001 From: Roland Grunberg Date: Jul 18 2013 15:49:44 +0000 Subject: Make changes to ensure intermediary build succeeds. - Remove %Patch6 in favour of call to sed. --- diff --git a/tycho-bootstrap.patch b/tycho-bootstrap.patch index 0ab1b14..b596379 100644 --- a/tycho-bootstrap.patch +++ b/tycho-bootstrap.patch @@ -1,867 +1,867 @@ diff --git a/pom.xml b/pom.xml -index 2651c9b..4c033fe 100644 +index 5e398a8..70e1ef2 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT pom Tycho (Incubation) diff --git a/sisu-equinox/pom.xml b/sisu-equinox/pom.xml -index cb53851..c3f9037 100644 +index 39e35f7..802be75 100644 --- a/sisu-equinox/pom.xml +++ b/sisu-equinox/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT sisu-equinox diff --git a/sisu-equinox/sisu-equinox-api/pom.xml b/sisu-equinox/sisu-equinox-api/pom.xml -index de47da5..7aa2977 100644 +index b8e9dca..d90c26e 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT sisu-equinox-api diff --git a/sisu-equinox/sisu-equinox-embedder/pom.xml b/sisu-equinox/sisu-equinox-embedder/pom.xml -index 0fedec4..0b35718 100644 +index 258a12f..d724956 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT sisu-equinox-embedder diff --git a/sisu-equinox/sisu-equinox-launching/pom.xml b/sisu-equinox/sisu-equinox-launching/pom.xml -index 595f4f4..3fe3050 100644 +index 2d45fa5..e7a63d3 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT sisu-equinox-launching diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml -index 61e3793..e4e17f9 100644 +index 5567d8a..1d0f4f9 100644 --- a/target-platform-configuration/pom.xml +++ b/target-platform-configuration/pom.xml @@ -17,7 +17,7 @@ tycho org.eclipse.tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT target-platform-configuration diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml -index 48139c9..c3d93d1 100644 +index d558b16..c50767f 100644 --- a/tycho-artifactcomparator/pom.xml +++ b/tycho-artifactcomparator/pom.xml @@ -16,7 +16,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 9d6ae4e..ba866ad 100644 +index 6ec1cab..bf780d0 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 ca4e5f5..f1273f3 100644 +index 3f92229..09353a8 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 58552f1..2b71210 100644 +index d9a108e..6cfb5e9 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 f80d135..91c6b85 100644 +index 8c98c17..55315fe 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 539f715..7a63187 100644 +index f5a86df..616c3e4 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 66a2e91..e0d5bcf 100644 +index aaf7cb2..1e7334b 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 c4f3c91..f57fac7 100644 +index d34f9c6..e14f523 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 f7998ed..f1b1ff7 100644 +index ea0df05..4694559 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 cbe2c29..cda405f 100644 +index 301d15e..2d00aa6 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 5908181..04bb05f 100644 +index 510a260..7055725 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 16e510a..79ddd62 100644 +index 6af3c5c..725fab4 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 65e76bf..d125fcc 100644 +index 375cf47..e819432 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 e0050f8..1d03c30 100644 +index a05e7b4..6663cf7 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 13507ed..f9835d8 100644 +index f8dc2df..2d7d2a0 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 58040bb..6cbadce 100644 +index 5a5ab4d..e01367a 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.qualifier Bundle-Activator: org.eclipse.tycho.p2.impl.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.equinox.security;bundle-version="1.0.100", diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml -index b4ba0e9..2ae8a41 100644 +index 33ad7b6..5895cf3 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 ae20dc4..1d4ce53 100644 +index 753c3ab..17e41db 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 96aab3c..4f2b7bc 100644 +index 3f620d1..826b998 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 3ea6375..7a7c527 100644 +index 77f1871..d4fb6c4 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 5ff2c2e..71bde4d 100644 +index 6f838c6..3eada31 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 13fb926..11b1df6 100644 +index 4d1783d..e263b13 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 638fb33..c9d9242 100644 +index ff53cbe..76e7a1e 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 909d4c5..8cead8c 100644 +index 9759e80..3f31d95 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 6e4c32b..56f852a 100644 +index 70640be..0df8869 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 c48a164..8acc9be 100644 +index e279514..b8bcf31 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 b963d8c..70f3042 100644 +index dc83a8d..9b85af1 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT org.eclipse.tycho.test.utils diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml -index 7534135..e688ce1 100644 +index 4388547..3f99eeb 100644 --- a/tycho-bundles/pom.xml +++ b/tycho-bundles/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-bundles diff --git a/tycho-bundles/tycho-bundles-external/pom.xml b/tycho-bundles/tycho-bundles-external/pom.xml -index db48df6..f5ff0fd 100644 +index 352c6df..0285546 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 ba9471a..983f656 100644 +index 27f16f5..5067df5 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 73c8b56..2931640 100644 +index e6f280e..25e24b7 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT .. diff --git a/tycho-bundles/tycho-standalone-p2-director/pom.xml b/tycho-bundles/tycho-standalone-p2-director/pom.xml -index 6495e86..0afa0d0 100644 +index f45060f..c9aa688 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-standalone-p2-director diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml -index 75f4cd7..cbef102 100644 +index a71bd8b..94a564f 100644 --- a/tycho-compiler-jdt/pom.xml +++ b/tycho-compiler-jdt/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-compiler-jdt diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml -index 7b75668..add34d6 100644 +index 9fd0873..c9d3617 100644 --- a/tycho-compiler-plugin/pom.xml +++ b/tycho-compiler-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-compiler-plugin diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml -index 72c5bb5..d402406 100644 +index 53cdc7a..4fb5fc3 100644 --- a/tycho-core/pom.xml +++ b/tycho-core/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-core diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml -index 2bb361d..1c40919 100644 +index bcae8f1..0edcb5a 100644 --- a/tycho-embedder-api/pom.xml +++ b/tycho-embedder-api/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-embedder-api diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml -index 3b9a3a8..4dbfa77 100644 +index d97a233..8aae134 100644 --- a/tycho-its/pom.xml +++ b/tycho-its/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-its diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml -index 314b6d6..585daee 100644 +index 4785513..b82e9af 100644 --- a/tycho-maven-plugin/pom.xml +++ b/tycho-maven-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-maven-plugin diff --git a/tycho-metadata-model/pom.xml b/tycho-metadata-model/pom.xml -index 8fe2e33..e49e817 100644 +index 5357113..3258ce1 100644 --- a/tycho-metadata-model/pom.xml +++ b/tycho-metadata-model/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-metadata-model diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml -index 8466340..23f5aab 100644 +index 72e8e5f..52e2ff9 100644 --- a/tycho-p2/pom.xml +++ b/tycho-p2/pom.xml @@ -17,7 +17,7 @@ tycho org.eclipse.tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-p2 diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml -index 3ba02bc..fbae22b 100644 +index b2665c7..30ac35e 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-p2-director-plugin diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml -index 02d01c9..b1bf275 100644 +index be0e8b0..c54e205 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-p2-facade diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml -index 8e82e99..6e55b97 100644 +index ee20d4f..e7f8f5c 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 1b75c8c..ccf2f1b 100644 +index 7aa0d8b..3fde7b6 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 9b77571..68df35e 100644 +index 0d1dc41..1cc4a1a 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-p2-repository-plugin diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml -index d074fab..04a2e9f 100644 +index 4a8fad3..570869b 100644 --- a/tycho-packaging-plugin/pom.xml +++ b/tycho-packaging-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-packaging-plugin diff --git a/tycho-pomgenerator-plugin/pom.xml b/tycho-pomgenerator-plugin/pom.xml -index 6c63512..ab5de1e 100644 +index 05edf8e..fc8c9fb 100644 --- a/tycho-pomgenerator-plugin/pom.xml +++ b/tycho-pomgenerator-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-pomgenerator-plugin diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml -index 641dc13..9fe39af 100644 +index bd5f4b0..29e59be 100644 --- a/tycho-release/pom.xml +++ b/tycho-release/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-release diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml -index 7da93b8..9043856 100644 +index eb2373f..88f5332 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-versions-plugin diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml -index 0d3b818..01ff1ae 100644 +index 6eaf1c5..cbe9455 100644 --- a/tycho-source-plugin/pom.xml +++ b/tycho-source-plugin/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 2f14f0f..e3c455e 100644 +index 93f081b..3bf569e 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 1115be2..aaac60a 100644 +index a5b6c13..903c159 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 e830991..999963a 100644 +index 60209eb..9933324 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 32c45fc..31f24ca 100644 +index 56da2d6..28b40c9 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 c49f2da..e1f6aef 100644 +index ab16b3d..48942fe 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.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 42135ea..1d10f0a 100644 +index 59b326c..f8707c8 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-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 1b5ac72..9e484b1 100644 +index cff505b..cc92129 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.15.jar, jars/maven-surefire-common-2.15.jar, jars/plexus-utils-3.0.jar --Bundle-Version: 0.18.0 -+Bundle-Version: 0.18.0.qualifier +-Bundle-Version: 0.18.1 ++Bundle-Version: 0.18.1.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 651282f..bcee6e9 100644 +index f02540e..471bea9 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT org.eclipse.tycho.surefire.osgibooter diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml -index 18db932..a53bfad 100644 +index 621a56f..256eaac 100644 --- a/tycho-surefire/pom.xml +++ b/tycho-surefire/pom.xml @@ -17,7 +17,7 @@ org.eclipse.tycho tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-surefire diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml -index 2d5d245..d011bd3 100644 +index 71c2147..69f1ff3 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.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-surefire-plugin diff --git a/tycho-testing-harness/pom.xml b/tycho-testing-harness/pom.xml -index f549d57..112260f 100644 +index 3c7d647..8b902d4 100644 --- a/tycho-testing-harness/pom.xml +++ b/tycho-testing-harness/pom.xml @@ -17,7 +17,7 @@ tycho org.eclipse.tycho -- 0.18.0 -+ 0.18.0-SNAPSHOT +- 0.18.1 ++ 0.18.1-SNAPSHOT tycho-testing-harness diff --git a/tycho-remove-units.patch b/tycho-remove-units.patch deleted file mode 100644 index d4a27f9..0000000 --- a/tycho-remove-units.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -index 2063db2..44b60d2 100644 ---- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -+++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -@@ -2,15 +2,10 @@ - - - -- -- -- -- - - - - -- - - - diff --git a/tycho-set-reactor-cache-version.patch b/tycho-set-reactor-cache-version.patch index b52671d..57ebef3 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 fd9920b..8a469d6 100644 +index 5e398a8..6e94f51 100644 --- a/pom.xml +++ b/pom.xml -@@ -145,7 +145,7 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \ - 1.0.600.v20130227-1643 +@@ -143,7 +143,7 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \ + 1.0.600.v20130530-1010 - 0.16.0 -+ 0.18.0-SNAPSHOT ++ 0.18.1-SNAPSHOT diff --git a/tycho.spec b/tycho.spec index 6f92492..d1ad9c1 100644 --- a/tycho.spec +++ b/tycho.spec @@ -42,8 +42,6 @@ Patch4: %{name}-bootstrap.patch # Maven local mode will look in reactor cache for exact version (path lookup) # Set the built intermediary version of Tycho to be found in the reactor cache Patch5: %{name}-set-reactor-cache-version.patch -# These units cannot be found during a regular build -Patch6: %{name}-remove-units.patch # Additional changes needed just for bootstrap build Patch7: %{name}-fix-bootstrap-build.patch @@ -174,7 +172,8 @@ popd # Non-Bootstrap Build %else -%patch6 -p1 +# These units cannot be found during a regular build +sed -i '/^tycho" %{_mavenpomdir}/JPP.tycho-main.pom | grep "version" | sed 's/.*>\(.*\)<.*/\1/'` @@ -284,6 +283,10 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar %{_javadocdir}/%{name} %changelog +* Thu Jul 18 2013 Roland Grunberg 0.18.1-1 +- Make changes to ensure intermediary build succeeds. +- Remove %%Patch6 in favour of call to sed. + * Thu Jul 18 2013 Krzysztof Daniel 0.18.1-1 - Update to 0.18.1.