commit 6b0855eb58e859d91fb3404d6f0da4061ab2f407
Author: Krzysztof Daniel <kdaniel(a)redhat.com>
Date: Wed May 29 14:59:39 2013 +0200
Update to 0.18.0
sources | 2 +-
tycho-fix-build.patch | 15 ---------------
tycho-maven-surefire.patch | 2 +-
tycho-remove-units.patch | 18 ++++++++----------
tycho.spec | 8 ++++----
5 files changed, 14 insertions(+), 31 deletions(-)
---
diff --git a/sources b/sources
index b247d7a..8d2b3fe 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-7f89f1b9b37cca4977a7c839abfd31fd tycho-0.17.x.tar.bz2
9cb3258a724ba3b141be77d7c7ffde23 maven-repo.tar.xz
+09a6a99b626ca52ecc3d65c574f8d087 tycho-0.18.x.tar.bz2
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index 2736683..bcaa565 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -393,21 +393,6 @@ index df63b2f..510db0a 100644
}
return verifier;
-diff --git
a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
-index 6526bf1..421794d 100644
---- a/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
-+++ b/tycho-testing-harness/src/main/java/org/eclipse/tycho/test/util/TychoMatchers.java
-@@ -16,8 +16,8 @@ import java.util.List;
- import org.hamcrest.CoreMatchers;
- import org.hamcrest.Description;
- import org.hamcrest.Matcher;
--import org.junit.internal.matchers.SubstringMatcher;
--import org.junit.internal.matchers.TypeSafeMatcher;
-+import org.hamcrest.core.SubstringMatcher;
-+import org.hamcrest.TypeSafeMatcher;
- import org.junit.matchers.JUnitMatchers;
-
- /**
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
diff --git a/tycho-maven-surefire.patch b/tycho-maven-surefire.patch
index a7c20a2..70c265b 100644
--- a/tycho-maven-surefire.patch
+++ b/tycho-maven-surefire.patch
@@ -395,7 +395,7 @@ index d035572..ceb4814 100644
+ jars/surefire-api-2.13.jar,
+ jars/maven-surefire-common-2.13.jar,
+ jars/plexus-utils-3.0.jar
- Bundle-Version: 0.17.0
+ Bundle-Version: 0.18.0
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
diff --git a/tycho-remove-units.patch b/tycho-remove-units.patch
index c25274b..061ab66 100644
--- a/tycho-remove-units.patch
+++ b/tycho-remove-units.patch
@@ -1,16 +1,14 @@
-diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
-index a014278..2b54ed8 100644
---- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
-+++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
+---
org.eclipse.tycho-tycho-0.18.x/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target.bak 2013-05-29
14:15:55.044897048 +0200
++++
org.eclipse.tycho-tycho-0.18.x/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target 2013-05-29
14:16:22.171161529 +0200
@@ -2,15 +2,10 @@
- <?pde version="3.8"?><target name="Target platform for
Tycho's bundles" sequenceNumber="15">
+ <?pde version="3.8"?><target name="Target platform for
Tycho's bundles" sequenceNumber="16">
<locations>
<location includeAllPlatforms="false"
includeConfigurePhase="false" includeMode="slicer"
includeSource="false" type="InstallableUnit">
--<unit id="org.eclipse.equinox.executable.feature.group"
version="3.6.0.v20130228-0336"/>
--<unit id="org.eclipse.sdk.ide"
version="4.3.0.I20130314-1330"/>
--<unit id="org.eclipse.equinox.p2.sdk.feature.group"
version="3.8.0.v20130314-0217"/>
--<unit id="org.eclipse.equinox.core.sdk.feature.group"
version="3.8.0.v20130312-1605"/>
- <repository
location="http://download.eclipse.org/eclipse/updates/4.3milestones/...
+-<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/I...
</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 965ebbb..5a3b696 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -8,15 +8,15 @@
%define __requires_exclude osgi*
Name: tycho
-Version: 0.17.0
-Release: 1%{?dist}
+Version: 0.18.0
+Release: 0.1.gitb1068d%{?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.17....
+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
@@ -125,7 +125,7 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-0.17.x
+%setup -q -n org.eclipse.tycho-tycho-0.18.x
%patch0 -p1
%patch1 -p1