rpms/tycho
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to 0.18.0 Release.

Browse Source
This commit is contained in:
Roland Grunberg 2013-05-28 12:30:56 -04:00
parent 6b0855eb58
commit 66215e316c
9 changed files with 261 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

402
tycho-bootstrap.patch
View File

File diff suppressed because it is too large Load Diff

31
tycho-fix-bootstrap-build.patch
View File

@ -1,4 +1,4 @@
From 58236a7ae06bbc09625398d6a4b369f7f74d57b3 Mon Sep 17 00:00:00 2001
From 4bd0fb083b6329ddc8df7b09dcfded3a45113a2f Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Mon, 19 Nov 2012 10:33:43 -0500
Subject: [PATCH] Minor fixes of limited scope to get a Tycho bootstrapped
@ -50,22 +50,23 @@ index 47423e5..4b4c600 100644
jetty.addConnector(connector);
diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
index a014278..a6ddfed 100644
index 2063db2..bd011fe 100644
--- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
+++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
@@ -2,16 +2,16 @@
<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="15">
<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="16">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20130228-0336"/>
-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20130314-1330"/>
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20130314-0217"/>
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20130312-1605"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20130521-0416"/>
-<unit id="org.eclipse.sdk.ide" version="4.3.0.I20130526-0500"/>
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20130526-0335"/>
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20130515-2026"/>
+<unit id="org.eclipse.equinox.executable.feature.group"/>
+<unit id="org.eclipse.sdk.ide"/>
+<unit id="org.eclipse.equinox.p2.sdk.feature.group"/>
+<unit id="org.eclipse.equinox.core.sdk.feature.group"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.3milestones/S-4.3M6-201303141330/"/>
-<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-201303141330/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
<!-- required for surefire junit3 provider -->
@ -77,10 +78,10 @@ index a014278..a6ddfed 100644
</locations>
</target>
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
index 37ce827..4cc7644 100644
index 1aec480..0eeb0fa 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/OsgiManifest.java
@@ -25,7 +25,7 @@ public class OsgiManifest {
@@ -26,7 +26,7 @@ public class OsgiManifest {
private static final StandardExecutionEnvironment[] EMPTY_EXEC_ENV = new StandardExecutionEnvironment[0];
private String location;
@ -89,7 +90,7 @@ index 37ce827..4cc7644 100644
// cache for parsed values of commonly used headers
private String bundleSymbolicName;
@@ -78,7 +78,7 @@ public class OsgiManifest {
@@ -80,7 +80,7 @@ public class OsgiManifest {
}
private String parseMandatoryFirstValue(String headerKey) throws InvalidOSGiManifestException {
@ -98,7 +99,7 @@ index 37ce827..4cc7644 100644
if (value == null) {
throw new InvalidOSGiManifestException(location, "MANIFEST header '" + headerKey + "' not found");
}
@@ -100,12 +100,12 @@ public class OsgiManifest {
@@ -102,12 +102,12 @@ public class OsgiManifest {
&& "dir".equals(bundleShapeElements[0].getValue());
}
@ -113,7 +114,7 @@ index 37ce827..4cc7644 100644
}
public String getBundleSymbolicName() {
@@ -141,7 +141,7 @@ public class OsgiManifest {
@@ -143,7 +143,7 @@ public class OsgiManifest {
}
private ManifestElement[] parseHeader(String key) {
@ -122,7 +123,7 @@ index 37ce827..4cc7644 100644
if (value == null) {
return null;
}
@@ -154,7 +154,7 @@ public class OsgiManifest {
@@ -156,7 +156,7 @@ public class OsgiManifest {
public ManifestElement[] getManifestElements(String key) throws OsgiManifestParserException {
try {
@ -132,7 +133,7 @@ index 37ce827..4cc7644 100644
throw new OsgiManifestParserException(location, e);
}
diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
index 16534eb..2d69c67 100644
index 7dd7c41..62d5610 100644
--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
@@ -41,7 +41,7 @@

13
tycho-fix-build.patch
View File

@ -1,4 +1,4 @@
From 215b49c4e389f6317726cf1f233ec7d654ef2965 Mon Sep 17 00:00:00 2001
From 8c4a712700b4ef835bd40dd4061246679d4fe435 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH] Fix the Tycho build to work on Fedora.
@ -35,12 +35,11 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../maven/plugin/CompilationFailureException.java | 4 +--
.../core/maven/TychoMavenLifecycleParticipant.java | 4 ++-
.../tycho/test/AbstractTychoIntegrationTest.java | 11 +++---
.../org/eclipse/tycho/test/util/TychoMatchers.java | 4 +--
.../tycho/testing/EmptyLifecycleExecutor.java | 8 +++++
14 files changed, 55 insertions(+), 51 deletions(-)
13 files changed, 53 insertions(+), 49 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2822951..fd9920b 100644
index 3b57368..2651c9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,12 +208,12 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
@ -71,7 +70,7 @@ index 2822951..fd9920b 100644
<artifactId>surefire-booter</artifactId>
<version>2.10</version>
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
index cd0fb9a..01815d8 100644
index 84613d1..48139c9 100644
--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
@@ -24,7 +24,7 @@
@ -132,7 +131,7 @@ index 57b4e10..47423e5 100644
jetty.addConnector(connector);
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
index 9bc34bb..f22a55c 100644
index 02d1dd1..ba9471a 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -42,7 +42,6 @@
@ -156,7 +155,7 @@ index 62b354d..11f65fb 100644
<plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
index 3857d62..fa6c17c 100644
index f2c321f..75f4cd7 100644
--- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml
@@ -38,10 +38,6 @@

18
tycho-fix-surefire.patch
View File

@ -1,4 +1,4 @@
From 8a790e6ca3fe8beee86883ea6d8d33854b197a44 Mon Sep 17 00:00:00 2001
From 249113f725b6f00ff69f5e681a6b8c85cdd7cc13 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Fri, 21 Sep 2012 10:58:09 -0400
Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire.
@ -24,10 +24,10 @@ Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f
6 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
index 6d6fcf3..43a798a 100644
index af80319..2f14f0f 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 0.17.0
@@ -6,6 +6,7 @@ Bundle-Version: 0.18.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@ -38,7 +38,7 @@ index 6d6fcf3..43a798a 100644
+ jars/common-junit3-2.13.jar
Bundle-Vendor: %providerName
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
index 51cb8af..a15c972 100644
index 3d0f7c1..1115be2 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
@@ -44,6 +44,11 @@
@ -54,10 +54,10 @@ index 51cb8af..a15c972 100644
</configuration>
</execution>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
index 2821621..1b27a6c 100644
index 3b15d2b..e830991 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
@@ -6,7 +6,9 @@ Bundle-Version: 0.17.0
@@ -6,7 +6,9 @@ Bundle-Version: 0.18.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@ -69,7 +69,7 @@ index 2821621..1b27a6c 100644
org.junit;version="4.0.0",
org.junit.runner;version="4.0.0",
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
index c526a3a..bcb4d39 100644
index caa77d2..32c45fc 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
@@ -44,6 +44,16 @@
@ -90,7 +90,7 @@ index c526a3a..bcb4d39 100644
</configuration>
</execution>
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
index 522c40f..a4831a6 100644
index b4d02aa..c49f2da 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
@@ -8,7 +8,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
@ -105,7 +105,7 @@ index 522c40f..a4831a6 100644
org.junit;version="[4.7,5)",
org.junit.runner;version="[4.7,5)",
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
index 5fc2106..678fb0c 100644
index 6a6eaa2..42135ea 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -54,6 +54,16 @@

22
tycho-maven-surefire.patch
View File

@ -1,4 +1,4 @@
From 47bdd92d667cacf94d903e4677bc53c350f8e293 Mon Sep 17 00:00:00 2001
From c92d9ba25cf61652ddece8602dec1e67eeb4971a Mon Sep 17 00:00:00 2001
From: Jan Sievers <jan.sievers@sap.com>
Date: Tue, 4 Sep 2012 16:02:52 +0200
Subject: [PATCH] POC 386481 update maven surefire to latest version 2.13
@ -42,7 +42,7 @@ Change-Id: Ibcb439a24add880c4cdafe67b42e29ca3cb14ff1
delete mode 100644 tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreRunListener.java
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
index 5274861..6d6fcf3 100644
index dbe883b..af80319 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
@@ -7,5 +7,5 @@ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
@ -64,10 +64,10 @@ index 499ce76..fe88b19 100644
+ jars/,\
plugin.properties
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
index 890a069..2821621 100644
index 7498728..3b15d2b 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 0.17.0
@@ -6,7 +6,7 @@ Bundle-Version: 0.18.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
@ -88,10 +88,10 @@ index b787149..fe88b19 100644
+ jars/,\
plugin.properties
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
index 3a83088..522c40f 100644
index 024acb7..b4d02aa 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
@@ -6,11 +6,14 @@ Bundle-Version: 0.17.0
@@ -6,11 +6,14 @@ Bundle-Version: 0.18.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .,
@ -123,7 +123,7 @@ index 716961d..2589258 100644
about_files/
-source.. = src/
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
index 10f68c1..5fc2106 100644
index d5abf73..6a6eaa2 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -44,6 +44,16 @@
@ -382,7 +382,7 @@ index fb6bede..0000000
-
-}
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
index d035572..ceb4814 100644
index e75a51f..1b5ac72 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
@@ -4,8 +4,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
@ -399,7 +399,7 @@ index d035572..ceb4814 100644
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
index d9f9263..9ac6c89 100644
index 20d5b39..651282f 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -52,6 +52,16 @@
@ -503,7 +503,7 @@ index 791221b..72a5f75 100644
/*
diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
index 16534eb..4f9d39f 100644
index 7dd7c41..18db932 100644
--- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml
@@ -26,7 +26,7 @@
@ -516,7 +516,7 @@ index 16534eb..4f9d39f 100644
<modules>
diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
index d47ad8d..d620d92 100644
index 5d496d3..2d5d245 100644
--- a/tycho-surefire/tycho-surefire-plugin/pom.xml
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
@@ -96,5 +96,10 @@

6
tycho-remove-units.patch
View File

@ -1,5 +1,7 @@
--- org.eclipse.tycho-tycho-0.18.x/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target.bak 2013-05-29 14:15:55.044897048 +0200
+++ org.eclipse.tycho-tycho-0.18.x/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target 2013-05-29 14:16:22.171161529 +0200
diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
index 2063db2..44b60d2 100644
--- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
+++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
@@ -2,15 +2,10 @@
<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="16">
<locations>

2
tycho-set-reactor-cache-version.patch
View File

@ -7,7 +7,7 @@ index fd9920b..8a469d6 100644
<!-- version of tycho used by this build -->
- <tychoBootstrapVersion>0.16.0</tychoBootstrapVersion>
+ <tychoBootstrapVersion>0.17.0-SNAPSHOT</tychoBootstrapVersion>
+ <tychoBootstrapVersion>0.18.0-SNAPSHOT</tychoBootstrapVersion>
</properties>
<dependencyManagement>

14
tycho-use-custom-resolver.patch
View File

@ -1,4 +1,4 @@
From dcf9f210ba54345cfe85ba91ea0d18f617cd6940 Mon Sep 17 00:00:00 2001
From 6f5e04370e6aec093b9f1df2a5afa5c40eccc666 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@ -33,7 +33,7 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
9 files changed, 164 insertions(+), 10 deletions(-)
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
index 6ea8a81..e90d279 100644
index 2dc91ff..34c48ff 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.CoreException;
@ -62,7 +62,7 @@ index 6ea8a81..e90d279 100644
IQueryable<IInstallableUnit> locationUnits = new CompoundQueryable<IInstallableUnit>(
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
index 3b8b9ab..b98c254 100644
index 5b61351..be3c47f 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
@@ -38,6 +38,9 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent;
@ -88,7 +88,7 @@ index 3b8b9ab..b98c254 100644
try {
remoteRepositoryIdManager.addMapping(location.getId(), location.getURL());
@@ -372,12 +381,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
@@ -374,12 +383,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
result.addAll(contentPart.getUnits());
}
@ -143,7 +143,7 @@ index 3b8b9ab..b98c254 100644
if (includeLocalMavenRepo && logger.isDebugEnabled()) {
IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
index 95f31fc..4d06441 100644
index 25ef342..72c5bb5 100644
--- a/tycho-core/pom.xml
+++ b/tycho-core/pom.xml
@@ -146,6 +146,11 @@
@ -301,7 +301,7 @@ index ab40599..3e64271 100644
}
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
index 63dba63..d292773 100644
index edfc57b..d65b464 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
@@ -64,7 +64,11 @@ public class DefaultTargetPlatformConfigurationReader {
@ -360,7 +360,7 @@ index 1e878e5..2de11ad 100644
request.setArtifact(artifact);
request.setResolveRoot(true).setResolveTransitively(false);
diff --git a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
index d6cbc6d..85e2c0d 100644
index f6f56ac..5abfd79 100644
--- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
+++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
@@ -189,6 +189,17 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp

9
tycho.spec
View File

@ -9,14 +9,14 @@
Name: tycho
Version: 0.18.0
Release: 0.1.gitb1068d%{?dist}
Release: 1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
# license file is missing but all files having some licensing information are ASL 2.0
License: ASL 2.0
URL: http://tycho.sonatype.org/
Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/org.eclipse.tycho-tycho-0.18.x.tar.bz2
Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.18.x.tar.bz2
# this is a workaround for maven-plugin-plugin changes that happened after
# version 2.4.3 (impossible to have empty mojo created as aggregate). This
@ -125,7 +125,7 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}.
%prep
%setup -q -n org.eclipse.tycho-tycho-0.18.x
%setup -q -n %{name}-0.18.x
%patch0 -p1
%patch1 -p1
@ -268,6 +268,9 @@ install -m 644 $osgiJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.jar
%{_javadocdir}/%{name}
%changelog
* Tue May 28 2013 Roland Grunberg <rgrunber@redhat.com> 0.18.0-1
- Update to 0.18.0 Release.
* Tue Apr 11 2013 Roland Grunberg <rgrunber@redhat.com> 0.17.0-1
- Fix bootstrap build for potential future use.