May 2013 - java-sig-commits - Fedora Mailing-Lists

File LICENSE-MIT.txt uploaded to lookaside cache by msrb

by Michal Srb

A file has been added to the lookaside cache for maven-hpi-plugin: 0f3abd1e8ab49fa980c02e7b8e543fc3 LICENSE-MIT.txt

10 years, 11 months

1
0
0 / 0

File LICENSE-2.0.txt uploaded to lookaside cache by msrb

by Michal Srb

A file has been added to the lookaside cache for maven-hpi-plugin: 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt

10 years, 11 months

1
0
0 / 0

File maven-hpi-plugin-1.95.tar.gz uploaded to lookaside cache by msrb

by Michal Srb

A file has been added to the lookaside cache for maven-hpi-plugin: 6bdd5d3faf51ae613c0466d3b11fdebd maven-hpi-plugin-1.95.tar.gz

10 years, 11 months

1
0
0 / 0

[Bug 652183] Java SIG tracker bug

by Red Hat Bugzilla

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Bug 652183 depends on bug 895810, which changed state. Bug 895810 Summary: Review Request: glassfish-legal - Legal License for glassfish code https://bugzilla.redhat.com/show_bug.cgi?id=895810 What |Removed |Added ---------------------------------------------------------------------------- Status|ON_QA |CLOSED Resolution|--- |ERRATA -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

10 years, 11 months

1
0
0 / 0

[tycho/f19] Update to 0.18.0 Release.

by Roland Grunberg

Summary of changes: 66215e3... Update to 0.18.0 Release. (*) (*) This commit already existed in another branch; no separate mail sent

10 years, 11 months

1
0
0 / 0

[Bug 652183] Java SIG tracker bug

by Red Hat Bugzilla

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Jason Tibbitts <tibbs(a)math.uh.edu> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On| |814088 -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

10 years, 12 months

1
0
0 / 0

[tycho] Update to 0.18.0 Release.

by Roland Grunberg

commit 66215e316c10d18a20ad2e6c2496811110478e48 Author: Roland Grunberg <rgrunber(a)redhat.com> Date: Tue May 28 12:30:56 2013 -0400 Update to 0.18.0 Release. tycho-bootstrap.patch | 402 ++++++++++++++++---------------- tycho-fix-bootstrap-build.patch | 31 ++-- tycho-fix-build.patch | 13 +- tycho-fix-surefire.patch | 18 +- tycho-maven-surefire.patch | 22 +- tycho-remove-units.patch | 6 +- tycho-set-reactor-cache-version.patch | 2 +- tycho-use-custom-resolver.patch | 14 +- tycho.spec | 9 +- 9 files changed, 261 insertions(+), 256 deletions(-) --- diff --git a/tycho-bootstrap.patch b/tycho-bootstrap.patch index c60e202..ab5718d 100644 --- a/tycho-bootstrap.patch +++ b/tycho-bootstrap.patch @@ -1,867 +1,867 @@ diff --git a/pom.xml b/pom.xml -index 2822951..3ca551f 100644 +index 2651c9b..4c033fe 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Tycho (Incubation)</name> diff --git a/sisu-equinox/pom.xml b/sisu-equinox/pom.xml -index 63dc8de..b7db347 100644 +index cb53851..c3f9037 100644 --- a/sisu-equinox/pom.xml +++ b/sisu-equinox/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>sisu-equinox</artifactId> diff --git a/sisu-equinox/sisu-equinox-api/pom.xml b/sisu-equinox/sisu-equinox-api/pom.xml -index faaa7e0..9adad77 100644 +index de47da5..7aa2977 100644 --- a/sisu-equinox/sisu-equinox-api/pom.xml +++ b/sisu-equinox/sisu-equinox-api/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>sisu-equinox</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>sisu-equinox-api</artifactId> diff --git a/sisu-equinox/sisu-equinox-embedder/pom.xml b/sisu-equinox/sisu-equinox-embedder/pom.xml -index c4faf98..4f3268d 100644 +index 0fedec4..0b35718 100644 --- a/sisu-equinox/sisu-equinox-embedder/pom.xml +++ b/sisu-equinox/sisu-equinox-embedder/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>sisu-equinox</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>sisu-equinox-embedder</artifactId> diff --git a/sisu-equinox/sisu-equinox-launching/pom.xml b/sisu-equinox/sisu-equinox-launching/pom.xml -index 1f58fe0..6742941 100644 +index 595f4f4..3fe3050 100644 --- a/sisu-equinox/sisu-equinox-launching/pom.xml +++ b/sisu-equinox/sisu-equinox-launching/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>sisu-equinox</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>sisu-equinox-launching</artifactId> diff --git a/target-platform-configuration/pom.xml b/target-platform-configuration/pom.xml -index 47c20ea..67beabe 100644 +index 61e3793..e4e17f9 100644 --- a/target-platform-configuration/pom.xml +++ b/target-platform-configuration/pom.xml @@ -17,7 +17,7 @@ <parent> <artifactId>tycho</artifactId> <groupId>org.eclipse.tycho</groupId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>target-platform-configuration</artifactId> diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml -index cd0fb9a..27e15a9 100644 +index 48139c9..c3d93d1 100644 --- a/tycho-artifactcomparator/pom.xml +++ b/tycho-artifactcomparator/pom.xml @@ -16,7 +16,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-artifactcomparator</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared.tests/META-INF/MANIFEST.MF -index 2fd877c..cd6303d 100644 +index 9d6ae4e..ba866ad 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 0623476..011f8d9 100644 +index ca4e5f5..f1273f3 100644 --- a/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.core.shared.tests/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.core.shared.tests</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.core.shared/META-INF/MANIFEST.MF -index b55f695..c72f2e5 100644 +index 58552f1..2b71210 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 1feed73..333f4be 100644 +index f80d135..91c6b85 100644 --- a/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.core.shared/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.core.shared</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.embedder.shared/META-INF/MANIFEST.MF -index 8af27eb..e3a119e 100644 +index 539f715..7a63187 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 92692cc..8cc7d93 100644 +index 66a2e91..e0d5bcf 100644 --- a/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.embedder.shared/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.embedder.shared</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.noopsecurity/META-INF/MANIFEST.MF -index ebadfd1..898d6c0 100644 +index c4f3c91..f57fac7 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 45e0acd..1d2ce7e 100644 +index f7998ed..f1b1ff7 100644 --- a/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.noopsecurity/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.noopsecurity</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/META-INF/MANIFEST.MF -index c66eee6..fde01c0 100644 +index cbe2c29..cda405f 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 42b3819..1b267cb 100644 +index 5908181..04bb05f 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.p2.maven.repository.tests</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/META-INF/MANIFEST.MF -index 4e489de..3bc2ac0 100644 +index 16e510a..79ddd62 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 236aefa..3700864 100644 +index 65e76bf..d125fcc 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.p2.maven.repository</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/META-INF/MANIFEST.MF -index a9601a7..0af92d6 100644 +index e0050f8..1d03c30 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 95eda35..47e308d 100644 +index 13507ed..f9835d8 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.p2.resolver.impl.test</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/META-INF/MANIFEST.MF -index 8eedc97..f17107d 100644 +index 58040bb..6cbadce 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 8ce7fe1..f9ec095 100644 +index b4ba0e9..2ae8a41 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.p2.resolver.impl</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/META-INF/MANIFEST.MF -index 21597cd..06f8b77 100644 +index ae20dc4..1d4ce53 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 172129b..cd41d86 100644 +index 96aab3c..4f2b7bc 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.p2.resolver.shared</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/META-INF/MANIFEST.MF -index e546847..d337405 100644 +index 3ea6375..7a7c527 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 eb40f79..f3e3154 100644 +index 5ff2c2e..71bde4d 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.p2.tools.impl/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.p2.tools.impl</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/META-INF/MANIFEST.MF -index d6a3c0f..766dc78 100644 +index 13fb926..11b1df6 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 155792f..8f4600f 100644 +index 638fb33..c9d9242 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.p2.tools.shared/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.p2.tools.shared</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/META-INF/MANIFEST.MF -index bff6996..ea9d748 100644 +index 909d4c5..8cead8c 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 0f5158d..a69e064 100644 +index 6e4c32b..56f852a 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.p2.tools.tests/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.p2.tools.tests</artifactId> diff --git a/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF b/tycho-bundles/org.eclipse.tycho.test.utils/META-INF/MANIFEST.MF -index 4c24309..5e6ab7e 100644 +index c48a164..8acc9be 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 d8d4aee..c207704 100644 +index b963d8c..70f3042 100644 --- a/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml +++ b/tycho-bundles/org.eclipse.tycho.test.utils/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.test.utils</artifactId> diff --git a/tycho-bundles/pom.xml b/tycho-bundles/pom.xml -index 386414d..dc44c77 100644 +index 7534135..e688ce1 100644 --- a/tycho-bundles/pom.xml +++ b/tycho-bundles/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-bundles</artifactId> diff --git a/tycho-bundles/tycho-bundles-external/pom.xml b/tycho-bundles/tycho-bundles-external/pom.xml -index 3207f9f..5e977b8 100644 +index db48df6..f5ff0fd 100644 --- a/tycho-bundles/tycho-bundles-external/pom.xml +++ b/tycho-bundles/tycho-bundles-external/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-bundles-external</artifactId> diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product -index 9bc34bb..7316053 100644 +index ba9471a..983f656 100644 --- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product +++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <?pde version="3.5"?> --<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.17.0" useFeatures="false" includeLaunchers="false"> -+<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.17.0.qualifier" useFeatures="false" includeLaunchers="false"> +-<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.18.0" useFeatures="false" includeLaunchers="false"> ++<product name="org.eclipse.tycho.p2" uid="tycho-bundles-external" id="org.eclipse.equinox.p2.director.app.product" application="org.eclipse.equinox.p2.director.app.application" version="0.18.0.qualifier" useFeatures="false" includeLaunchers="false"> <configIni use="default"> </configIni> diff --git a/tycho-bundles/tycho-bundles-target/pom.xml b/tycho-bundles/tycho-bundles-target/pom.xml -index 52ba169..76fca16 100644 +index 73c8b56..2931640 100644 --- a/tycho-bundles/tycho-bundles-target/pom.xml +++ b/tycho-bundles/tycho-bundles-target/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> diff --git a/tycho-bundles/tycho-standalone-p2-director/pom.xml b/tycho-bundles/tycho-standalone-p2-director/pom.xml -index acaa17e..b6b0c9b 100644 +index 6495e86..0afa0d0 100644 --- a/tycho-bundles/tycho-standalone-p2-director/pom.xml +++ b/tycho-bundles/tycho-standalone-p2-director/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-bundles</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-standalone-p2-director</artifactId> diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml -index 3857d62..9872fd7 100644 +index 75f4cd7..cbef102 100644 --- a/tycho-compiler-jdt/pom.xml +++ b/tycho-compiler-jdt/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-compiler-jdt</artifactId> diff --git a/tycho-compiler-plugin/pom.xml b/tycho-compiler-plugin/pom.xml -index 6695f26..0c8160b 100644 +index 7b75668..add34d6 100644 --- a/tycho-compiler-plugin/pom.xml +++ b/tycho-compiler-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-compiler-plugin</artifactId> diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml -index 95f31fc..6f936b9 100644 +index 72c5bb5..d402406 100644 --- a/tycho-core/pom.xml +++ b/tycho-core/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-core</artifactId> diff --git a/tycho-embedder-api/pom.xml b/tycho-embedder-api/pom.xml -index cf3a53d..11a2063 100644 +index 2bb361d..1c40919 100644 --- a/tycho-embedder-api/pom.xml +++ b/tycho-embedder-api/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-embedder-api</artifactId> diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml -index 4a296d5..504c4bd 100644 +index 3b9a3a8..4dbfa77 100644 --- a/tycho-its/pom.xml +++ b/tycho-its/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-its</artifactId> diff --git a/tycho-maven-plugin/pom.xml b/tycho-maven-plugin/pom.xml -index d54aa09..2f8d41b 100644 +index 314b6d6..585daee 100644 --- a/tycho-maven-plugin/pom.xml +++ b/tycho-maven-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-maven-plugin</artifactId> diff --git a/tycho-metadata-model/pom.xml b/tycho-metadata-model/pom.xml -index 0b2da1b..9ea1262 100644 +index 8fe2e33..e49e817 100644 --- a/tycho-metadata-model/pom.xml +++ b/tycho-metadata-model/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-metadata-model</artifactId> diff --git a/tycho-p2/pom.xml b/tycho-p2/pom.xml -index a8a996b..fd0b562 100644 +index 8466340..23f5aab 100644 --- a/tycho-p2/pom.xml +++ b/tycho-p2/pom.xml @@ -17,7 +17,7 @@ <parent> <artifactId>tycho</artifactId> <groupId>org.eclipse.tycho</groupId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-p2</artifactId> diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml -index 8243628..c195fb0 100644 +index 3ba02bc..fbae22b 100644 --- a/tycho-p2/tycho-p2-director-plugin/pom.xml +++ b/tycho-p2/tycho-p2-director-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-p2-director-plugin</artifactId> diff --git a/tycho-p2/tycho-p2-facade/pom.xml b/tycho-p2/tycho-p2-facade/pom.xml -index b0d9910..eb24017 100644 +index 02d01c9..b1bf275 100644 --- a/tycho-p2/tycho-p2-facade/pom.xml +++ b/tycho-p2/tycho-p2-facade/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-p2-facade</artifactId> diff --git a/tycho-p2/tycho-p2-plugin/pom.xml b/tycho-p2/tycho-p2-plugin/pom.xml -index 7f17f2e..9d30f82 100644 +index 8e82e99..6e55b97 100644 --- a/tycho-p2/tycho-p2-plugin/pom.xml +++ b/tycho-p2/tycho-p2-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-p2-plugin</artifactId> diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml -index a4d6464..74bca61 100644 +index 1b75c8c..ccf2f1b 100644 --- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml +++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-p2-publisher-plugin</artifactId> diff --git a/tycho-p2/tycho-p2-repository-plugin/pom.xml b/tycho-p2/tycho-p2-repository-plugin/pom.xml -index 3b83a27..e0d2387 100644 +index 9b77571..68df35e 100644 --- a/tycho-p2/tycho-p2-repository-plugin/pom.xml +++ b/tycho-p2/tycho-p2-repository-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-p2</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-p2-repository-plugin</artifactId> diff --git a/tycho-packaging-plugin/pom.xml b/tycho-packaging-plugin/pom.xml -index babc099..5f31f6f 100644 +index d074fab..04a2e9f 100644 --- a/tycho-packaging-plugin/pom.xml +++ b/tycho-packaging-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-packaging-plugin</artifactId> diff --git a/tycho-pomgenerator-plugin/pom.xml b/tycho-pomgenerator-plugin/pom.xml -index 521489b..2335234 100644 +index 6c63512..ab5de1e 100644 --- a/tycho-pomgenerator-plugin/pom.xml +++ b/tycho-pomgenerator-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-pomgenerator-plugin</artifactId> diff --git a/tycho-release/pom.xml b/tycho-release/pom.xml -index c531618..8094816 100644 +index 641dc13..9fe39af 100644 --- a/tycho-release/pom.xml +++ b/tycho-release/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-release</artifactId> diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml -index d066280..e3444f6 100644 +index 7da93b8..9043856 100644 --- a/tycho-release/tycho-versions-plugin/pom.xml +++ b/tycho-release/tycho-versions-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-release</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-versions-plugin</artifactId> diff --git a/tycho-source-plugin/pom.xml b/tycho-source-plugin/pom.xml -index b15fe71..2d0fa37 100644 +index 0d3b818..01ff1ae 100644 --- a/tycho-source-plugin/pom.xml +++ b/tycho-source-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-source-plugin</artifactId> diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF -index 5274861..6d0559a 100644 +index 2f14f0f..e3c455e 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 51cb8af..42c4a97 100644 +index 1115be2..aaac60a 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.surefire.junit</artifactId> diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF -index 890a069..de18fd6 100644 +index e830991..999963a 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 c526a3a..71ba06e 100644 +index 32c45fc..31f24ca 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.surefire.junit4</artifactId> diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF -index 3a83088..752b471 100644 +index c49f2da..e1f6aef 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 10f68c1..6a7f598 100644 +index 42135ea..1d10f0a 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.surefire.junit47</artifactId> diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF -index d035572..24107e1 100644 +index 1b5ac72..9e484b1 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 -+Bundle-Version: 0.17.0.qualifier +-Bundle-Version: 0.18.0 ++Bundle-Version: 0.18.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 d9f9263..bb5ba5e 100644 +index 651282f..bcee6e9 100644 --- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>org.eclipse.tycho.surefire.osgibooter</artifactId> diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml -index 16534eb..aab6422 100644 +index 18db932..a53bfad 100644 --- a/tycho-surefire/pom.xml +++ b/tycho-surefire/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-surefire</artifactId> diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml -index d47ad8d..2f8c3fa 100644 +index 2d5d245..d011bd3 100644 --- a/tycho-surefire/tycho-surefire-plugin/pom.xml +++ b/tycho-surefire/tycho-surefire-plugin/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire</artifactId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-surefire-plugin</artifactId> diff --git a/tycho-testing-harness/pom.xml b/tycho-testing-harness/pom.xml -index 074ab6d..8eee619 100644 +index f549d57..112260f 100644 --- a/tycho-testing-harness/pom.xml +++ b/tycho-testing-harness/pom.xml @@ -17,7 +17,7 @@ <parent> <artifactId>tycho</artifactId> <groupId>org.eclipse.tycho</groupId> -- <version>0.17.0</version> -+ <version>0.17.0-SNAPSHOT</version> +- <version>0.18.0</version> ++ <version>0.18.0-SNAPSHOT</version> </parent> <artifactId>tycho-testing-harness</artifactId> diff --git a/tycho-fix-bootstrap-build.patch b/tycho-fix-bootstrap-build.patch index 8007f6b..7b4dd3a 100644 --- a/tycho-fix-bootstrap-build.patch +++ b/tycho-fix-bootstrap-build.patch @@ -1,4 +1,4 @@ -From 58236a7ae06bbc09625398d6a4b369f7f74d57b3 Mon Sep 17 00:00:00 2001 +From 4bd0fb083b6329ddc8df7b09dcfded3a45113a2f Mon Sep 17 00:00:00 2001 From: Roland Grunberg <rgrunber(a)redhat.com> Date: Mon, 19 Nov 2012 10:33:43 -0500 Subject: [PATCH] Minor fixes of limited scope to get a Tycho bootstrapped @@ -50,22 +50,23 @@ index 47423e5..4b4c600 100644 jetty.addConnector(connector); diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target -index a014278..a6ddfed 100644 +index 2063db2..bd011fe 100644 --- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target +++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target @@ -2,16 +2,16 @@ - <?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="15"> + <?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="16"> <locations> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> --<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20130228-0336"/> --<unit id="org.eclipse.sdk.ide" version="4.3.0.I20130314-1330"/> --<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20130314-0217"/> --<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20130312-1605"/> +-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20130521-0416"/> +-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20130526-0500"/> +-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20130526-0335"/> +-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20130515-2026"/> +<unit id="org.eclipse.equinox.executable.feature.group"/> +<unit id="org.eclipse.sdk.ide"/> +<unit id="org.eclipse.equinox.p2.sdk.feature.group"/> +<unit id="org.eclipse.equinox.core.sdk.feature.group"/> - <repository location="http://download.eclipse.org/eclipse/updates/4.3milestones/S-4.3M6-2013031..."/> +-<repository location="http://download.eclipse.org/eclipse/updates/4.3-I-builds/I20130526-0500/"/> ++<repository location="http://download.eclipse.org/eclipse/updates/4.3milestones/S-4.3M6-2013031..."/> </location> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">  @@ -77,10 +78,10 @@ index a014278..a6ddfed 100644 </locations> </target> diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java -index 37ce827..4cc7644 100644 +index 1aec480..0eeb0fa 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java -@@ -25,7 +25,7 @@ public class OsgiManifest { +@@ -26,7 +26,7 @@ public class OsgiManifest { private static final StandardExecutionEnvironment[] EMPTY_EXEC_ENV = new StandardExecutionEnvironment[0]; private String location; @@ -89,7 +90,7 @@ index 37ce827..4cc7644 100644 // cache for parsed values of commonly used headers private String bundleSymbolicName; -@@ -78,7 +78,7 @@ public class OsgiManifest { +@@ -80,7 +80,7 @@ public class OsgiManifest { } private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException { @@ -98,7 +99,7 @@ index 37ce827..4cc7644 100644 if (value == null) { throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found"); } -@@ -100,12 +100,12 @@ public class OsgiManifest { +@@ -102,12 +102,12 @@ public class OsgiManifest { && "dir".equals(bundleShapeElements[0].getValue()); } @@ -113,7 +114,7 @@ index 37ce827..4cc7644 100644 } public String getBundleSymbolicName() { -@@ -141,7 +141,7 @@ public class OsgiManifest { +@@ -143,7 +143,7 @@ public class OsgiManifest { } private ManifestElement[] parseHeader(String key) { @@ -122,7 +123,7 @@ index 37ce827..4cc7644 100644 if (value == null) { return null; } -@@ -154,7 +154,7 @@ public class OsgiManifest { +@@ -156,7 +156,7 @@ public class OsgiManifest { public ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException { try { @@ -132,7 +133,7 @@ index 37ce827..4cc7644 100644 throw new OsgiManifestParserException(location, e); } diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml -index 16534eb..2d69c67 100644 +index 7dd7c41..62d5610 100644 --- a/tycho-surefire/pom.xml +++ b/tycho-surefire/pom.xml @@ -41,7 +41,7 @@ diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch index bcaa565..7eb972c 100644 --- a/tycho-fix-build.patch +++ b/tycho-fix-build.patch @@ -1,4 +1,4 @@ -From 215b49c4e389f6317726cf1f233ec7d654ef2965 Mon Sep 17 00:00:00 2001 +From 8c4a712700b4ef835bd40dd4061246679d4fe435 Mon Sep 17 00:00:00 2001 From: Roland Grunberg <rgrunber(a)redhat.com> Date: Tue, 12 Jun 2012 09:56:38 -0400 Subject: [PATCH] Fix the Tycho build to work on Fedora. @@ -35,12 +35,11 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814 .../maven/plugin/CompilationFailureException.java | 4 +-- .../core/maven/TychoMavenLifecycleParticipant.java | 4 ++- .../tycho/test/AbstractTychoIntegrationTest.java | 11 +++--- - .../org/eclipse/tycho/test/util/TychoMatchers.java | 4 +-- .../tycho/testing/EmptyLifecycleExecutor.java | 8 +++++ - 14 files changed, 55 insertions(+), 51 deletions(-) + 13 files changed, 53 insertions(+), 49 deletions(-) diff --git a/pom.xml b/pom.xml -index 2822951..fd9920b 100644 +index 3b57368..2651c9b 100644 --- a/pom.xml +++ b/pom.xml @@ -208,12 +208,12 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \ @@ -71,7 +70,7 @@ index 2822951..fd9920b 100644 <artifactId>surefire-booter</artifactId> <version>2.10</version> diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml -index cd0fb9a..01815d8 100644 +index 84613d1..48139c9 100644 --- a/tycho-artifactcomparator/pom.xml +++ b/tycho-artifactcomparator/pom.xml @@ -24,7 +24,7 @@ @@ -132,7 +131,7 @@ index 57b4e10..47423e5 100644 jetty.addConnector(connector); diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product -index 9bc34bb..f22a55c 100644 +index 02d1dd1..ba9471a 100644 --- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product +++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product @@ -42,7 +42,6 @@ @@ -156,7 +155,7 @@ index 62b354d..11f65fb 100644 <plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml -index 3857d62..fa6c17c 100644 +index f2c321f..75f4cd7 100644 --- a/tycho-compiler-jdt/pom.xml +++ b/tycho-compiler-jdt/pom.xml @@ -38,10 +38,6 @@ diff --git a/tycho-fix-surefire.patch b/tycho-fix-surefire.patch index 9523f5b..6da0668 100644 --- a/tycho-fix-surefire.patch +++ b/tycho-fix-surefire.patch @@ -1,4 +1,4 @@ -From 8a790e6ca3fe8beee86883ea6d8d33854b197a44 Mon Sep 17 00:00:00 2001 +From 249113f725b6f00ff69f5e681a6b8c85cdd7cc13 Mon Sep 17 00:00:00 2001 From: Roland Grunberg <rgrunber(a)redhat.com> 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 6d6fcf3..43a798a 100644 +index af80319..2f14f0f 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 +@@ -6,6 +6,7 @@ Bundle-Version: 0.18.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 6d6fcf3..43a798a 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 51cb8af..a15c972 100644 +index 3d0f7c1..1115be2 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 51cb8af..a15c972 100644 </configuration> </execution> diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF -index 2821621..1b27a6c 100644 +index 3b15d2b..e830991 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 +@@ -6,7 +6,9 @@ Bundle-Version: 0.18.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 2821621..1b27a6c 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 c526a3a..bcb4d39 100644 +index caa77d2..32c45fc 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 c526a3a..bcb4d39 100644 </configuration> </execution> diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF -index 522c40f..a4831a6 100644 +index b4d02aa..c49f2da 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 522c40f..a4831a6 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 5fc2106..678fb0c 100644 +index 6a6eaa2..42135ea 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 @@ diff --git a/tycho-maven-surefire.patch b/tycho-maven-surefire.patch index 70c265b..665f697 100644 --- a/tycho-maven-surefire.patch +++ b/tycho-maven-surefire.patch @@ -1,4 +1,4 @@ -From 47bdd92d667cacf94d903e4677bc53c350f8e293 Mon Sep 17 00:00:00 2001 +From c92d9ba25cf61652ddece8602dec1e67eeb4971a Mon Sep 17 00:00:00 2001 From: Jan Sievers <jan.sievers(a)sap.com> 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 5274861..6d6fcf3 100644 +index dbe883b..af80319 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 890a069..2821621 100644 +index 7498728..3b15d2b 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 +@@ -6,7 +6,7 @@ Bundle-Version: 0.18.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 3a83088..522c40f 100644 +index 024acb7..b4d02aa 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 +@@ -6,11 +6,14 @@ Bundle-Version: 0.18.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 10f68c1..5fc2106 100644 +index d5abf73..6a6eaa2 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 d035572..ceb4814 100644 +index e75a51f..1b5ac72 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", @@ -399,7 +399,7 @@ index d035572..ceb4814 100644 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 d9f9263..9ac6c89 100644 +index 20d5b39..651282f 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 16534eb..4f9d39f 100644 +index 7dd7c41..18db932 100644 --- a/tycho-surefire/pom.xml +++ b/tycho-surefire/pom.xml @@ -26,7 +26,7 @@ @@ -516,7 +516,7 @@ index 16534eb..4f9d39f 100644 <modules> diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml -index d47ad8d..d620d92 100644 +index 5d496d3..2d5d245 100644 --- a/tycho-surefire/tycho-surefire-plugin/pom.xml +++ b/tycho-surefire/tycho-surefire-plugin/pom.xml @@ -96,5 +96,10 @@ diff --git a/tycho-remove-units.patch b/tycho-remove-units.patch index 061ab66..9aadb43 100644 --- a/tycho-remove-units.patch +++ b/tycho-remove-units.patch @@ -1,5 +1,7 @@ ---- org.eclipse.tycho-tycho-0.18.x/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target.bak 2013-05-29 14:15:55.044897048 +0200 -+++ org.eclipse.tycho-tycho-0.18.x/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target 2013-05-29 14:16:22.171161529 +0200 +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 @@ <?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="16"> <locations> diff --git a/tycho-set-reactor-cache-version.patch b/tycho-set-reactor-cache-version.patch index fe7e3c7..b52671d 100644 --- a/tycho-set-reactor-cache-version.patch +++ b/tycho-set-reactor-cache-version.patch @@ -7,7 +7,7 @@ index fd9920b..8a469d6 100644  - <tychoBootstrapVersion>0.16.0</tychoBootstrapVersion> -+ <tychoBootstrapVersion>0.17.0-SNAPSHOT</tychoBootstrapVersion> ++ <tychoBootstrapVersion>0.18.0-SNAPSHOT</tychoBootstrapVersion> </properties> <dependencyManagement> diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch index a6cd10a..37c935a 100644 --- a/tycho-use-custom-resolver.patch +++ b/tycho-use-custom-resolver.patch @@ -1,4 +1,4 @@ -From dcf9f210ba54345cfe85ba91ea0d18f617cd6940 Mon Sep 17 00:00:00 2001 +From 6f5e04370e6aec093b9f1df2a5afa5c40eccc666 Mon Sep 17 00:00:00 2001 From: Roland Grunberg <rgrunber(a)redhat.com> Date: Tue, 12 Jun 2012 10:38:51 -0400 Subject: [PATCH] Implement a custom resolver for Tycho in local mode. @@ -33,7 +33,7 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b 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 +index 2dc91ff..34c48ff 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java @@ -23,6 +23,7 @@ import org.eclipse.core.runtime.CoreException; @@ -62,7 +62,7 @@ index 6ea8a81..e90d279 100644 IQueryable<IInstallableUnit> locationUnits = new CompoundQueryable<IInstallableUnit>( diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java -index 3b8b9ab..b98c254 100644 +index 5b61351..be3c47f 100644 --- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java +++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java @@ -38,6 +38,9 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent; @@ -88,7 +88,7 @@ index 3b8b9ab..b98c254 100644 try { remoteRepositoryIdManager.addMapping(location.getId(), location.getURL()); -@@ -372,12 +381,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { +@@ -374,12 +383,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { result.addAll(contentPart.getUnits()); } @@ -143,7 +143,7 @@ index 3b8b9ab..b98c254 100644 if (includeLocalMavenRepo && logger.isDebugEnabled()) { IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS, diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml -index 95f31fc..4d06441 100644 +index 25ef342..72c5bb5 100644 --- a/tycho-core/pom.xml +++ b/tycho-core/pom.xml @@ -146,6 +146,11 @@ @@ -301,7 +301,7 @@ index ab40599..3e64271 100644 } diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java -index 63dba63..d292773 100644 +index edfc57b..d65b464 100644 --- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java @@ -64,7 +64,11 @@ public class DefaultTargetPlatformConfigurationReader { @@ -360,7 +360,7 @@ index 1e878e5..2de11ad 100644 request.setArtifact(artifact); request.setResolveRoot(true).setResolveTransitively(false); diff --git a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java -index d6cbc6d..85e2c0d 100644 +index f6f56ac..5abfd79 100644 --- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java +++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java @@ -189,6 +189,17 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp diff --git a/tycho.spec b/tycho.spec index 5a3b696..3a57460 100644 --- a/tycho.spec +++ b/tycho.spec @@ -9,14 +9,14 @@ Name: tycho Version: 0.18.0 -Release: 0.1.gitb1068d%{?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... +Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.18.... # 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 @@ -125,7 +125,7 @@ Requires: jpackage-utils This package contains the API documentation for %{name}. %prep -%setup -q -n org.eclipse.tycho-tycho-0.18.x +%setup -q -n %{name}-0.18.x %patch0 -p1 %patch1 -p1 @@ -268,6 +268,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar %{_javadocdir}/%{name} %changelog +* Tue May 28 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.18.0-1 +- Update to 0.18.0 Release. + * Tue Apr 11 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-1 - Fix bootstrap build for potential future use.

10 years, 12 months

1
0
0 / 0

[Bug 652183] Java SIG tracker bug

by Red Hat Bugzilla

https://bugzilla.redhat.com/show_bug.cgi?id=652183 Michal Srb <msrb(a)redhat.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Depends On| |968338 -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug.

10 years, 12 months

1
0
0 / 0

[javapackages-tools/f19] Update to upstream version 0.14.1 with disabled debugging

by Stanislav Ochotnicky

Summary of changes: 4b13008... Update to upstream version 0.14.1 with disabled debugging (*) (*) This commit already existed in another branch; no separate mail sent

10 years, 12 months

1
0
0 / 0

[javapackages-tools] Update to upstream version 0.14.1 with disabled debugging

by Stanislav Ochotnicky

commit 4b13008dfce177a667d7a994ce044a79eb85eab1 Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com> Date: Wed May 29 15:17:06 2013 +0200 Update to upstream version 0.14.1 with disabled debugging .gitignore | 1 + javapackages-tools.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/.gitignore b/.gitignore index 1c6be2c..08394a0 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /javapackages-0.13.6.tar.xz /javapackages-0.13.7.tar.xz /javapackages-0.14.0.tar.xz +/javapackages-0.14.1.tar.xz diff --git a/javapackages-tools.spec b/javapackages-tools.spec index a443906..4bcdc5f 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,5 +1,5 @@ Name: javapackages-tools -Version: 0.14.0 +Version: 0.14.1 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -115,6 +115,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/mvn-{local,rpmbuild} %changelog +* Wed May 29 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.14.1-1 +- Update to upstream version 0.14.1 with disabled debugging + * Tue Apr 09 2013 Michal Srb <msrb(a)redhat.com> - 0.14.0-1 - Update to upstream version 0.14.0 diff --git a/sources b/sources index 01aa01a..f8ac4dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3db66d8094e4f8e0ec6010c79e6af3dd javapackages-0.14.0.tar.xz +46036780c74f8df7dcb1bc3465677072 javapackages-0.14.1.tar.xz

10 years, 12 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits May 2013