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

Merge branch 'master' into f18 

master and f18 branches initially diverged due varying versions of
maven-surefire, which caused different patches to be needed on these
branches.
This commit is contained in:
Roland Grunberg 2012-10-30 16:29:52 -04:00
parent b0e6586257 5861b983ad
commit 367ad0daca
10 changed files with 401 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -1,11 +1,8 @@
/maven-repo.tar.bz2 /maven-repo.tar.bz2
/tycho-0.10.0.tar.xz
maven-repo.tar.xz
tycho-0.14.0-6391f1dafb35cbef48753e89c743ee9664a1c79d.tar.xz
tycho-0.14.0.tar.bz2
/tycho-0.14.x.tar.bz2
/tycho-0.15.x.tar.bz2
/org.eclipse.tycho-* /org.eclipse.tycho-*
/tycho-*.xz
/tycho-*.bz2
maven-repo.tar.xz
*.src.rpm *.src.rpm
/noarch /noarch
/.project /.project

30
copy-platform-all
View File

@ -1,13 +1,15 @@
#! /bin/sh #! /bin/sh
where=$1'-sdk' sdk=$1'-sdk'
repo=$1; shift launcher=$1'-launcher'
eclipse=$(rpm --eval '%{_eclipse_base}'); shift repo=$1
eclipse=$(rpm --eval '%{_eclipse_base}')
datadir=/usr/share/eclipse datadir=/usr/share/eclipse
tycho_bundles_external=/usr/share/java/tycho/tycho-bundles-external.zip
mkdir -p $where/plugins $where/features mkdir -p $sdk/plugins $sdk/features
pushd $where pushd $sdk
(cd $eclipse; (cd $eclipse;
ls -d plugins/* features/* 2>/dev/null) | ls -d plugins/* features/* 2>/dev/null) |
@ -76,20 +78,30 @@ for f in $(ls -d $eclipse/features/*); do
[ ! -e features/$feature ] && ln -s $eclipse/features/$feature features/$feature [ ! -e features/$feature ] && ln -s $eclipse/features/$feature features/$feature
done done
# jars in %%{_javadir} may not be uniquely named
id=1
for p in $(find /usr/share/java -name "*.jar"); do for p in $(find /usr/share/java -name "*.jar"); do
unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName' unzip -p $p 'META-INF/MANIFEST.MF' | grep -q 'Bundle-SymbolicName'
if [ $? = 0 ]; then if [ $? = 0 ]; then
plugin=$(basename $p) plugin=${id}-$(basename $p)
[ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin [ ! -e plugins/$plugin ] && ln -s $p plugins/$plugin
id=$((${id} + 1))
fi fi
done done
popd popd
eclipse -nosplash -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \ # use the bundled equinox launcher to publish the p2 repo
mkdir -p $launcher
pushd $launcher
unzip $tycho_bundles_external
java -jar eclipse/plugins/org.eclipse.equinox.launcher_*.jar -nosplash -application org.eclipse.equinox.p2.publisher.FeaturesAndBundlesPublisher \
-metadataRepository file:$repo \ -metadataRepository file:$repo \
-artifactRepository file:$repo \ -artifactRepository file:$repo \
-source $where \ -source $sdk \
-compress -append -publishArtifacts -compress -append -publishArtifacts
rm -rf $where popd
rm -rf $sdk $launcher

2
sources
View File

@ -1 +1 @@
6b2889160641b8470bc12fd50b3ee3fa org.eclipse.tycho-d7f8850f746dd72e0a97c1fdf32c06ce794fb83d.tar.bz2 e20a738b62efb1da02d5bbd1888bc9a4 tycho-0.16.x.tar.bz2

406
tycho-bootstrap.patch
View File

File diff suppressed because it is too large Load Diff

50
tycho-fix-build.patch
View File

@ -1,7 +1,7 @@
From e82aad8024d9cddf6e997292c190cf4347f773ce Mon Sep 17 00:00:00 2001 From 1f2c5e307b8d8d2a46ee5eb32359e33d9db3c225 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com> From: Roland Grunberg <rgrunber@redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400 Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH] Fix the Tycho build to work on Fedora. Subject: [PATCH 1/4] Fix the Tycho build to work on Fedora.
Minor fixes of limited scope needed to have Tycho building on Fedora. Minor fixes of limited scope needed to have Tycho building on Fedora.
@ -18,6 +18,7 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
--- ---
pom.xml | 5 ----- pom.xml | 5 -----
tycho-artifactcomparator/pom.xml | 4 ++-- tycho-artifactcomparator/pom.xml | 4 ++--
.../eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java | 2 +-
.../tycho-bundles-external/tycho-bundles-external.product | 1 - .../tycho-bundles-external/tycho-bundles-external.product | 1 -
tycho-bundles/tycho-bundles-target/tycho.target | 4 ---- tycho-bundles/tycho-bundles-target/tycho.target | 4 ----
.../tycho-standalone-p2-director/p2 Director.product | 1 - .../tycho-standalone-p2-director/p2 Director.product | 1 -
@ -25,13 +26,13 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++- .../tycho/core/maven/TychoMavenLifecycleParticipant.java | 4 +++-
.../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------ .../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
.../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++ .../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
9 files changed, 18 insertions(+), 24 deletions(-) 10 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml diff --git a/pom.xml b/pom.xml
index dc7c1f5..1868f9a 100644 index afe83e3..ed2d224 100644
--- a/pom.xml --- a/pom.xml
+++ b/pom.xml +++ b/pom.xml
@@ -221,11 +221,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \ @@ -226,11 +226,6 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
<version>${jdtVersion}</version> <version>${jdtVersion}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -44,7 +45,7 @@ index dc7c1f5..1868f9a 100644
<artifactId>surefire-booter</artifactId> <artifactId>surefire-booter</artifactId>
<version>2.10</version> <version>2.10</version>
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
index 775107a..11bcb70 100644 index 0a4ed6d..720feb5 100644
--- a/tycho-artifactcomparator/pom.xml --- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml +++ b/tycho-artifactcomparator/pom.xml
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
@ -63,8 +64,21 @@ index 775107a..11bcb70 100644
-</project> -</project>
\ No newline at end of file \ No newline at end of file
+</project> +</project>
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java
index 87c9e11..927cea5 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/ee/CustomEEResolutionHandler.java
@@ -59,7 +59,7 @@ class CustomEEResolutionHandler extends ExecutionEnvironmentResolutionHandler {
String name = capability.getName();
String version = capability.getVersion().toString();
- if (JREAction.NAMESPACE_OSGI_EE.equals(namespace)) {
+ if ("osgi.ee".equals(namespace)) {
result.add(new SystemCapability(Type.OSGI_EE, name, version));
} else if (PublisherHelper.CAPABILITY_NS_JAVA_PACKAGE.equals(namespace)) {
result.add(new SystemCapability(Type.JAVA_PACKAGE, name, version));
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
index 3e584f5..8b54310 100644 index b12ff8c..9e53672 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product --- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product +++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -41,7 +41,6 @@ @@ -41,7 +41,6 @@
@ -76,18 +90,18 @@ index 3e584f5..8b54310 100644
<plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target diff --git a/tycho-bundles/tycho-bundles-target/tycho.target b/tycho-bundles/tycho-bundles-target/tycho.target
index d23b885..1437dbd 100644 index 3436ba6..da4da36 100644
--- a/tycho-bundles/tycho-bundles-target/tycho.target --- a/tycho-bundles/tycho-bundles-target/tycho.target
+++ b/tycho-bundles/tycho-bundles-target/tycho.target +++ b/tycho-bundles/tycho-bundles-target/tycho.target
@@ -4,10 +4,6 @@ @@ -2,10 +2,6 @@
<target name="Target platform for Tycho's bundles" sequenceNumber="7"> <?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="8">
<locations> <locations>
<location includeAllPlatforms="false" includeMode="slicer" includeSource="false" type="InstallableUnit"> <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120522-1813-7P7OG2BFLWUl7UmbVUO9iCm"/> -<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.0.v20120913-142258-7P7OG2BFLWUl7Unz-8OO8IEVz-8"/>
-<unit id="org.eclipse.sdk.ide" version="4.2.0.I20120608-1400"/> -<unit id="org.eclipse.sdk.ide" version="4.3.0.I20121002-0800"/>
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120522-1813-85FAcGbBFoYTldHrOJw3cF4q"/> -<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.8.0.v20120913-170722-84FAgGhRFnbPjaFro9s2VXtitW"/>
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N89H_mGMMn84Osz0TAoT279BRQD"/> -<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.8.0.v20120524-0542-9N8BHpPGMMn84SxoTtoj_mfujQDR"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.2"/> <repository location="http://download.eclipse.org/eclipse/updates/4.3-I-builds/I20121002-0800"/>
</location> </location>
</locations> </locations>
diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
@ -103,7 +117,7 @@ index dd80b5e..797b4ba 100644
<plugin id="org.eclipse.equinox.frameworkadmin"/> <plugin id="org.eclipse.equinox.frameworkadmin"/>
<plugin id="org.eclipse.equinox.frameworkadmin.equinox"/> <plugin id="org.eclipse.equinox.frameworkadmin.equinox"/>
diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml diff --git a/tycho-compiler-jdt/pom.xml b/tycho-compiler-jdt/pom.xml
index 01b9a9e..c373e6a 100644 index 4212cbb..712e431 100644
--- a/tycho-compiler-jdt/pom.xml --- a/tycho-compiler-jdt/pom.xml
+++ b/tycho-compiler-jdt/pom.xml +++ b/tycho-compiler-jdt/pom.xml
@@ -38,10 +38,6 @@ @@ -38,10 +38,6 @@
@ -174,5 +188,5 @@ index a9d80d3..3ddbe9c 100644
throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException, throws PluginNotFoundException, PluginResolutionException, PluginDescriptorParsingException,
MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException, MojoNotFoundException, NoPluginFoundForPrefixException, InvalidPluginDescriptorException,
-- --
1.7.11.4 1.7.11.7

48
tycho-fix-surefire.patch
View File

@ -1,7 +1,7 @@
From e0f650e736c27c6872082a153561c0739b19edc7 Mon Sep 17 00:00:00 2001 From 58563564e8c97ac3d25daff9f15812ade423ea6b Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com> From: Roland Grunberg <rgrunber@redhat.com>
Date: Fri, 21 Sep 2012 10:58:09 -0400 Date: Fri, 21 Sep 2012 10:58:09 -0400
Subject: [PATCH] Resolve all necessary dependencies for Tycho Surefire. Subject: [PATCH 3/4] Resolve all necessary dependencies for Tycho Surefire.
When running an Eclipse bundle's tests, Tycho Surefire resolves its When running an Eclipse bundle's tests, Tycho Surefire resolves its
runtime dependencies using a class loader, which is in fact just looking runtime dependencies using a class loader, which is in fact just looking
@ -24,21 +24,21 @@ Change-Id: I9ef0239eed887fa47c380efcdce968934c788c9f
6 files changed, 34 insertions(+), 4 deletions(-) 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 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 66c569d..73c0ef9 100644 index 4be0ccf..ad76bc9 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF --- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/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.16.0.qualifier @@ -6,6 +6,7 @@ Bundle-Version: 0.16.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0" Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5, Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6 JavaSE-1.6
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)" -Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)"
-Bundle-ClassPath: jars/surefire-junit3-2.12.3.jar -Bundle-ClassPath: jars/surefire-junit3-2.12.4.jar
+Require-Bundle: org.junit;bundle-version="[3.8.0,4.9.0)" +Require-Bundle: org.junit;bundle-version="[3.8.0,4.9.0)"
+Bundle-ClassPath: jars/surefire-junit3-2.12.3.jar, +Bundle-ClassPath: jars/surefire-junit3-2.12.4.jar,
+ jars/common-junit3-2.12.3.jar + jars/common-junit3-2.12.4.jar
Bundle-Vendor: %providerName 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 diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
index f9feec9..188c45c 100644 index dce4c4f..9ff127c 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml --- a/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit/pom.xml
@@ -44,6 +44,11 @@ @@ -44,6 +44,11 @@
@ -54,22 +54,22 @@ index f9feec9..188c45c 100644
</configuration> </configuration>
</execution> </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 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 8acb207..85ecad7 100644 index 774a85f..916938b 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF --- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/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.16.0.qualifier @@ -6,7 +6,9 @@ Bundle-Version: 0.16.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0" Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5, Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6 JavaSE-1.6
-Bundle-ClassPath: jars/surefire-junit4-2.12.3.jar -Bundle-ClassPath: jars/surefire-junit4-2.12.4.jar
+Bundle-ClassPath: jars/surefire-junit4-2.12.3.jar, +Bundle-ClassPath: jars/surefire-junit4-2.12.4.jar,
+ jars/common-junit3-2.12.3.jar, + jars/common-junit3-2.12.4.jar,
+ jars/common-junit4-2.12.3.jar + jars/common-junit4-2.12.4.jar
Import-Package: junit.framework;version="3.0.0", Import-Package: junit.framework;version="3.0.0",
org.junit;version="4.0.0", org.junit;version="4.0.0",
org.junit.runner;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 diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
index f1f821e..ecf287c 100644 index 92ba3fb..4701d48 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml --- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml
@@ -44,6 +44,16 @@ @@ -44,6 +44,16 @@
@ -90,22 +90,22 @@ index f1f821e..ecf287c 100644
</configuration> </configuration>
</execution> </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 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 50ed65d..8176947 100644 index 9e16141..d0ddf01 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF --- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/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 @@ -8,7 +8,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: ., Bundle-ClassPath: .,
jars/surefire-junit47-2.12.3.jar, jars/surefire-junit47-2.12.4.jar,
jars/common-junit48-2.12.3.jar, jars/common-junit48-2.12.4.jar,
- jars/surefire-grouper-2.12.3.jar - jars/surefire-grouper-2.12.4.jar
+ jars/surefire-grouper-2.12.3.jar, + jars/surefire-grouper-2.12.4.jar,
+ jars/common-junit3-2.12.3.jar, + jars/common-junit3-2.12.4.jar,
+ jars/common-junit4-2.12.3.jar + jars/common-junit4-2.12.4.jar
Import-Package: junit.framework;version="3.0.0", Import-Package: junit.framework;version="3.0.0",
org.junit;version="[4.7,5)", org.junit;version="[4.7,5)",
org.junit.runner;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 diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
index 623631d..dd3b995 100644 index 45b5c65..df730e1 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml --- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -54,6 +54,16 @@ @@ -54,6 +54,16 @@
@ -126,5 +126,5 @@ index 623631d..dd3b995 100644
</configuration> </configuration>
</execution> </execution>
-- --
1.7.11.4 1.7.11.7

56
tycho-maven-surefire.patch
View File

@ -1,8 +1,8 @@
From fadaca9cd7c89634ee6bf0676fdf6cb0a0013f3a Mon Sep 17 00:00:00 2001 From a8596cd76899fd684fa7ad21ef6fbda17dd0e7ef Mon Sep 17 00:00:00 2001
From: Jan Sievers <jan.sievers@sap.com> From: Jan Sievers <jan.sievers@sap.com>
Date: Tue, 4 Sep 2012 16:02:52 +0200 Date: Tue, 4 Sep 2012 16:02:52 +0200
Subject: [PATCH 1/3] POC 386481 update maven surefire to latest version Subject: [PATCH 2/4] POC 386481 update maven surefire to latest version
2.12.3 2.12.4
while SUREFIRE-825 and SUREFIRE-876 are fixed, while SUREFIRE-825 and SUREFIRE-876 are fixed,
there are several new problems: there are several new problems:
@ -43,7 +43,7 @@ Change-Id: Ibcb439a24add880c4cdafe67b42e29ca3cb14ff1
delete mode 100644 tycho-surefire/org.eclipse.tycho.surefire.junit47/src/org/apache/maven/surefire/junitcore/OsgiEnabledJUnitCoreRunListener.java 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 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 c9281d6..66c569d 100644 index ada8852..4be0ccf 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF --- a/tycho-surefire/org.eclipse.tycho.surefire.junit/META-INF/MANIFEST.MF
+++ b/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" @@ -7,5 +7,5 @@ Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
@ -51,7 +51,7 @@ index c9281d6..66c569d 100644
JavaSE-1.6 JavaSE-1.6
Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)" Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)"
-Bundle-ClassPath: jars/surefire-junit3-2.10.jar -Bundle-ClassPath: jars/surefire-junit3-2.10.jar
+Bundle-ClassPath: jars/surefire-junit3-2.12.3.jar +Bundle-ClassPath: jars/surefire-junit3-2.12.4.jar
Bundle-Vendor: %providerName Bundle-Vendor: %providerName
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties b/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties b/tycho-surefire/org.eclipse.tycho.surefire.junit/build.properties
index 499ce76..fe88b19 100644 index 499ce76..fe88b19 100644
@ -65,15 +65,15 @@ index 499ce76..fe88b19 100644
+ jars/,\ + jars/,\
plugin.properties 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 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 c7ba8a9..8acb207 100644 index ac40634..774a85f 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF --- a/tycho-surefire/org.eclipse.tycho.surefire.junit4/META-INF/MANIFEST.MF
+++ b/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.16.0.qualifier @@ -6,7 +6,7 @@ Bundle-Version: 0.16.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0" Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.14.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5, Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6 JavaSE-1.6
-Bundle-ClassPath: jars/surefire-junit4-2.10.jar -Bundle-ClassPath: jars/surefire-junit4-2.10.jar
+Bundle-ClassPath: jars/surefire-junit4-2.12.3.jar +Bundle-ClassPath: jars/surefire-junit4-2.12.4.jar
Import-Package: junit.framework;version="3.0.0", Import-Package: junit.framework;version="3.0.0",
org.junit;version="4.0.0", org.junit;version="4.0.0",
org.junit.runner;version="4.0.0", org.junit.runner;version="4.0.0",
@ -89,17 +89,17 @@ index b787149..fe88b19 100644
+ jars/,\ + jars/,\
plugin.properties 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 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 14fb3ff..50ed65d 100644 index 578ad2c..9e16141 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF --- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/META-INF/MANIFEST.MF
+++ b/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.16.0.qualifier @@ -6,11 +6,14 @@ Bundle-Version: 0.16.0
Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0" Fragment-Host: org.eclipse.tycho.surefire.osgibooter;bundle-version="0.16.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: ., Bundle-ClassPath: .,
- jars/surefire-junit47-2.10.jar - jars/surefire-junit47-2.10.jar
+ jars/surefire-junit47-2.12.3.jar, + jars/surefire-junit47-2.12.4.jar,
+ jars/common-junit48-2.12.3.jar, + jars/common-junit48-2.12.4.jar,
+ jars/surefire-grouper-2.12.3.jar + jars/surefire-grouper-2.12.4.jar
Import-Package: junit.framework;version="3.0.0", Import-Package: junit.framework;version="3.0.0",
org.junit;version="[4.7,5)", org.junit;version="[4.7,5)",
org.junit.runner;version="[4.7,5)", org.junit.runner;version="[4.7,5)",
@ -124,7 +124,7 @@ index 716961d..2589258 100644
about_files/ about_files/
-source.. = src/ -source.. = src/
diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml diff --git a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
index 61beabb..623631d 100644 index 44c3e8a..45b5c65 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml --- a/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml
@@ -44,6 +44,16 @@ @@ -44,6 +44,16 @@
@ -383,7 +383,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 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 9c418b3..92eaa7f 100644 index 00f8fee..51abc8d 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF --- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/META-INF/MANIFEST.MF
+++ b/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", @@ -4,8 +4,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="3.2.2",
@ -392,15 +392,15 @@ index 9c418b3..92eaa7f 100644
Bundle-ClassPath: ., Bundle-ClassPath: .,
- jars/surefire-booter-2.10.jar, - jars/surefire-booter-2.10.jar,
- jars/surefire-api-2.10.jar - jars/surefire-api-2.10.jar
+ jars/surefire-booter-2.12.3.jar, + jars/surefire-booter-2.12.4.jar,
+ jars/surefire-api-2.12.3.jar, + jars/surefire-api-2.12.4.jar,
+ jars/maven-surefire-common-2.12.3.jar, + jars/maven-surefire-common-2.12.4.jar,
+ jars/plexus-utils-3.0.jar + jars/plexus-utils-3.0.jar
Bundle-Version: 0.16.0.qualifier Bundle-Version: 0.16.0
Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation) Bundle-Name: Tycho Surefire OSGi Booter Eclipse Application (Incubation)
Bundle-ManifestVersion: 2 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-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
index 9582aef..ef1cbcc 100644 index 100806a..23829a2 100644
--- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml --- a/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml +++ b/tycho-surefire/org.eclipse.tycho.surefire.osgibooter/pom.xml
@@ -52,6 +52,16 @@ @@ -52,6 +52,16 @@
@ -505,7 +505,7 @@ index 791221b..736e4a7 100644
* See TestMojo#mergeProviderProperties * See TestMojo#mergeProviderProperties
*/ */
diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml diff --git a/tycho-surefire/pom.xml b/tycho-surefire/pom.xml
index fe415d7..a3ff67f 100644 index eab06be..24e51d3 100644
--- a/tycho-surefire/pom.xml --- a/tycho-surefire/pom.xml
+++ b/tycho-surefire/pom.xml +++ b/tycho-surefire/pom.xml
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
@ -513,12 +513,12 @@ index fe415d7..a3ff67f 100644
<properties> <properties>
- <surefire-version>2.10</surefire-version> - <surefire-version>2.10</surefire-version>
+ <surefire-version>2.12.3</surefire-version> + <surefire-version>2.12.4</surefire-version>
</properties> </properties>
<modules> <modules>
diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml diff --git a/tycho-surefire/tycho-surefire-plugin/pom.xml b/tycho-surefire/tycho-surefire-plugin/pom.xml
index a9e2f1d..e24eb32 100644 index 8a099eb..2970388 100644
--- a/tycho-surefire/tycho-surefire-plugin/pom.xml --- a/tycho-surefire/tycho-surefire-plugin/pom.xml
+++ b/tycho-surefire/tycho-surefire-plugin/pom.xml +++ b/tycho-surefire/tycho-surefire-plugin/pom.xml
@@ -96,5 +96,10 @@ @@ -96,5 +96,10 @@
@ -533,7 +533,7 @@ index a9e2f1d..e24eb32 100644
</dependencies> </dependencies>
</project> </project>
diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java diff --git a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
index 77288dd..74efa24 100644 index a676571..112131d 100644
--- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java --- a/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
+++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java +++ b/tycho-surefire/tycho-surefire-plugin/src/main/java/org/eclipse/tycho/surefire/TestMojo.java
@@ -18,6 +18,7 @@ import java.io.IOException; @@ -18,6 +18,7 @@ import java.io.IOException;
@ -556,7 +556,7 @@ index 77288dd..74efa24 100644
import org.apache.maven.toolchain.Toolchain; import org.apache.maven.toolchain.Toolchain;
import org.apache.maven.toolchain.ToolchainManager; import org.apache.maven.toolchain.ToolchainManager;
import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.FileUtils;
@@ -626,6 +628,27 @@ public class TestMojo extends AbstractMojo { @@ -628,6 +630,27 @@ public class TestMojo extends AbstractMojo {
providerProperties.put("perCoreThreadCount", String.valueOf(perCoreThreadCount)); providerProperties.put("perCoreThreadCount", String.valueOf(perCoreThreadCount));
providerProperties.put("useUnlimitedThreads", String.valueOf(useUnlimitedThreads)); providerProperties.put("useUnlimitedThreads", String.valueOf(useUnlimitedThreads));
} }
@ -584,7 +584,7 @@ index 77288dd..74efa24 100644
for (Map.Entry entry : providerProperties.entrySet()) { for (Map.Entry entry : providerProperties.entrySet()) {
surefireProps.put("__provider." + entry.getKey(), entry.getValue()); surefireProps.put("__provider." + entry.getKey(), entry.getValue());
} }
@@ -670,7 +693,7 @@ public class TestMojo extends AbstractMojo { @@ -672,7 +695,7 @@ public class TestMojo extends AbstractMojo {
case 0: case 0:
getLog().info("All tests passed!"); getLog().info("All tests passed!");
break; break;
@ -593,7 +593,7 @@ index 77288dd..74efa24 100644
String message = "No tests found."; String message = "No tests found.";
if (failIfNoTests) { if (failIfNoTests) {
throw new MojoFailureException(message); throw new MojoFailureException(message);
@@ -678,7 +701,7 @@ public class TestMojo extends AbstractMojo { @@ -680,7 +703,7 @@ public class TestMojo extends AbstractMojo {
getLog().warn(message); getLog().warn(message);
} }
break; break;
@ -616,5 +616,5 @@ index 8358883..625b6fc 100644
public Version getVersion() { public Version getVersion() {
-- --
1.7.11.4 1.7.11.7

13
tycho-set-reactor-cache-version.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/pom.xml b/pom.xml
index afe83e3..2cc9a6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,7 +145,7 @@ $CMD -DpomFile=org.eclipse.jdt.compiler.apt.pom \
<jdtAptVersion>1.0.500.v20120522-1651</jdtAptVersion>
<!-- version of tycho used by this build -->
- <tychoBootstrapVersion>0.15.0</tychoBootstrapVersion>
+ <tychoBootstrapVersion>0.16.0-SNAPSHOT</tychoBootstrapVersion>
</properties>
<dependencyManagement>

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

@ -1,4 +1,4 @@
From 4df42326a0bc35ec82cda69c5d74e9b5d55d30d7 Mon Sep 17 00:00:00 2001 From 0dccc0201d08f24cc0fdc7a262cf36e5761cb012 Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com> From: Roland Grunberg <rgrunber@redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400 Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode. Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@ -28,8 +28,8 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++- .../tycho/core/osgitools/OsgiBundleProject.java | 29 +++++++++++-
.../DefaultTargetPlatformConfigurationReader.java | 5 +- .../DefaultTargetPlatformConfigurationReader.java | 5 +-
.../osgi/runtime/TychoOsgiRuntimeLocator.java | 15 ++++++ .../osgi/runtime/TychoOsgiRuntimeLocator.java | 15 ++++++
.../p2/resolver/P2TargetPlatformResolver.java | 10 ++++ .../p2/resolver/P2TargetPlatformResolver.java | 11 +++++
8 files changed, 154 insertions(+), 10 deletions(-) 8 files changed, 155 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 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 5cc8718..5513dda 100644 index 5cc8718..5513dda 100644
@ -60,7 +60,7 @@ index 5cc8718..5513dda 100644
IQueryable<IInstallableUnit> locationUnits = new CompoundQueryable<IInstallableUnit>( 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 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 d1cd5da..1cc4050 100644 index c56eeff..73f8835 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java --- 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 +++ 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; @@ -38,6 +38,9 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent;
@ -73,7 +73,7 @@ index d1cd5da..1cc4050 100644
import org.eclipse.equinox.p2.query.IQueryResult; import org.eclipse.equinox.p2.query.IQueryResult;
import org.eclipse.equinox.p2.query.QueryUtil; import org.eclipse.equinox.p2.query.QueryUtil;
import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository; import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
@@ -231,6 +234,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { @@ -225,6 +228,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
IMetadataRepository metadataRepository = null; IMetadataRepository metadataRepository = null;
IArtifactRepository artifactRepository = null; IArtifactRepository artifactRepository = null;
@ -86,7 +86,7 @@ index d1cd5da..1cc4050 100644
try { try {
remoteRepositoryIdManager.addMapping(location.getId(), location.getURL()); remoteRepositoryIdManager.addMapping(location.getId(), location.getURL());
@@ -367,12 +376,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder { @@ -365,12 +374,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
result.addAll(contentPart.getUnits()); result.addAll(contentPart.getUnits());
} }
@ -283,7 +283,7 @@ index fb73469..efe97ae 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 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 e5efab5..8628d7a 100644 index 5c4a26f..9f93b3b 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java --- 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 +++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
@@ -64,7 +64,10 @@ public class DefaultTargetPlatformConfigurationReader { @@ -64,7 +64,10 @@ public class DefaultTargetPlatformConfigurationReader {
@ -339,13 +339,14 @@ index 9935c5f..0885aea 100644
request.setArtifact(artifact); request.setArtifact(artifact);
request.setResolveRoot(true).setResolveTransitively(false); 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 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 0d4d61e..ef3264d 100644 index 1c897b9..13803dc 100644
--- a/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java --- 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 +++ b/tycho-p2/tycho-p2-facade/src/main/java/org/eclipse/tycho/p2/resolver/P2TargetPlatformResolver.java
@@ -191,6 +191,16 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp @@ -191,6 +191,17 @@ public class P2TargetPlatformResolver extends AbstractTargetPlatformResolver imp
tpBuilder.setProjectLocation(project.getBasedir()); tpBuilder.setProjectLocation(project.getBasedir());
tpBuilder.setIncludePackedArtifacts(configuration.isIncludePackedArtifacts()); tpBuilder.setIncludePackedArtifacts(configuration.isIncludePackedArtifacts());
tpBuilder.setFailOnDuplicateIUs(failOnDuplicateIUs);
+
+ // Add Fedora Local P2 Repository when running in local mode + // Add Fedora Local P2 Repository when running in local mode
+ if (System.getProperty("maven.local.mode") != null) { + if (System.getProperty("maven.local.mode") != null) {
+ String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo"; + String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo";
@ -360,5 +361,5 @@ index 0d4d61e..ef3264d 100644
addOtherReactorProjectsToTargetPlatform(project, reactorProjects, tpBuilder); addOtherReactorProjectsToTargetPlatform(project, reactorProjects, tpBuilder);
-- --
1.7.11.4 1.7.11.7

81
tycho.spec
View File

@ -1,24 +1,18 @@
%global bootstrap 1 # When building version under development (non-release)
%global sha d7f8850f746dd72e0a97c1fdf32c06ce794fb83d # %%global snap -SNAPSHOT
%if %{bootstrap}
%global snap %{nil}
%else
%global snap -SNAPSHOT
%endif
%define __requires_exclude osgi* %define __requires_exclude osgi*
Name: tycho Name: tycho
Version: 0.16.0 Version: 0.16.0
Release: 9.1.d7f885%{?dist} Release: 15%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries Group: Development/Libraries
# license file is missing but all files having some licensing information are ASL 2.0 # license file is missing but all files having some licensing information are ASL 2.0
License: ASL 2.0 License: ASL 2.0
URL: http://tycho.sonatype.org/ URL: http://tycho.sonatype.org/
Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/org.eclipse.tycho-%{sha}.tar.bz2 Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/tycho-0.16.x.tar.bz2
# this is a workaround for maven-plugin-plugin changes that happened after # 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 # version 2.4.3 (impossible to have empty mojo created as aggregate). This
@ -37,6 +31,9 @@ Patch3: %{name}-use-custom-resolver.patch
# a different version from the nonbootstrapped. Otherwise there will # a different version from the nonbootstrapped. Otherwise there will
# be cyclic dependencies. # be cyclic dependencies.
Patch4: %{name}-bootstrap.patch Patch4: %{name}-bootstrap.patch
# Maven local mode will look in reactore 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
BuildArch: noarch BuildArch: noarch
@ -56,7 +53,6 @@ BuildRequires: maven-shared-osgi
BuildRequires: maven-surefire-plugin BuildRequires: maven-surefire-plugin
BuildRequires: maven-surefire-provider-junit BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-surefire-provider-junit4 BuildRequires: maven-surefire-provider-junit4
BuildRequires: maven-verifier-plugin
BuildRequires: objectweb-asm4 BuildRequires: objectweb-asm4
BuildRequires: plexus-containers-component-metadata BuildRequires: plexus-containers-component-metadata
BuildRequires: eclipse-jdt BuildRequires: eclipse-jdt
@ -110,15 +106,12 @@ Requires: jpackage-utils
This package contains the API documentation for %{name}. This package contains the API documentation for %{name}.
%prep %prep
%setup -q -n org.eclipse.tycho-%{sha} %setup -q -n %{name}-0.16.x
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%if %{bootstrap}
%patch4 -p1
%endif
find tycho-core -iname '*html' -delete find tycho-core -iname '*html' -delete
@ -128,10 +121,31 @@ pushd tycho-maven-plugin/src/main/java/org/fedoraproject
cp %{SOURCE1} . cp %{SOURCE1} .
popd popd
%build
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m" export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=256m"
# installed version of Tycho
sysVer=`grep -C 1 "<artifactId>tycho</artifactId>" %{_mavenpomdir}/JPP.tycho-main.pom | grep "version" | sed 's/.*>\(.*\)<.*/\1/'`
# build version of Tycho
buildVer=`grep -C 1 "<artifactId>tycho</artifactId>" pom.xml | grep "version" | sed 's/.*>\(.*\)<.*/\1/'`
echo "System version is ${sysVer} and attempting to build ${buildVer}."
# If version installed on system is the same as the version being built
# an intermediary build must be done to prevent a cycle at build time.
if [ "${sysVer}" == "${buildVer}" ]; then
echo "Performing bootstrap build"
%patch4 -p1
mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true install javadoc:aggregate mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true install javadoc:aggregate
%patch4 -p1 -R
%patch5 -p1
fi
%build
mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -DskipTychoVersionCheck -Dmaven.test.skip=true clean install javadoc:aggregate
%install %install
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
@ -148,7 +162,7 @@ for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
echo $mod echo $mod
aid=`basename $mod` aid=`basename $mod`
install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
install -m 644 $mod/target/$aid-%{version}%{snap}.jar %{buildroot}%{_javadir}/%{name}/$aid.jar install -m 644 $mod/target/$aid-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$aid.jar
%add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid" %add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
done done
@ -185,6 +199,16 @@ cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
# org.eclipse.osgi
install -pm 644 %{_mavenpomdir}/JPP.eclipse-osgi.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-osgi.pom
install -m 644 %{_javadir}/eclipse/osgi.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
%add_maven_depmap JPP.%{name}-osgi.pom %{name}/osgi.jar -a "org.eclipse.tycho:org.eclipse.osgi"
# org.eclipse.jdt.core
install -pm 644 %{_mavenpomdir}/JPP.eclipse-jdt.core.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-jdt.core.pom
install -m 644 %{_javadir}/eclipse/jdt.core.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/
%add_maven_depmap JPP.%{name}-jdt.core.pom %{name}/jdt.core.jar -a "org.eclipse.tycho:org.eclipse.jdt.core"
%files %files
%{_mavenpomdir}/* %{_mavenpomdir}/*
%{_mavendepmapfragdir}/%{name} %{_mavendepmapfragdir}/%{name}
@ -195,6 +219,29 @@ install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
%{_javadocdir}/%{name} %{_javadocdir}/%{name}
%changelog %changelog
* Sat Oct 20 2012 Roland Grunberg <rgrunber@redhat.com> 0.16.0-15
- Package org.eclipse.osgi and org.eclipse.jdt.core.
* Fri Oct 19 2012 Roland Grunberg <rgrunber@redhat.com> 0.16.0-14
- Update to finalized 0.16.0 Release.
* Wed Oct 17 2012 Roland Grunberg <rgrunber@redhat.com> 0.16.0-13
- Build Tycho properly in one RPM build.
- Update to 0.16.0 Release.
* Thu Oct 11 2012 Roland Grunberg <rgrunber@redhat.com> 0.16.0-12.d7f885
- Non-bootstrap build.
* Thu Oct 11 2012 Roland Grunberg <rgrunber@redhat.com> 0.16.0-11.1.d7f885
- Remove dependence on eclipse by use of self-bundled equinox launcher.
* Wed Oct 10 2012 Roland Grunberg <rgrunber@redhat.com> 0.16.0-11.d7f885
- copy-platform-all should make symlinked jars from %%{_javadir} unique.
- Non-bootstrap build (reset the %%bootstrap flag properly).
* Mon Oct 8 2012 Krzysztof Daniel <kdaniel@redhat.com> 0.16.0-10.d7f885
- Non-bootstrap build.
* Mon Oct 8 2012 Krzysztof Daniel <kdaniel@redhat.com> 0.16.0-9.1.d7f885 * Mon Oct 8 2012 Krzysztof Daniel <kdaniel@redhat.com> 0.16.0-9.1.d7f885
- Filter out OSGi dependencies. - Filter out OSGi dependencies.