diff --git a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/CompositeArtifactProviderTestBase.java b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/CompositeArtifactProviderTestBase.java index a5ea5bec56..a8c25ccd7b 100644 --- a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/CompositeArtifactProviderTestBase.java +++ b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/CompositeArtifactProviderTestBase.java @@ -244,13 +244,13 @@ public void testGetArtifactDescriptorsDoesNotReturnDuplicates() { List result = Arrays.asList(subject.getArtifactDescriptors(BUNDLE_A_KEY)); assertThat(result, hasItem(inCanonicalFormat())); - assertEquals(2, result.size()); // no duplicates + assertEquals(1, result.size()); // no duplicates } @Test public void testContainsArtifactDescriptor() { assertTrue(subject.contains(canonicalDescriptorFor(BUNDLE_A_KEY))); - assertFalse(subject.contains(canonicalDescriptorFor(BUNDLE_B_KEY))); + assertTrue(subject.contains(canonicalDescriptorFor(BUNDLE_B_KEY))); } @Test diff --git a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/LocalArtifactRepositoryP2APITest.java b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/LocalArtifactRepositoryP2APITest.java index 12233b4d31..5fc65eec3b 100644 --- a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/LocalArtifactRepositoryP2APITest.java +++ b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/LocalArtifactRepositoryP2APITest.java @@ -20,6 +20,7 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.not; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -81,28 +82,27 @@ public class LocalArtifactRepositoryP2APITest extends TychoPlexusTestCase { private static final Set ARTIFACT_A_CONTENT = TestRepositoryContent.BUNDLE_A_FILES; private static final IArtifactDescriptor ARTIFACT_A_CANONICAL = localCanonicalDescriptorFor(ARTIFACT_A_KEY); - private static final IArtifactDescriptor ARTIFACT_A_PACKED = localPackedDescriptorFor(ARTIFACT_A_KEY); - private static final IArtifactDescriptor ARTIFACT_B_PACKED = localPackedDescriptorFor(ARTIFACT_B_KEY); - // not in the repository! + private static final IArtifactDescriptor ARTIFACT_A_PACKED = localPackedDescriptorFor(ARTIFACT_A_KEY); // not in the repository! private static final IArtifactDescriptor ARTIFACT_B_CANONICAL = localCanonicalDescriptorFor(ARTIFACT_B_KEY); + private static final IArtifactDescriptor ARTIFACT_B_PACKED = localPackedDescriptorFor(ARTIFACT_B_KEY); // not in the repository! private static final String ARTIFACT_A_CANONICAL_MD5 = TestRepositoryContent.BUNDLE_A_CONTENT_MD5; private static final IArtifactDescriptor ARTIFACT_A_DESCRIPTOR_1 = ARTIFACT_A_CANONICAL; - private static final IArtifactDescriptor ARTIFACT_A_DESCRIPTOR_2 = ARTIFACT_A_PACKED; - private static final IArtifactDescriptor ARTIFACT_B_DESCRIPTOR = ARTIFACT_B_PACKED; + private static final IArtifactDescriptor ARTIFACT_A_DESCRIPTOR_2 = ARTIFACT_A_PACKED; // not in the repository! + private static final IArtifactDescriptor ARTIFACT_B_DESCRIPTOR = ARTIFACT_B_CANONICAL; // not in the repository private static final IArtifactKey OTHER_KEY = TestRepositoryContent.NOT_CONTAINED_ARTIFACT_KEY; - private static final IArtifactDescriptor OTHER_DESCRIPTOR = ARTIFACT_B_CANONICAL; + private static final IArtifactDescriptor OTHER_DESCRIPTOR = ARTIFACT_B_PACKED; // not (yet) in the repository private static final IArtifactKey NEW_KEY = TestRepositoryContent.NOT_CONTAINED_ARTIFACT_KEY; private static final IArtifactDescriptor NEW_DESCRIPTOR = localPackedDescriptorFor(NEW_KEY); private static final Set ORIGINAL_KEYS = new HashSet<>(Arrays.asList(ARTIFACT_A_KEY, ARTIFACT_B_KEY)); - private static final Set ORIGINAL_DESCRIPTORS = new HashSet<>( - Arrays.asList(ARTIFACT_A_CANONICAL, ARTIFACT_A_PACKED, ARTIFACT_B_PACKED)); + private static final Set ORIGINAL_DESCRIPTORS = Set.of( // + ARTIFACT_A_CANONICAL, ARTIFACT_B_CANONICAL); @Rule public TemporaryLocalMavenRepository temporaryLocalMavenRepo = new TemporaryLocalMavenRepository(); @@ -159,8 +159,8 @@ public void testGetDescriptors() { List result = Arrays.asList(subject.getArtifactDescriptors(ARTIFACT_A_KEY)); assertThat(result, hasItem(ARTIFACT_A_DESCRIPTOR_1)); - assertThat(result, hasItem(ARTIFACT_A_DESCRIPTOR_2)); - assertEquals(2, result.size()); + assertThat(result, not(hasItem(ARTIFACT_A_DESCRIPTOR_2))); + assertEquals(1, result.size()); } @Test @@ -185,7 +185,7 @@ public void testQueryDescriptors() { Set result = allDescriptorsIn(subject); assertThat(result, hasItem(ARTIFACT_A_DESCRIPTOR_1)); - assertThat(result, hasItem(ARTIFACT_A_DESCRIPTOR_2)); + assertThat(result, not(hasItem(ARTIFACT_A_DESCRIPTOR_2))); assertThat(result, hasItem(ARTIFACT_B_DESCRIPTOR)); assertEquals(ORIGINAL_DESCRIPTORS, result); } @@ -199,16 +199,6 @@ public void testRemoveLastDescriptorOfKey() { assertTotal(-1, -1); } - @Test - public void testRemoveOneOfDescriptorsOfKey() { - subject.removeDescriptor(ARTIFACT_A_DESCRIPTOR_1); - - assertFalse(subject.contains(ARTIFACT_A_DESCRIPTOR_1)); - assertTrue(subject.contains(ARTIFACT_A_DESCRIPTOR_2)); - assertTrue(subject.contains(ARTIFACT_A_KEY)); - assertTotal(0, -1); - } - @Test public void testRemoveAllDescriptorsOfKey() { subject.removeDescriptors(new IArtifactDescriptor[] { ARTIFACT_A_DESCRIPTOR_1, ARTIFACT_A_DESCRIPTOR_2 }); @@ -216,7 +206,7 @@ public void testRemoveAllDescriptorsOfKey() { assertFalse(subject.contains(ARTIFACT_A_DESCRIPTOR_1)); assertFalse(subject.contains(ARTIFACT_A_DESCRIPTOR_2)); assertFalse(subject.contains(ARTIFACT_A_KEY)); - assertTotal(-1, -2); + assertTotal(-1, -1); } @Test @@ -244,7 +234,7 @@ public void testRemoveKey() { assertFalse(subject.contains(ARTIFACT_A_KEY)); assertFalse(subject.contains(ARTIFACT_A_DESCRIPTOR_1)); assertFalse(subject.contains(ARTIFACT_A_DESCRIPTOR_2)); - assertTotal(-1, -2); + assertTotal(-1, -1); } @Test @@ -253,7 +243,7 @@ public void testRemoveKeys() { assertFalse(subject.contains(ARTIFACT_A_KEY)); assertFalse(subject.contains(ARTIFACT_B_KEY)); - assertTotal(-2, -3); + assertTotal(-2, -2); } @Test @@ -271,7 +261,7 @@ public void testRemoveAll() { assertTrue(allKeysIn(subject).isEmpty()); assertTrue(allDescriptorsIn(subject).isEmpty()); - assertTotal(-2, -3); + assertTotal(-2, -2); } @Test @@ -288,25 +278,16 @@ public void testGetArtifactFileOfNonContainedKey() { assertNull(result); } - @Test - public void testGetArtifactFileOfKeyWithoutCanonicalFormat() { - assertFalse(subject.contains(ARTIFACT_B_CANONICAL)); // self-test - - File result = subject.getArtifactFile(ARTIFACT_B_KEY); - - assertNull(result); - } - @Test public void testGetRawArtifactFile() { - File result = subject.getArtifactFile(ARTIFACT_B_PACKED); + File result = subject.getArtifactFile(ARTIFACT_B_CANONICAL); assertThat(result, is(artifactLocationOf(ARTIFACT_B_KEY, ".jar"))); } @Test public void testGetRawArtifactFileOfNonContainedFormat() { - File result = subject.getArtifactFile(ARTIFACT_B_CANONICAL); + File result = subject.getArtifactFile(ARTIFACT_B_PACKED); assertNull(result); } @@ -333,7 +314,7 @@ public void testGetNonContainedArtifact() throws Exception { @Test public void testGetCorruptedArtifact() throws Exception { // simulate corruption of the artifact in the file system - assertTrue(artifactLocationOf(ARTIFACT_B_KEY, "-pack200.jar.pack.gz").delete()); // this is the only format + assertTrue(artifactLocationOf(ARTIFACT_B_KEY, ".jar").delete()); // this is the only format testSink = newArtifactSinkFor(ARTIFACT_B_KEY); status = subject.getArtifact(testSink, null); @@ -409,11 +390,11 @@ public void testGetRawArtifactForCanonicalFormat() throws Exception { @Test public void testGetRawArtifactOfNonContainedFormat() throws Exception { - assertTrue(subject.contains(ARTIFACT_B_PACKED)); - assertFalse(subject.contains(ARTIFACT_B_CANONICAL)); + assertTrue(subject.contains(ARTIFACT_B_CANONICAL)); + assertFalse(subject.contains(ARTIFACT_B_PACKED)); - // getRawArtifact does not convert from packed to canonical format - rawTestSink = newRawArtifactSinkFor(ARTIFACT_B_CANONICAL); + // getRawArtifact does not convert from canonical to packed format + rawTestSink = newRawArtifactSinkFor(ARTIFACT_B_PACKED); status = subject.getRawArtifact(rawTestSink, null); assertFalse(rawTestSink.writeIsStarted()); @@ -424,7 +405,7 @@ public void testGetRawArtifactOfNonContainedFormat() throws Exception { @Test public void testGetCorruptedRawArtifact() throws Exception { // simulate corruption of the artifact in the file system - assertTrue(artifactLocationOf(ARTIFACT_B_KEY, "-pack200.jar.pack.gz").delete()); + assertTrue(artifactLocationOf(ARTIFACT_B_KEY, ".jar").delete()); rawTestSink = newRawArtifactSinkFor(ARTIFACT_B_PACKED); status = subject.getRawArtifact(rawTestSink, null); @@ -450,10 +431,10 @@ public void testGetRawArtifactForCanonicalFormatToStream() throws Exception { @SuppressWarnings("deprecation") @Test public void testGetRawArtifactOfNonContainedFormatToStream() { - assertFalse(subject.contains(ARTIFACT_B_CANONICAL)); + assertFalse(subject.contains(ARTIFACT_B_PACKED)); - // getRawArtifact does not convert from packed to canonical format - status = subject.getRawArtifact(ARTIFACT_B_CANONICAL, testOutputStream, null); + // getRawArtifact does not convert from canonical to packed format + status = subject.getRawArtifact(ARTIFACT_B_PACKED, testOutputStream, null); assertEquals(0, testOutputStream.writtenBytes()); assertThat(testOutputStream.getStatus(), is(errorStatus())); // from IStateful diff --git a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/MirroringArtifactProviderErrorTest.java b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/MirroringArtifactProviderErrorTest.java index b383f44afd..ab7a9b9f26 100644 --- a/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/MirroringArtifactProviderErrorTest.java +++ b/tycho-core/src/test/java/org/eclipse/tycho/p2resolver/MirroringArtifactProviderErrorTest.java @@ -16,6 +16,7 @@ import static org.eclipse.tycho.test.util.ProbeArtifactSink.newArtifactSinkFor; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; import org.eclipse.equinox.p2.core.IProvisioningAgent; import org.eclipse.equinox.p2.metadata.IArtifactKey; @@ -36,7 +37,7 @@ public class MirroringArtifactProviderErrorTest extends TychoPlexusTestCase { - private static final IArtifactKey CORRUPT_ARTIFACT = TestRepositoryContent.BUNDLE_B_KEY; + private static final IArtifactKey CORRUPT_ARTIFACT = TestRepositoryContent.BUNDLE_A_KEY; @Rule public LogVerifier logVerifier = new LogVerifier(); @@ -58,19 +59,15 @@ public void before() throws Exception { new MockMavenContext(null, logVerifier.getLogger())); } - @Test(expected = MirroringFailedException.class) + @Test public void testMirrorCorruptArtifact() throws Exception { logVerifier.expectError(CORRUPT_ARTIFACT.toString()); testSink = newArtifactSinkFor(CORRUPT_ARTIFACT); - try { - // here we expect an exception, an not (!) an error status, to be consistent with other methods that mirror but don't return a status - subject.getArtifact(testSink, null); - - } finally { - assertNotMirrored(CORRUPT_ARTIFACT); - assertFalse(testSink.writeIsStarted()); - } + // here we expect an exception, an not (!) an error status, to be consistent with other methods that mirror but don't return a status + assertThrows(MirroringFailedException.class, () -> subject.getArtifact(testSink, null)); + assertNotMirrored(CORRUPT_ARTIFACT); + assertFalse(testSink.writeIsStarted()); } private void assertNotMirrored(IArtifactKey key) { diff --git a/tycho-core/src/test/java/org/eclipse/tycho/test/util/P2Repositories.java b/tycho-core/src/test/java/org/eclipse/tycho/test/util/P2Repositories.java deleted file mode 100644 index 2175ff4b4e..0000000000 --- a/tycho-core/src/test/java/org/eclipse/tycho/test/util/P2Repositories.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.eclipse.tycho.test.util; - -import java.net.URI; - -import org.eclipse.tycho.core.test.utils.ResourceUtil; - -/** - * p2 repository resources used for multiple tests. - */ -public enum P2Repositories { - ECLIPSE_342("e342"), PACK_GZ("packgz"); - - private final String path; - - P2Repositories(String path) { - this.path = path; - } - - public URI toURI() { - return ResourceUtil.resourceFile("repositories/" + path).toURI(); - - } - - @Override - public String toString() { - return toURI().toString(); - } - -} diff --git a/tycho-core/src/test/java/org/eclipse/tycho/test/util/TestRepositoryContent.java b/tycho-core/src/test/java/org/eclipse/tycho/test/util/TestRepositoryContent.java index 280652bf7a..0051362989 100644 --- a/tycho-core/src/test/java/org/eclipse/tycho/test/util/TestRepositoryContent.java +++ b/tycho-core/src/test/java/org/eclipse/tycho/test/util/TestRepositoryContent.java @@ -26,8 +26,8 @@ public final class TestRepositoryContent { public static final IArtifactKey BUNDLE_A_KEY = new ArtifactKey("osgi.bundle", "org.eclipse.osgi", Version.parseVersion("3.4.3.R34x_v20081215-1030")); - public static final IArtifactKey BUNDLE_B_KEY = new ArtifactKey("osgi.bundle", "org.eclipse.ecf", - Version.parseVersion("3.1.300.v20120319-0616")); + public static final IArtifactKey BUNDLE_B_KEY = new ArtifactKey("osgi.bundle", "org.eclipse.swt", + Version.parseVersion("3.6.1.v3655c")); public static final Set BUNDLE_A_FILES = new HashSet<>(Arrays.asList("about_files/", "META-INF/", "META-INF/MANIFEST.MF", "org/", "org/eclipse/", "org/eclipse/core/", "org/eclipse/core/runtime/", @@ -73,13 +73,10 @@ public final class TestRepositoryContent { // repositories (of regular p2 type) containing the test data /** Repository with bundle A */ - public static final URI REPO_BUNDLE_A = P2Repositories.ECLIPSE_342.toURI(); + public static final URI REPO_BUNDLE_A = ResourceUtil.resourceFile("repositories/e342").toURI(); public static final URI REPO2_BUNDLE_A = ResourceUtil.resourceFile("repositories2/e342").toURI(); - /** - * Repository with bundles A and B. Bundle A is available both in packed and canonical format, - * bundle B only in packed format. - */ - public static final URI REPO_BUNDLE_AB = P2Repositories.PACK_GZ.toURI(); + /** Repository with bundles A and B. Both bundles are available in canonical format. */ + public static final URI REPO_BUNDLE_AB = ResourceUtil.resourceFile("repositories/e342_3").toURI(); /** Repository that claims to contain bundle A, but accesses to the artifact file will fail */ public static final URI REPO_BUNDLE_A_CORRUPT = ResourceUtil.resourceFile("repositories/e342_missing_file").toURI(); @@ -88,7 +85,7 @@ public final class TestRepositoryContent { * format, but the artifact is broken. Bundle A is contained in packed format (artifact missing) * and in canonical format (working). */ - public static final URI REPO_BUNLDE_AB_PACK_CORRUPT = ResourceUtil.resourceFile("repositories/packgz_corrupt") + public static final URI REPO_BUNLDE_AB_PACK_CORRUPT = ResourceUtil.resourceFile("repositories/e342_corrupt") .toURI(); } diff --git a/tycho-core/src/test/resources/repositories/e342_3/artifacts.xml b/tycho-core/src/test/resources/repositories/e342_3/artifacts.xml new file mode 100644 index 0000000000..3bea98e5f5 --- /dev/null +++ b/tycho-core/src/test/resources/repositories/e342_3/artifacts.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tycho-core/src/test/resources/repositories/packgz/content.xml b/tycho-core/src/test/resources/repositories/e342_3/content.xml similarity index 86% rename from tycho-core/src/test/resources/repositories/packgz/content.xml rename to tycho-core/src/test/resources/repositories/e342_3/content.xml index 7f8263e091..8e86499268 100644 --- a/tycho-core/src/test/resources/repositories/packgz/content.xml +++ b/tycho-core/src/test/resources/repositories/e342_3/content.xml @@ -1,6 +1,6 @@ - + @@ -267,46 +267,58 @@ - - - - - + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + - - + + - - - - - Import-Package: org.eclipse.core.runtime.jobs,org.eclipse.equinox.concurrent.future;version="1.0.0";resolution:=optional,org.osgi.framework;version="1.3.0",org.osgi.service.log;version="1.3.0",org.osgi.util.tracker;version="1.3.2" Bundle-ManifestVersion: 2 Created-By: 1.5.0_22-b03 (Sun Microsystems Inc.) Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-Vendor: %plugin.provider Bundle-ActivationPolicy: lazy Ant-Version: Apache Ant 1.7.1 Bundle-Version: 3.1.300.v20120319-0616 Export-Package: org.eclipse.ecf.core;version="3.0.0",org.eclipse.ecf.core.events,org.eclipse.ecf.core.jobs;version="1.0";x-internal:=true,org.eclipse.ecf.core.provider,org.eclipse.ecf.core.security,org.eclipse.ecf.core.start,org.eclipse.ecf.core.status;version="1.0";x-internal:=true,org.eclipse.ecf.core.user,org.eclipse.ecf.core.util,org.eclipse.ecf.internal.core;x-internal:=true Require-Bundle: org.eclipse.equinox.common,org.eclipse.equinox.registry,org.eclipse.ecf.identity;visibility:=reexport Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin Bundle-SymbolicName: org.eclipse.ecf;singleton:=true Eclipse-LazyStart: true Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,J2SE-1.4 Bundle-Localization: plugin - + + + + Bundle-Vendor: %providerName +Bundle-ManifestVersion: 2 +Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3 +Bundle-Name: %pluginName +Bundle-Localization: plugin +Eclipse-ExtensibleAPI: true +Manifest-Version: 1.0 +DynamicImport-Package: org.eclipse.swt.accessibility2, org.mozilla.xpcom +Bundle-SymbolicName: org.eclipse.swt; singleton:=true +Bundle-Version: 3.6.1.v3655c +Export-Package: org.eclipse.swt,org.eclipse.swt.accessibility,org.eclipse.swt.awt,org.eclipse.swt.browser,org.eclipse.swt.custom,org.eclipse.swt.dnd,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.layout,org.eclipse.swt.opengl,org.eclipse.swt.printing,org.eclipse.swt.program,org.eclipse.swt.widgets,org.eclipse.swt.internal; x-internal:=true,org.eclipse.swt.internal.image; x-internal:=true,org.eclipse.swt.internal.theme; x-internal:=true diff --git a/tycho-core/src/test/resources/repositories/packgz/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar b/tycho-core/src/test/resources/repositories/e342_3/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar similarity index 100% rename from tycho-core/src/test/resources/repositories/packgz/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar rename to tycho-core/src/test/resources/repositories/e342_3/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar diff --git a/tycho-core/src/test/resources/repositories/e342_3/plugins/org.eclipse.swt_3.6.1.v3655c.jar b/tycho-core/src/test/resources/repositories/e342_3/plugins/org.eclipse.swt_3.6.1.v3655c.jar new file mode 100644 index 0000000000..1cfa169ca1 Binary files /dev/null and b/tycho-core/src/test/resources/repositories/e342_3/plugins/org.eclipse.swt_3.6.1.v3655c.jar differ diff --git a/tycho-core/src/test/resources/repositories/packgz_corrupt/artifacts.xml b/tycho-core/src/test/resources/repositories/e342_corrupt/artifacts.xml similarity index 54% rename from tycho-core/src/test/resources/repositories/packgz_corrupt/artifacts.xml rename to tycho-core/src/test/resources/repositories/e342_corrupt/artifacts.xml index cad6d3a361..7fdfc84bc4 100644 --- a/tycho-core/src/test/resources/repositories/packgz_corrupt/artifacts.xml +++ b/tycho-core/src/test/resources/repositories/e342_corrupt/artifacts.xml @@ -1,49 +1,31 @@ - - - + + - - + - - - + + - - - - - + - + - - - - - - - - - - - diff --git a/tycho-core/src/test/resources/repositories/packgz_corrupt/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar b/tycho-core/src/test/resources/repositories/e342_corrupt/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar similarity index 100% rename from tycho-core/src/test/resources/repositories/packgz_corrupt/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar rename to tycho-core/src/test/resources/repositories/e342_corrupt/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar diff --git a/tycho-core/src/test/resources/repositories/local/.meta/p2-artifacts.properties b/tycho-core/src/test/resources/repositories/local/.meta/p2-artifacts.properties index 45ec303c1c..204082b29e 100644 --- a/tycho-core/src/test/resources/repositories/local/.meta/p2-artifacts.properties +++ b/tycho-core/src/test/resources/repositories/local/.meta/p2-artifacts.properties @@ -1,2 +1,2 @@ p2.osgi.bundle:org.eclipse.osgi:3.4.3.R34x_v20081215-1030 -p2.osgi.bundle:org.eclipse.ecf:3.1.300.v20120319-0616 +p2.osgi.bundle:org.eclipse.swt:3.6.1.v3655c diff --git a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.ecf/3.1.300.v20120319-0616/org.eclipse.ecf-3.1.300.v20120319-0616-p2artifacts.xml b/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.ecf/3.1.300.v20120319-0616/org.eclipse.ecf-3.1.300.v20120319-0616-p2artifacts.xml deleted file mode 100644 index 9f2978eeea..0000000000 --- a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.ecf/3.1.300.v20120319-0616/org.eclipse.ecf-3.1.300.v20120319-0616-p2artifacts.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.ecf/3.1.300.v20120319-0616/org.eclipse.ecf-3.1.300.v20120319-0616-pack200.jar.pack.gz b/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.ecf/3.1.300.v20120319-0616/org.eclipse.ecf-3.1.300.v20120319-0616-pack200.jar.pack.gz deleted file mode 100644 index 4d16ac8cb1..0000000000 Binary files a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.ecf/3.1.300.v20120319-0616/org.eclipse.ecf-3.1.300.v20120319-0616-pack200.jar.pack.gz and /dev/null differ diff --git a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.osgi/3.4.3.R34x_v20081215-1030/org.eclipse.osgi-3.4.3.R34x_v20081215-1030-p2artifacts.xml b/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.osgi/3.4.3.R34x_v20081215-1030/org.eclipse.osgi-3.4.3.R34x_v20081215-1030-p2artifacts.xml index adf2f7271c..6093d5397d 100644 --- a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.osgi/3.4.3.R34x_v20081215-1030/org.eclipse.osgi-3.4.3.R34x_v20081215-1030-p2artifacts.xml +++ b/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.osgi/3.4.3.R34x_v20081215-1030/org.eclipse.osgi-3.4.3.R34x_v20081215-1030-p2artifacts.xml @@ -1,15 +1,10 @@ - - + - - - - - - - + + + diff --git a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.osgi/3.4.3.R34x_v20081215-1030/org.eclipse.osgi-3.4.3.R34x_v20081215-1030-pack200.jar.pack.gz b/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.osgi/3.4.3.R34x_v20081215-1030/org.eclipse.osgi-3.4.3.R34x_v20081215-1030-pack200.jar.pack.gz deleted file mode 100644 index 079ecba551..0000000000 Binary files a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.osgi/3.4.3.R34x_v20081215-1030/org.eclipse.osgi-3.4.3.R34x_v20081215-1030-pack200.jar.pack.gz and /dev/null differ diff --git a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.swt/3.6.1.v3655c/org.eclipse.swt-3.6.1.v3655c-p2artifacts.xml b/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.swt/3.6.1.v3655c/org.eclipse.swt-3.6.1.v3655c-p2artifacts.xml new file mode 100644 index 0000000000..98d8ed4dd4 --- /dev/null +++ b/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.swt/3.6.1.v3655c/org.eclipse.swt-3.6.1.v3655c-p2artifacts.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.swt/3.6.1.v3655c/org.eclipse.swt-3.6.1.v3655c.jar b/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.swt/3.6.1.v3655c/org.eclipse.swt-3.6.1.v3655c.jar new file mode 100644 index 0000000000..1cfa169ca1 Binary files /dev/null and b/tycho-core/src/test/resources/repositories/local/p2/osgi/bundle/org.eclipse.swt/3.6.1.v3655c/org.eclipse.swt-3.6.1.v3655c.jar differ diff --git a/tycho-core/src/test/resources/repositories/packgz/artifacts.xml b/tycho-core/src/test/resources/repositories/packgz/artifacts.xml deleted file mode 100644 index 6a409338a5..0000000000 --- a/tycho-core/src/test/resources/repositories/packgz/artifacts.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tycho-core/src/test/resources/repositories/packgz/plugins/org.eclipse.ecf_3.1.300.v20120319-0616.jar.pack.gz b/tycho-core/src/test/resources/repositories/packgz/plugins/org.eclipse.ecf_3.1.300.v20120319-0616.jar.pack.gz deleted file mode 100644 index 4d16ac8cb1..0000000000 Binary files a/tycho-core/src/test/resources/repositories/packgz/plugins/org.eclipse.ecf_3.1.300.v20120319-0616.jar.pack.gz and /dev/null differ diff --git a/tycho-core/src/test/resources/repositories/packgz/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar.pack.gz b/tycho-core/src/test/resources/repositories/packgz/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar.pack.gz deleted file mode 100644 index 079ecba551..0000000000 Binary files a/tycho-core/src/test/resources/repositories/packgz/plugins/org.eclipse.osgi_3.4.3.R34x_v20081215-1030.jar.pack.gz and /dev/null differ diff --git a/tycho-core/src/test/resources/repositories/packgz_corrupt/plugins/org.eclipse.ecf_3.1.300.v20120319-0616.jar.pack.gz b/tycho-core/src/test/resources/repositories/packgz_corrupt/plugins/org.eclipse.ecf_3.1.300.v20120319-0616.jar.pack.gz deleted file mode 100644 index a792498201..0000000000 Binary files a/tycho-core/src/test/resources/repositories/packgz_corrupt/plugins/org.eclipse.ecf_3.1.300.v20120319-0616.jar.pack.gz and /dev/null differ