[tycho/f19] Improve artifact resolution using XMvn Resolver. (Bug 986900)
by Roland Grunberg
commit 63663621f952886c5afc26fd0f2057ae7c3d69b2
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue Jul 30 16:03:40 2013 -0400
Improve artifact resolution using XMvn Resolver. (Bug 986900)
tycho-use-custom-resolver.patch | 46 ++++++++++++++++++++++----------------
tycho.spec | 5 +++-
2 files changed, 31 insertions(+), 20 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index 954fcbe..96dd01b 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From fa63e64381fc02e1d5b3086e4585f259fd2120f8 Mon Sep 17 00:00:00 2001
+From 92cdfc9a21142cc866265b45b37e85547145d15d 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.
@@ -29,7 +29,7 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
---
.../tycho/p2/target/TargetDefinitionResolver.java | 11 +++--
.../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++--
- .../tycho/p2/repository/LocalRepositoryReader.java | 22 ++++++++-
+ .../tycho/p2/repository/LocalRepositoryReader.java | 31 +++++++++++-
tycho-core/pom.xml | 5 ++
.../eclipse/tycho/core/locking/FileLockerImpl.java | 24 +++++++---
.../core/maven/TychoMavenLifecycleParticipant.java | 28 +++++++++++
@@ -38,7 +38,7 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../DefaultTargetPlatformConfigurationReader.java | 6 ++-
.../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 +++++++
.../p2/resolver/P2TargetPlatformResolver.java | 11 +++++
- 11 files changed, 214 insertions(+), 18 deletions(-)
+ 11 files changed, 223 insertions(+), 18 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 2dc91ff..8395f82 100644
@@ -151,20 +151,18 @@ index 5b61351..b81f6be 100644
if (includeLocalMavenRepo && logger.isDebugEnabled()) {
IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-index 8d36462..5965699 100644
+index 8d36462..eb05eff 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-@@ -10,7 +10,9 @@
- *******************************************************************************/
+@@ -11,6 +11,7 @@
package org.eclipse.tycho.p2.repository;
-+import java.io.BufferedReader;
import java.io.File;
-+import java.io.InputStreamReader;
++import java.lang.reflect.Method;
public class LocalRepositoryReader implements RepositoryReader {
-@@ -21,7 +23,23 @@ public class LocalRepositoryReader implements RepositoryReader {
+@@ -21,7 +22,33 @@ public class LocalRepositoryReader implements RepositoryReader {
}
public File getLocalArtifactLocation(GAV gav, String classifier, String extension) {
@@ -173,21 +171,31 @@ index 8d36462..5965699 100644
+ File file = new File(localMavenRepositoryRoot, RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
+ // In Fedora the artifact may be in an XMvn-defined repository location (not in reactor cache)
+ if (!file.exists()) {
-+ String coord = gav.toString() + ":" + extension;
+ try {
-+ // XMvn is required at runtime so this will exist
-+ Process p = Runtime.getRuntime().exec(new String[] { "xmvn-resolve", coord });
-+ p.waitFor();
-+ BufferedReader buff = new BufferedReader(new InputStreamReader(p.getInputStream()));
-+ String filePath = buff.readLine();
-+ buff.close();
-+ file = new File(filePath);
++ // Use plexus container to add, and lookup the resolver
++ Class pclazz = Class.forName("org.codehaus.plexus.DefaultPlexusContainer");
++ Object plexus = pclazz.newInstance();
++
++ // The resolver
++ Class rclazz = Class.forName("org.fedoraproject.maven.resolver.DefaultResolver");
++
++ // Add the resolver to the plexus container
++ Method mAdd = pclazz.getMethod("addComponent", Object.class, String.class);
++ mAdd.invoke(plexus, rclazz.newInstance(), "org.fedoraproject.maven.resolver.Resolver");
+
++ // Retrieve the resolver from the plexus container
++ Method mLookup = pclazz.getMethod("lookup", String.class);
++ Object reader = mLookup.invoke(plexus, "org.fedoraproject.maven.resolver.Resolver");
++
++ // Invoke "resolve" method of the resolver
++ Method mResolve = reader.getClass().getMethod("resolve", String.class, String.class, String.class, String.class);
++ file = (File) mResolve.invoke(reader, gav.getGroupId(), gav.getArtifactId(), gav.getVersion(), extension);
+ } catch (Exception e) {
-+ return file;
++ e.printStackTrace();
+ }
+ }
+ return file;
-
++
+ }
}
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
diff --git a/tycho.spec b/tycho.spec
index 8e75e27..8e2b4f7 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.18.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -290,6 +290,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Tue Jul 30 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-4
+- Improve artifact resolution using XMvn Resolver. (Bug 986900)
+
* Mon Jul 29 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-3
- Fix Tycho file locking to work in Fedora.
- Skip validateConsistentTychoVersion by default. (Bug 987271)
10 years, 9 months
[tycho/f19] Fix Tycho file locking to work in Fedora.
by Roland Grunberg
commit 3256ab57692b8e31904d4d8eec3b2cebdfc2c4c3
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Fri Jul 26 11:15:55 2013 -0400
Fix Tycho file locking to work in Fedora.
- Skip validateConsistentTychoVersion by default. (Bug 987271)
tycho-fix-build.patch | 26 ++++++++-----------
tycho-use-custom-resolver.patch | 52 ++++++++++++++++++++++++++++++++++++--
tycho.spec | 8 ++++-
3 files changed, 66 insertions(+), 20 deletions(-)
---
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index 2698910..0ee5ec2 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,4 +1,4 @@
-From 8c4a712700b4ef835bd40dd4061246679d4fe435 Mon Sep 17 00:00:00 2001
+From 1c9fe22c06bfa298f17e9aa35e8fffb031824a21 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.
@@ -12,10 +12,7 @@ Tycho upstream currently depends upon 0.15.0 when building
Fedora we depend on the previously built version which has that version
checking. We must keep previous build version strings different to avoid
a cyclic dependency, but doing so causes the version checking to fail,
-so we must provide a way to disable it. (skipTychoVersionCheck)
-
-As of Eclipse Kepler, the bundle 'org.junit4' is no longer provided.
-Packages requiring JUnit 4 must use proper versioning on 'org.junit'.
+so we must provide a way to disable it. Disable by default.
Update to using Jetty 9 API.
@@ -35,14 +32,13 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../maven/plugin/CompilationFailureException.java | 4 +--
.../core/maven/TychoMavenLifecycleParticipant.java | 4 ++-
.../tycho/test/AbstractTychoIntegrationTest.java | 11 +++---
- .../tycho/testing/EmptyLifecycleExecutor.java | 8 +++++
- 13 files changed, 53 insertions(+), 49 deletions(-)
+ 12 files changed, 45 insertions(+), 49 deletions(-)
diff --git a/pom.xml b/pom.xml
-index 3b57368..2651c9b 100644
+index 76d5d1d..5e398a8 100644
--- a/pom.xml
+++ b/pom.xml
-@@ -208,12 +208,12 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
+@@ -219,12 +219,12 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-compiler-api</artifactId>
@@ -57,7 +53,7 @@ index 3b57368..2651c9b 100644
</dependency>
<dependency>
<groupId>org.eclipse.tycho</groupId>
-@@ -226,11 +226,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
+@@ -237,11 +237,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
<version>${jdtVersion}</version>
</dependency>
<dependency>
@@ -70,7 +66,7 @@ index 3b57368..2651c9b 100644
<artifactId>surefire-booter</artifactId>
<version>2.10</version>
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
-index 84613d1..48139c9 100644
+index 39a45fd..d558b16 100644
--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
@@ -24,7 +24,7 @@
@@ -131,7 +127,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 02d1dd1..ba9471a 100644
+index 9185cd4..27f16f5 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 @@
@@ -155,7 +151,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 f2c321f..75f4cd7 100644
+index 20671c8..a71bd8b 100644
--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
@@ -38,10 +38,6 @@
@@ -356,7 +352,7 @@ index 78dc4d8..8b73147 100644
sb.append(compilerError).append(LS);
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
-index 3efb896..cccb6ff 100644
+index 3efb896..3568d3b 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@@ -84,7 +84,9 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
@@ -364,7 +360,7 @@ index 3efb896..cccb6ff 100644
private void validate(List<MavenProject> projects) throws MavenExecutionException {
- validateConsistentTychoVersion(projects);
-+ if (System.getProperty("skipTychoVersionCheck") == null) {
++ if (System.getProperty("tycho.enableVersionCheck") != null) {
+ validateConsistentTychoVersion(projects);
+ }
validateUniqueBaseDirs(projects);
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index d591505..954fcbe 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From a1af94edb210feb59eecd372ce098c564ecd3656 Mon Sep 17 00:00:00 2001
+From fa63e64381fc02e1d5b3086e4585f259fd2120f8 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.
@@ -31,13 +31,14 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++--
.../tycho/p2/repository/LocalRepositoryReader.java | 22 ++++++++-
tycho-core/pom.xml | 5 ++
+ .../eclipse/tycho/core/locking/FileLockerImpl.java | 24 +++++++---
.../core/maven/TychoMavenLifecycleParticipant.java | 28 +++++++++++
.../tycho/core/osgitools/AbstractTychoProject.java | 24 ++++++++++
.../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++-
.../DefaultTargetPlatformConfigurationReader.java | 6 ++-
.../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 +++++++
.../p2/resolver/P2TargetPlatformResolver.java | 11 +++++
- 10 files changed, 196 insertions(+), 12 deletions(-)
+ 11 files changed, 214 insertions(+), 18 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 2dc91ff..8395f82 100644
@@ -205,8 +206,53 @@ index d1289b6..53cdc7a 100644
<dependency>
<groupId>org.eclipse.tycho</groupId>
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java
+index 86253bd..247b2b2 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java
++++ b/tycho-core/src/main/java/org/eclipse/tycho/core/locking/FileLockerImpl.java
+@@ -27,22 +27,34 @@ public class FileLockerImpl implements FileLocker {
+ final File lockMarkerFile;
+
+ public FileLockerImpl(File file, Location anyLocation) {
++ File lockFileCandidate = null;
+ try {
+ if (file.isDirectory()) {
+- this.lockMarkerFile = new File(file, LOCKFILE_SUFFIX).getCanonicalFile();
++ lockFileCandidate = new File(file, LOCKFILE_SUFFIX).getCanonicalFile();
+ } else {
+- this.lockMarkerFile = new File(file.getParentFile(), file.getName() + LOCKFILE_SUFFIX)
+- .getCanonicalFile();
++ lockFileCandidate = new File(file.getParentFile(), file.getName() + LOCKFILE_SUFFIX).getCanonicalFile();
+ }
+- if (lockMarkerFile.isDirectory()) {
+- throw new RuntimeException("Lock marker file " + lockMarkerFile + " already exists and is a directory");
++
++ if (lockFileCandidate.isDirectory()) {
++ throw new RuntimeException("Lock marker file " + lockFileCandidate + " already exists and is a directory");
+ }
+- File parentDir = lockMarkerFile.getParentFile();
++ File parentDir = lockFileCandidate.getParentFile();
+ if (!parentDir.isDirectory() && !parentDir.mkdirs()) {
+ throw new RuntimeException("Could not create parent directory " + parentDir + " of lock marker file");
+ }
++
++ String reactorCache = System.getProperty("user.dir") + "/.m2/";
++ // In Fedora we can only assume reactor cache is safe for read/write.
++ if (!lockFileCandidate.getAbsolutePath().startsWith(reactorCache)) {
++ String lockFileDir = reactorCache + LOCKFILE_SUFFIX;
++ String lockFileName = file.getAbsolutePath().replace("/", "-").replaceFirst("-", "/") + LOCKFILE_SUFFIX;
++ lockFileCandidate = new File(lockFileDir, lockFileName);
++ }
++
++ this.lockMarkerFile = lockFileCandidate;
+ this.lockFileLocation = anyLocation.createLocation(null, null, false);
+ this.lockFileLocation.set(lockMarkerFile.toURL(), false, lockMarkerFile.getAbsolutePath());
++
+ } catch (MalformedURLException e) {
+ throw new RuntimeException(e);
+ } catch (IOException e) {
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
-index cccb6ff..c3a71f7 100644
+index 3568d3b..dc77848 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@@ -11,6 +11,7 @@
diff --git a/tycho.spec b/tycho.spec
index 567f400..8e75e27 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.18.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -290,6 +290,10 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Mon Jul 29 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-3
+- Fix Tycho file locking to work in Fedora.
+- Skip validateConsistentTychoVersion by default. (Bug 987271)
+
* Wed Jul 24 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-2
- Non-bootstrap build.
@@ -317,7 +321,7 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
* 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
+* Thu Apr 11 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-1
- Fix bootstrap build for potential future use.
* Tue Apr 2 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.17.0-1
10 years, 9 months
[tycho/f19] Non-bootstrap build.
by Roland Grunberg
commit e78f26a17656e9f3dcee3e2c65c5d6897d052229
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Wed Jul 24 15:58:44 2013 -0400
Non-bootstrap build.
tycho.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index bb910b5..567f400 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,6 +1,6 @@
# Bootstrap build
# Set this if Tycho and Eclipse are not in buildroot
-%global bootstrap 1
+%global bootstrap 0
# When building version under development (non-release)
# %%global snap -SNAPSHOT
%global snap %{nil}
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.18.1
-Release: 1.1%{?dist}
+Release: 2%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -199,7 +199,7 @@ mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmave
%patch4 -p1 -R
# EXACT version in reactor cache to build against (%%{version}-SNAPSHOT)
-sed -i 's/<tychoBootstrapVersion>0.16.0<\/tychoBootstrapVersion>/<tychoBootstrapVersion>0.18.0-SNAPSHOT<\/tychoBootstrapVersion>/' pom.xml
+sed -i 's/<tychoBootstrapVersion>0.16.0<\/tychoBootstrapVersion>/<tychoBootstrapVersion>0.18.1-SNAPSHOT<\/tychoBootstrapVersion>/' pom.xml
fi
%endif
@@ -290,6 +290,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Wed Jul 24 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-2
+- Non-bootstrap build.
+
* Wed Jul 24 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-1.1
- Use MavenSession and Plexus to determine state.
- Fix bootstrap build.
10 years, 9 months
[tycho/f19] Use MavenSession and Plexus to determine state.
by Roland Grunberg
commit d351d154a0f77b1d819746e86f9ac0bb8522a049
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Wed Jul 24 15:31:38 2013 -0400
Use MavenSession and Plexus to determine state.
- Fix bootstrap build.
sources | 2 +-
tycho-fix-bootstrap-build.patch | 15 ++++----
tycho-set-reactor-cache-version.patch | 13 -------
tycho-use-custom-resolver.patch | 62 +++++++++++++++++++-------------
tycho.spec | 23 +++++++++---
5 files changed, 62 insertions(+), 53 deletions(-)
---
diff --git a/sources b/sources
index 4d224a5..29c3912 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9cb3258a724ba3b141be77d7c7ffde23 maven-repo.tar.xz
2519253ad74fd2613f1ce3250a646d8a org.eclipse.tycho-tycho-0.18.x.tar.bz2
+42dfaf1a7768e5ddb6268ae7e4ad2e11 maven-repo.tar.xz
diff --git a/tycho-fix-bootstrap-build.patch b/tycho-fix-bootstrap-build.patch
index 7b4dd3a..77867b1 100644
--- a/tycho-fix-bootstrap-build.patch
+++ b/tycho-fix-bootstrap-build.patch
@@ -1,4 +1,4 @@
-From 4bd0fb083b6329ddc8df7b09dcfded3a45113a2f Mon Sep 17 00:00:00 2001
+From 446e73cd3c2ef5ed8d5dc57615d88ef36445bafa 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,7 +50,7 @@ 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 2063db2..bd011fe 100644
+index 2a04214..400117a 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 @@
@@ -58,15 +58,14 @@ index 2063db2..bd011fe 100644
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
-<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.sdk.ide" version="4.3.0.I20130605-2000"/>
+-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20130604-2046"/>
+-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20130529-1710"/>
+<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.3-I-builds/I20130526-0500/"/>
-+<repository location="http://download.eclipse.org/eclipse/updates/4.3milestones/S-4.3M6-2013031..."/>
+ <repository location="http://download.eclipse.org/releases/kepler/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<!-- required for surefire junit3 provider -->
@@ -133,7 +132,7 @@ index 1aec480..0eeb0fa 100644
throw new OsgiManifestParserException(location, e);
}
diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
-index 7dd7c41..62d5610 100644
+index 7b9697c..43ab800 100644
--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
@@ -41,7 +41,7 @@
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index 7628268..d591505 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From efb53f644836927c9f2693ee9d750ef83091ab83 Mon Sep 17 00:00:00 2001
+From a1af94edb210feb59eecd372ce098c564ecd3656 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.
@@ -29,18 +29,18 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
---
.../tycho/p2/target/TargetDefinitionResolver.java | 11 +++--
.../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++--
- .../tycho/p2/repository/LocalRepositoryReader.java | 21 ++++++++-
+ .../tycho/p2/repository/LocalRepositoryReader.java | 22 ++++++++-
tycho-core/pom.xml | 5 ++
- .../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++
+ .../core/maven/TychoMavenLifecycleParticipant.java | 28 +++++++++++
.../tycho/core/osgitools/AbstractTychoProject.java | 24 ++++++++++
.../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++-
.../DefaultTargetPlatformConfigurationReader.java | 6 ++-
.../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 +++++++
.../p2/resolver/P2TargetPlatformResolver.java | 11 +++++
- 10 files changed, 184 insertions(+), 11 deletions(-)
+ 10 files changed, 196 insertions(+), 12 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 2dc91ff..34c48ff 100644
+index 2dc91ff..8395f82 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;
@@ -59,7 +59,7 @@ index 2dc91ff..34c48ff 100644
- artifactRepositories.add(repository.getLocation());
- metadataRepositories.add(loadRepository(repository));
+ // We cannot resolve a non-file URI in local mode
-+ if ((System.getenv("TYCHO_MVN_LOCAL") == null && System.getenv("TYCHO_MVN_RPMBUILD") == null)
++ if ((System.getProperty("TYCHO_MVN_LOCAL") == null && System.getProperty("TYCHO_MVN_RPMBUILD") == null)
+ || URIUtil.isFileURI(repository.getLocation())) {
+ repositoryIdManager.addMapping(repository.getId(), repository.getLocation());
+ artifactRepositories.add(repository.getLocation());
@@ -69,7 +69,7 @@ index 2dc91ff..34c48ff 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 5b61351..be3c47f 100644
+index 5b61351..b81f6be 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;
@@ -87,7 +87,7 @@ index 5b61351..be3c47f 100644
IArtifactRepository artifactRepository = null;
+ // We cannot resolve a non-file URI in local mode while offline
-+ if (System.getenv("TYCHO_MVN_RPMBUILD") != null && !URIUtil.isFileURI(location.getURL())) {
++ if (System.getProperty("TYCHO_MVN_RPMBUILD") != null && !URIUtil.isFileURI(location.getURL())) {
+ return;
+ }
+
@@ -103,7 +103,7 @@ index 5b61351..be3c47f 100644
- for (IMetadataRepository repository : metadataRepositories) {
- IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
- result.addAll(matches.toUnmodifiableSet());
-+ if (System.getenv("TYCHO_MVN_LOCAL") != null) {
++ if (System.getProperty("TYCHO_MVN_LOCAL") != null) {
+ final String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo";
+ final IExpression notmatchIU_ID = ExpressionUtil.parse("id != $0");
+ IMetadataRepository systemLocalP2Repo = null;
@@ -150,7 +150,7 @@ index 5b61351..be3c47f 100644
if (includeLocalMavenRepo && logger.isDebugEnabled()) {
IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
-index 8d36462..80182bd 100644
+index 8d36462..5965699 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
@@ -10,7 +10,9 @@
@@ -163,14 +163,14 @@ index 8d36462..80182bd 100644
public class LocalRepositoryReader implements RepositoryReader {
-@@ -21,7 +23,24 @@ public class LocalRepositoryReader implements RepositoryReader {
+@@ -21,7 +23,23 @@ public class LocalRepositoryReader implements RepositoryReader {
}
public File getLocalArtifactLocation(GAV gav, String classifier, String extension) {
- return new File(localMavenRepositoryRoot, RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
+- }
+ File file = new File(localMavenRepositoryRoot, RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
+ // In Fedora the artifact may be in an XMvn-defined repository location (not in reactor cache)
-+ // A more sensible solution will be possible when upstream bug 353889 is resolved.
+ if (!file.exists()) {
+ String coord = gav.toString() + ":" + extension;
+ try {
@@ -186,11 +186,11 @@ index 8d36462..80182bd 100644
+ }
+ }
+ return file;
- }
++ }
}
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
-index 25ef342..72c5bb5 100644
+index d1289b6..53cdc7a 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -146,6 +146,11 @@
@@ -206,7 +206,7 @@ index 25ef342..72c5bb5 100644
<dependency>
<groupId>org.eclipse.tycho</groupId>
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
-index cccb6ff..fb8bf78 100644
+index cccb6ff..c3a71f7 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
@@ -11,6 +11,7 @@
@@ -217,12 +217,24 @@ index cccb6ff..fb8bf78 100644
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
-@@ -73,6 +74,21 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
+@@ -73,6 +74,33 @@ public class TychoMavenLifecycleParticipant extends AbstractMavenLifecyclePartic
registerExecutionListener(session);
configureComponents(session);
++ try {
++ if (plexus.lookup("org.fedoraproject.maven.resolver.Resolver") != null) {
++ if (session.isOffline()) {
++ System.setProperty("TYCHO_MVN_RPMBUILD", "");
++ } else {
++ System.setProperty("TYCHO_MVN_LOCAL", "");
++ }
++ }
++ } catch (ComponentLookupException e) {
++ // No XMvn (Upstream Maven in use)
++ }
++
+ // Create a system p2 repository for local dependency resolution
-+ if (System.getenv("TYCHO_MVN_LOCAL") != null || System.getenv("TYCHO_MVN_RPMBUILD") != null) {
++ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
+ try {
+ String[] cmd = new String[] { "/usr/share/java/tycho/copy-platform-all",
+ System.getProperty("user.dir") + "/.m2/p2/repo" };
@@ -240,7 +252,7 @@ index cccb6ff..fb8bf78 100644
resolver.setupProject(session, project, DefaultReactorProject.adapt(project));
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
-index 695133d..ad25d9c 100644
+index 695133d..542a0f7 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/AbstractTychoProject.java
@@ -20,6 +20,9 @@ import org.eclipse.tycho.artifacts.TargetPlatform;
@@ -274,7 +286,7 @@ index 695133d..ad25d9c 100644
+ try {
+ ExecutionEnvironment ee = ExecutionEnvironmentUtils.getExecutionEnvironment(profile);
+
-+ if (System.getenv("TYCHO_MVN_LOCAL") != null || System.getenv("TYCHO_MVN_RPMBUILD") != null) {
++ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
+ // EE must be at least JavaSE-1.6
+ final ExecutionEnvironment javaSE16 = ExecutionEnvironmentUtils.getExecutionEnvironment("JavaSE-1.6");
+ if (! ee.isCompatibleCompilerTargetLevel(javaSE16.getCompilerTargetLevelDefault())) {
@@ -293,7 +305,7 @@ index 695133d..ad25d9c 100644
return (TargetPlatform) project.getContextValue(TychoConstants.CTX_TARGET_PLATFORM);
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
-index ab40599..3e64271 100644
+index ab40599..4adb5da 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiBundleProject.java
@@ -45,7 +45,9 @@ import org.eclipse.tycho.core.BundleProject;
@@ -323,7 +335,7 @@ index ab40599..3e64271 100644
+ ExecutionEnvironment manifestMinimalEE = Collections.min(envs);
+ ExecutionEnvironment tmp;
+
-+ if (System.getenv("TYCHO_MVN_LOCAL") != null || System.getenv("TYCHO_MVN_RPMBUILD") != null) {
++ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
+ try {
+ // EE must be at least JavaSE-1.6
+ final ExecutionEnvironment javaSE16 = ExecutionEnvironmentUtils.getExecutionEnvironment("JavaSE-1.6");
@@ -348,7 +360,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 edfc57b..d65b464 100644
+index edfc57b..287cbca 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 {
@@ -357,7 +369,7 @@ index edfc57b..d65b464 100644
- addTargetEnvironments(result, project, configuration);
+ // Use the defined environments only in local mode with tycho.local.keepTarget
-+ if ((System.getenv("TYCHO_MVN_LOCAL") == null && System.getenv("TYCHO_MVN_RPMBUILD") == null)
++ if ((System.getProperty("TYCHO_MVN_LOCAL") == null && System.getProperty("TYCHO_MVN_RPMBUILD") == null)
+ || System.getProperty("tycho.local.keepTarget") != null) {
+ addTargetEnvironments(result, project, configuration);
+ }
@@ -407,7 +419,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 f6f56ac..5abfd79 100644
+index f6f56ac..b9b8cba 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
@@ -416,7 +428,7 @@ index f6f56ac..5abfd79 100644
tpBuilder.setFailOnDuplicateIUs(failOnDuplicateIUs);
+
+ // Add Fedora Local P2 Repository when running in local mode
-+ if (System.getenv("TYCHO_MVN_LOCAL") != null || System.getenv("TYCHO_MVN_RPMBUILD") != null) {
++ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
+ String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo";
+ try {
+ tpBuilder.addP2Repository(new MavenRepositoryLocation(uri, new URI(uri)));
diff --git a/tycho.spec b/tycho.spec
index 4a41ea7..bb910b5 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,6 +1,6 @@
# Bootstrap build
# Set this if Tycho and Eclipse are not in buildroot
-%global bootstrap 0
+%global bootstrap 1
# When building version under development (non-release)
# %%global snap -SNAPSHOT
%global snap %{nil}
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.18.1
-Release: 1%{?dist}
+Release: 1.1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -39,9 +39,6 @@ Patch3: %{name}-use-custom-resolver.patch
# a different version from the nonbootstrapped. Otherwise there will
# be cyclic dependencies.
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
# Additional changes needed just for bootstrap build
Patch7: %{name}-fix-bootstrap-build.patch
@@ -160,6 +157,11 @@ popd
%if %{bootstrap}
tar -xf %{SOURCE4}
+# EXACT version in reactor cache to build against when bootstrapping
+# If we built our own Tycho locally and put it into reactor cache instead
+# of using upstream's then we need to make sure the build finds it.
+sed -i 's/<tychoBootstrapVersion>0.16.0<\/tychoBootstrapVersion>/<tychoBootstrapVersion>0.18.0<\/tychoBootstrapVersion>/' pom.xml
+
# gid:aid used by bootstrapped build dependencies
mkdir -p .m2/org/ow2/asm/asm-debug-all/4.0/
pushd .m2/org/ow2/asm/asm-debug-all/4.0/
@@ -169,6 +171,9 @@ popd
%patch7 -p1
+# Tycho can't use cached composite repository metadata so use other type
+sed -i 's/releases\/kepler\//releases\/kepler\/201306260900/' tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
+
# Non-Bootstrap Build
%else
@@ -192,7 +197,9 @@ echo "Performing intermediary build"
mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true install javadoc:aggregate
%patch4 -p1 -R
-%patch5 -p1
+
+# EXACT version in reactor cache to build against (%%{version}-SNAPSHOT)
+sed -i 's/<tychoBootstrapVersion>0.16.0<\/tychoBootstrapVersion>/<tychoBootstrapVersion>0.18.0-SNAPSHOT<\/tychoBootstrapVersion>/' pom.xml
fi
%endif
@@ -283,6 +290,10 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Wed Jul 24 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.1-1.1
+- Use MavenSession and Plexus to determine state.
+- Fix bootstrap build.
+
* Thu Jul 18 2013 Roland Grunberg <rgrunber(a)redhat.com> 0.18.1-1
- Make changes to ensure intermediary build succeeds.
- Remove %%Patch6 in favour of call to sed.
10 years, 9 months
[tycho/f19] Make changes to ensure intermediary build succeeds.
by Roland Grunberg
commit f0a74e40b510ea069f9dc9d4f2e84e0f1b99042e
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Thu Jul 18 10:49:55 2013 -0400
Make changes to ensure intermediary build succeeds.
- Remove %Patch6 in favour of call to sed.
tycho-bootstrap.patch | 402 ++++++++++++++++----------------
tycho-remove-units.patch | 20 --
tycho-set-reactor-cache-version.patch | 8 +-
tycho.spec | 9 +-
4 files changed, 211 insertions(+), 228 deletions(-)
---
diff --git a/tycho-bootstrap.patch b/tycho-bootstrap.patch
index ab5718d..a34cb54 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 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Tycho (Incubation)</name>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>sisu-equinox</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>sisu-equinox</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>sisu-equinox</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>sisu-equinox-launching</artifactId>
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 @@
<parent>
<artifactId>tycho</artifactId>
<groupId>org.eclipse.tycho</groupId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>target-platform-configuration</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.tycho.test.utils</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<?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.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">
+-<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.1" 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.1.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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-bundles</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-standalone-p2-director</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-compiler-jdt</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-compiler-plugin</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-core</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-embedder-api</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-its</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-maven-plugin</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-metadata-model</artifactId>
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 @@
<parent>
<artifactId>tycho</artifactId>
<groupId>org.eclipse.tycho</groupId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-p2-repository-plugin</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-packaging-plugin</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-pomgenerator-plugin</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-release</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-versions-plugin</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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.13.jar,
jars/maven-surefire-common-2.13.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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>org.eclipse.tycho.surefire.osgibooter</artifactId>
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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-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 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 @@
<parent>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire</artifactId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-surefire-plugin</artifactId>
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 @@
<parent>
<artifactId>tycho</artifactId>
<groupId>org.eclipse.tycho</groupId>
-- <version>0.18.0</version>
-+ <version>0.18.0-SNAPSHOT</version>
+- <version>0.18.1</version>
++ <version>0.18.1-SNAPSHOT</version>
</parent>
<artifactId>tycho-testing-harness</artifactId>
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 \
- <jdtAptVersion>1.0.600.v20130227-1643</jdtAptVersion>
+@@ -143,7 +143,7 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
+ <jdtAptVersion>1.0.600.v20130530-1010</jdtAptVersion>
<!-- version of tycho used by this build -->
- <tychoBootstrapVersion>0.16.0</tychoBootstrapVersion>
-+ <tychoBootstrapVersion>0.18.0-SNAPSHOT</tychoBootstrapVersion>
++ <tychoBootstrapVersion>0.18.1-SNAPSHOT</tychoBootstrapVersion>
</properties>
<dependencyManagement>
diff --git a/tycho.spec b/tycho.spec
index d4e4d53..4a41ea7 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 '/^<unit id=.*$/d' tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
# installed version of Tycho
sysVer=`grep -C 1 "<artifactId>tycho</artifactId>" %{_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 <rgrunber(a)redhat.com> 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 <kdaniel(a)redhat.com> 0.18.1-1
- Update to 0.18.1.
10 years, 9 months
[tycho/f19] Update to 0.18.1.
by Roland Grunberg
commit 1cf8b50d36e6f0d6a0478421bd40b04005cea9cf
Author: Krzysztof Daniel <kdaniel(a)redhat.com>
Date: Thu Jul 18 12:08:05 2013 +0200
Update to 0.18.1.
sources | 2 +-
tycho-fix-build.patch | 19 -------------------
tycho-maven-surefire.patch | 2 +-
tycho-remove-units.patch | 8 ++++----
tycho.spec | 11 +++++++----
5 files changed, 13 insertions(+), 29 deletions(-)
---
diff --git a/sources b/sources
index 8d2b3fe..4d224a5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
9cb3258a724ba3b141be77d7c7ffde23 maven-repo.tar.xz
-09a6a99b626ca52ecc3d65c574f8d087 tycho-0.18.x.tar.bz2
+2519253ad74fd2613f1ce3250a646d8a org.eclipse.tycho-tycho-0.18.x.tar.bz2
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index 7eb972c..2698910 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -392,25 +392,6 @@ index df63b2f..510db0a 100644
}
return verifier;
-diff --git a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
-index a9d80d3..3ddbe9c 100644
---- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
-+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/testing/EmptyLifecycleExecutor.java
-@@ -37,6 +37,14 @@ public class EmptyLifecycleExecutor implements LifecycleExecutor {
- return null;
- }
-
-+ public MavenExecutionPlan calculateExecutionPlan(MavenSession session, boolean bool, String... tasks)
-+ throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
-+ MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-+ PluginManagerException, LifecyclePhaseNotFoundException, LifecycleNotFoundException,
-+ PluginVersionResolutionException {
-+ return null;
-+ }
-+
- public MavenExecutionPlan calculateExecutionPlan(MavenSession session, String... tasks)
- throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
- MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
--
1.8.1.4
diff --git a/tycho-maven-surefire.patch b/tycho-maven-surefire.patch
index 665f697..5e3e6af 100644
--- a/tycho-maven-surefire.patch
+++ b/tycho-maven-surefire.patch
@@ -395,7 +395,7 @@ index e75a51f..1b5ac72 100644
+ jars/surefire-api-2.13.jar,
+ jars/maven-surefire-common-2.13.jar,
+ jars/plexus-utils-3.0.jar
- Bundle-Version: 0.18.0
+ Bundle-Version: 0.18.1
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
diff --git a/tycho-remove-units.patch b/tycho-remove-units.patch
index 9aadb43..d4a27f9 100644
--- a/tycho-remove-units.patch
+++ b/tycho-remove-units.patch
@@ -7,10 +7,10 @@ index 2063db2..44b60d2 100644
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
-<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"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.3-I-builds/I20130526-0500/"/>
+-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20130605-2000"/>
+-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20130604-2046"/>
+-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20130529-1710"/>
+ <repository location="http://download.eclipse.org/releases/kepler/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<!-- required for surefire junit3 provider -->
diff --git a/tycho.spec b/tycho.spec
index 5aec976..d4e4d53 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -8,15 +8,15 @@
%define __requires_exclude osgi*
Name: tycho
-Version: 0.18.0
-Release: 4%{?dist}
+Version: 0.18.1
+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/tycho-0.18....
+Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/org.eclipse...
# 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
@@ -141,7 +141,7 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-0.18.x
+%setup -q -n org.eclipse.tycho-%{name}-0.18.x
%patch0 -p1
%patch1 -p1
@@ -284,6 +284,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Thu Jul 18 2013 Krzysztof Daniel <kdaniel(a)redhat.com> 0.18.1-1
+- Update to 0.18.1.
+
* Tue Jul 16 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.0-4
- Look for maven artifacts using XMvn Resolver.
10 years, 9 months
[tycho/f19] Look for maven artifacts using XMvn Resolver.
by Roland Grunberg
commit 68d7847ffe3e387f1e70a0a69cdcba10fe838405
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Wed Jul 17 10:04:55 2013 -0400
Look for maven artifacts using XMvn Resolver.
tycho-use-custom-resolver.patch | 51 +++++++++++++++++++++++++++++++++++++-
tycho.spec | 5 +++-
2 files changed, 53 insertions(+), 3 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index 37c935a..7628268 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From 6f5e04370e6aec093b9f1df2a5afa5c40eccc666 Mon Sep 17 00:00:00 2001
+From efb53f644836927c9f2693ee9d750ef83091ab83 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.
@@ -19,10 +19,17 @@ has a dependency on javax.lang.model (since 1.6).
Use the defined target environments in local mode when the property
tycho.local.keepTarget is set.
+In situations where Tycho must resolve maven artifacts, upstream's
+implementation only looks in the reactor cache. In Fedora, maven
+artifacts may be located on the system using repository layouts
+understood by XMvn. Therefore, when an artifact is not found in the
+reactor cache, resolution should be attempted using the XMvn Resolver.
+
Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
---
.../tycho/p2/target/TargetDefinitionResolver.java | 11 +++--
.../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++--
+ .../tycho/p2/repository/LocalRepositoryReader.java | 21 ++++++++-
tycho-core/pom.xml | 5 ++
.../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++
.../tycho/core/osgitools/AbstractTychoProject.java | 24 ++++++++++
@@ -30,7 +37,7 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../DefaultTargetPlatformConfigurationReader.java | 6 ++-
.../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 +++++++
.../p2/resolver/P2TargetPlatformResolver.java | 11 +++++
- 9 files changed, 164 insertions(+), 10 deletions(-)
+ 10 files changed, 184 insertions(+), 11 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 2dc91ff..34c48ff 100644
@@ -142,6 +149,46 @@ index 5b61351..be3c47f 100644
if (includeLocalMavenRepo && logger.isDebugEnabled()) {
IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
+diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+index 8d36462..80182bd 100644
+--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
++++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+@@ -10,7 +10,9 @@
+ *******************************************************************************/
+ package org.eclipse.tycho.p2.repository;
+
++import java.io.BufferedReader;
+ import java.io.File;
++import java.io.InputStreamReader;
+
+ public class LocalRepositoryReader implements RepositoryReader {
+
+@@ -21,7 +23,24 @@ public class LocalRepositoryReader implements RepositoryReader {
+ }
+
+ public File getLocalArtifactLocation(GAV gav, String classifier, String extension) {
+- return new File(localMavenRepositoryRoot, RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
++ File file = new File(localMavenRepositoryRoot, RepositoryLayoutHelper.getRelativePath(gav, classifier, extension));
++ // In Fedora the artifact may be in an XMvn-defined repository location (not in reactor cache)
++ // A more sensible solution will be possible when upstream bug 353889 is resolved.
++ if (!file.exists()) {
++ String coord = gav.toString() + ":" + extension;
++ try {
++ // XMvn is required at runtime so this will exist
++ Process p = Runtime.getRuntime().exec(new String[] { "xmvn-resolve", coord });
++ p.waitFor();
++ BufferedReader buff = new BufferedReader(new InputStreamReader(p.getInputStream()));
++ String filePath = buff.readLine();
++ buff.close();
++ file = new File(filePath);
++ } catch (Exception e) {
++ return file;
++ }
++ }
++ return file;
+ }
+
+ }
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
index 25ef342..72c5bb5 100644
--- a/tycho-core/pom.xml
diff --git a/tycho.spec b/tycho.spec
index ec12e78..5aec976 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.18.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -284,6 +284,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
+* Tue Jul 16 2013 Roland Grunberg <rgrunber(a)redhat.com> - 0.18.0-4
+- Look for maven artifacts using XMvn Resolver.
+
* Fri Jul 5 2013 Alexander Kurtakov <akurtako(a)redhat.com> 0.18.0-3
- Use _jnidir too when building local p2 repo.
10 years, 9 months
[junit] Add create-tarball.sh script to SRPM
by Michal Srb
commit e19d1e045c214868c512a921c301caf4221fe843
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Aug 2 10:16:32 2013 +0200
Add create-tarball.sh script to SRPM
clean-tarball.sh => create-tarball.sh | 2 +-
junit.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/clean-tarball.sh b/create-tarball.sh
similarity index 88%
rename from clean-tarball.sh
rename to create-tarball.sh
index 7c90976..1594760 100755
--- a/clean-tarball.sh
+++ b/create-tarball.sh
@@ -1,7 +1,7 @@
#!/bin/bash
if [ $# -ne 1 ]; then
- echo "Usage: ./clean-tarball VERSION"
+ echo "Usage: ./create-tarball.sh VERSION"
exit 1
fi
diff --git a/junit.spec b/junit.spec
index 41072b3..d8dbf15 100644
--- a/junit.spec
+++ b/junit.spec
@@ -30,7 +30,7 @@
Name: junit
Version: 4.11
-Release: 4%{?dist}
+Release: 5%{?dist}
Epoch: 0
Summary: Java regression test package
License: CPL
@@ -41,6 +41,8 @@ BuildArch: noarch
# ./clean-tarball.sh %{version}
Source0: %{name}-%{version}-clean.tar.gz
Source2: junit-OSGi-MANIFEST.MF
+Source3: create-tarball.sh
+
# Removing hamcrest source jar references (not available and/or necessary)
Patch0: %{name}-no-hamcrest-src.patch
@@ -149,6 +151,9 @@ cp -pr %{name}%{version}-SNAPSHOT/%{name}/* %{buildroot}%{_datadir}/%{name}/demo
%doc junit%{version}-SNAPSHOT/doc/*
%changelog
+* Fri Aug 02 2013 Michal Srb <msrb(a)redhat.com> - 0:4.11-5
+- Add create-tarball.sh script to SRPM
+
* Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:4.11-4
- Rebuild to regenerate API documentation
- Resolves: CVE-2013-1571
10 years, 9 months
[junit] Rebuild to fix CVE-2013-1571
by Michal Srb
commit 60f37cc8cb5ce3cf76dd4df6fe257d191f82652e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Fri Jun 28 13:34:42 2013 +0200
Rebuild to fix CVE-2013-1571
junit.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/junit.spec b/junit.spec
index 2858d9b..41072b3 100644
--- a/junit.spec
+++ b/junit.spec
@@ -30,7 +30,7 @@
Name: junit
Version: 4.11
-Release: 3%{?dist}
+Release: 4%{?dist}
Epoch: 0
Summary: Java regression test package
License: CPL
@@ -149,6 +149,10 @@ cp -pr %{name}%{version}-SNAPSHOT/%{name}/* %{buildroot}%{_datadir}/%{name}/demo
%doc junit%{version}-SNAPSHOT/doc/*
%changelog
+* Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:4.11-4
+- Rebuild to regenerate API documentation
+- Resolves: CVE-2013-1571
+
* Fri Jun 21 2013 Michal Srb <msrb(a)redhat.com> - 0:4.11-3
- Build from clean tarball
10 years, 9 months