Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2015-05-04 10:28:17 -0400
committerTobias Oberlies2015-05-12 08:34:55 -0400
commit60ec3b5f28428f158ba2fa7946ad9c1ea197f12a (patch)
tree62e5d1099f32378925b25bea532cd1d8069b5fa0
parentd95d53744a6f1804816960edb12398e697e386ca (diff)
downloadorg.eclipse.tycho-60ec3b5f28428f158ba2fa7946ad9c1ea197f12a.tar.gz
org.eclipse.tycho-60ec3b5f28428f158ba2fa7946ad9c1ea197f12a.tar.xz
org.eclipse.tycho-60ec3b5f28428f158ba2fa7946ad9c1ea197f12a.zip
466320 consume Luna M7 bundles
- lock down IU versions in target - add new p2 dependency org.tukaani.xz (see bug 464614) Bug: 466320 Change-Id: I2daa8ad854bebc3dd69499f818b31ccaa85084b6 Signed-off-by: Pascal Rapicault <pascal@rapicorp.com> Also-by: Jan Sievers <jan.sievers@sap.com>
-rw-r--r--pom.xml8
-rw-r--r--tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/MirroringArtifactProviderPack200CornerCasesTest.java2
-rw-r--r--tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/P2ResolverTest.java4
-rw-r--r--tycho-bundles/tycho-bundles-external/tycho-bundles-external.product1
-rw-r--r--tycho-bundles/tycho-bundles-target/tycho-bundles-target.target24
-rw-r--r--tycho-bundles/tycho-standalone-p2-director/p2 Director.product1
-rw-r--r--tycho-releng/pom.xml2
7 files changed, 24 insertions, 18 deletions
diff --git a/pom.xml b/pom.xml
index af1c81e09..414886c1b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,13 +88,13 @@
<maven-version>3.0</maven-version>
<!-- dependencies to Eclipse artifacts deployed by tycho-releng/ -->
- <equinoxVersion>3.10.100.v20150318-0312</equinoxVersion>
+ <equinoxVersion>3.10.100.v20150420-1253</equinoxVersion>
<equinoxVersionMaven>${equinoxVersion}-SNAPSHOT</equinoxVersionMaven>
- <equinoxCompatVersion>1.0.100.v20140702-1948</equinoxCompatVersion>
+ <equinoxCompatVersion>1.0.100.v20150402-1551</equinoxCompatVersion>
<equinoxCompatVersionMaven>${equinoxCompatVersion}-SNAPSHOT</equinoxCompatVersionMaven>
- <jdtVersion>3.11.0.v20150317-0048</jdtVersion>
+ <jdtVersion>3.11.0.v20150429-0810</jdtVersion>
<jdtVersionMaven>${jdtVersion}-SNAPSHOT</jdtVersionMaven>
- <jdtAptVersion>1.1.100.v20150316-1618</jdtAptVersion>
+ <jdtAptVersion>1.2.0.v20150424-1830</jdtAptVersion>
<jdtAptVersionMaven>${jdtAptVersion}-SNAPSHOT</jdtAptVersionMaven>
<!-- version of Tycho used by this build -->
diff --git a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/MirroringArtifactProviderPack200CornerCasesTest.java b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/MirroringArtifactProviderPack200CornerCasesTest.java
index b707e3b52..3c1bc3a63 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/MirroringArtifactProviderPack200CornerCasesTest.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.maven.repository.tests/src/test/java/org/eclipse/tycho/repository/local/MirroringArtifactProviderPack200CornerCasesTest.java
@@ -13,6 +13,7 @@ package org.eclipse.tycho.repository.local;
import static org.eclipse.tycho.p2.maven.repository.tests.TestRepositoryContent.BUNDLE_A_KEY;
import static org.eclipse.tycho.repository.p2base.artifact.provider.formats.ArtifactTransferPolicy.isCanonicalFormat;
import static org.eclipse.tycho.repository.testutil.ArtifactRepositoryTestUtils.packedDescriptorFor;
+import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -86,6 +87,7 @@ public class MirroringArtifactProviderPack200CornerCasesTest {
exceptionVerifier.expect(MirroringFailedException.class);
exceptionVerifier.expectMessage(BUNDLE_A_KEY.toString());
+ logVerifier.expectError(containsString(BUNDLE_A_KEY.toString()));
subject.getArtifactDescriptors(BUNDLE_A_KEY);
}
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/P2ResolverTest.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/P2ResolverTest.java
index 0e8c41b4a..46dd68c83 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/P2ResolverTest.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl.test/src/test/java/org/eclipse/tycho/p2/resolver/P2ResolverTest.java
@@ -21,6 +21,7 @@ import static org.eclipse.tycho.p2.target.ExecutionEnvironmentTestUtils.NOOP_EE_
import static org.eclipse.tycho.p2.target.ExecutionEnvironmentTestUtils.customEEResolutionHintProvider;
import static org.eclipse.tycho.p2.target.ExecutionEnvironmentTestUtils.standardEEResolutionHintProvider;
import static org.eclipse.tycho.p2.testutil.InstallableUnitMatchers.unitWithId;
+import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
@@ -66,7 +67,7 @@ public class P2ResolverTest extends P2ResolverTestBase {
@Rule
public final LogVerifier logVerifier = new LogVerifier();
@Rule
- public final ExpectedException expectedException = ExpectedException.none();
+ public ExpectedException expectedException = ExpectedException.none();
private ReactorProject projectToResolve;
private P2ResolutionResult result;
@@ -506,6 +507,7 @@ public class P2ResolverTest extends P2ResolverTestBase {
"org.eclipse.tycho.p2.impl.resolver.test.bundle01");
expectedException.expectMessage("could not be downloaded");
+ logVerifier.expectError(containsString("could not be downloaded"));
impl.resolveDependencies(getTargetPlatform(), projectToResolve);
}
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
index d769496ac..eb94642a8 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
+++ b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
@@ -65,6 +65,7 @@
<plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
<plugin id="org.eclipse.equinox.p2.transport.ecf"/>
<plugin id="org.eclipse.equinox.p2.updatesite"/>
+ <plugin id="org.tukaani.xz"/>
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
diff --git a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
index de4c8e699..f84d20f2c 100644
--- a/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
+++ b/tycho-bundles/tycho-bundles-target/tycho-bundles-target.target
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="25">
+<?pde version="3.8"?><target name="Target platform for Tycho's bundles" sequenceNumber="26">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.6.200.v20150430-1829"/>
+<unit id="org.eclipse.sdk.ide" version="4.5.0.I20150430-1445"/>
+<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="3.9.100.v20150430-1836"/>
+<unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.11.0.v20150428-1938"/>
+<unit id="org.eclipse.ecf.core.feature.feature.group" version="1.1.0.v20150428-1708"/>
+<unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.0.0.v20150428-1708"/>
+<unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.10.0.v20150428-1708"/>
+<unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.0.0.v20150428-1708"/>
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.feature.feature.group" version="3.10.0.v20150428-1708"/>
+<unit id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature.feature.group" version="1.0.0.v20150428-1708"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M7-201504301445"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.mockito" version="1.8.4.v201303031500"/>
diff --git a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
index 6739b3a54..771d4f7a8 100644
--- a/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
+++ b/tycho-bundles/tycho-standalone-p2-director/p2 Director.product
@@ -63,6 +63,7 @@
<plugin id="org.eclipse.equinox.p2.touchpoint.eclipse"/>
<plugin id="org.eclipse.equinox.p2.touchpoint.natives"/>
<plugin id="org.eclipse.equinox.p2.transport.ecf"/>
+ <plugin id="org.tukaani.xz"/>
<plugin id="org.eclipse.equinox.preferences"/>
<plugin id="org.eclipse.equinox.registry"/>
<plugin id="org.eclipse.equinox.security"/>
diff --git a/tycho-releng/pom.xml b/tycho-releng/pom.xml
index 1d9c34048..a4ead906c 100644
--- a/tycho-releng/pom.xml
+++ b/tycho-releng/pom.xml
@@ -93,7 +93,7 @@
<configuration>
<source>
<repository>
- <url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M6-201503200800/</url>
+ <url>http://download.eclipse.org/eclipse/updates/4.5milestones/S-4.5M7-201504301445/</url>
<layout>p2</layout>
</repository>
</source>

Back to the top