Bug 576097 - Investigate removing CVS dependency in PDE
Fix pde.build PublishingTests.
Change-Id: Ie93bcabff179ad4e808732d5d86f08348bbbe88a
Reviewed-on: https://git.eclipse.org/r/c/pde/eclipse.pde.build/+/188491
Tested-by: PDE Bot <pde-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF b/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
index f25876c..b12fbd1 100644
--- a/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Tests Plug-in
Bundle-SymbolicName: org.eclipse.pde.build.tests;singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.3.300.qualifier
Bundle-Activator: org.eclipse.pde.build.tests.Activator
Export-Package: org.eclipse.pde.build.internal.tests;x-internal:=true,
org.eclipse.pde.build.internal.tests.ant;x-internal:=true,
diff --git a/org.eclipse.pde.build.tests/pom.xml b/org.eclipse.pde.build.tests/pom.xml
index 4c18d41..59bd7ea 100644
--- a/org.eclipse.pde.build.tests/pom.xml
+++ b/org.eclipse.pde.build.tests/pom.xml
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.pde</groupId>
<artifactId>org.eclipse.pde.build.tests</artifactId>
- <version>1.3.200-SNAPSHOT</version>
+ <version>1.3.300-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<skipTests>true</skipTests>
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
index 66b31b6..3113df5 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2018 IBM Corporation and others.
+ * Copyright (c) 2008, 2021 IBM Corporation and others.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License 2.0 which accompanies this distribution,
@@ -558,7 +558,7 @@
public void testPublish_Packaging_1() throws Exception {
IFolder buildFolder = newTest("packaging_1");
IFolder a = Utils.createFolder(buildFolder, "plugins/a");
- Utils.generateFeature(buildFolder, "F", new String[] { "org.eclipse.cvs" }, new String[] { "a" });
+ Utils.generateFeature(buildFolder, "F", new String[] { "org.eclipse.test" }, new String[] { "a" });
Utils.generateBundle(a, "a");
Utils.writeBuffer(a.getFile("src/A.java"), new StringBuffer("public class A { int i; }"));
@@ -580,32 +580,34 @@
IInstallableUnit iu = getIU(repository, "a");
assertEquals(iu.getVersion().toString(), "1.0.0");
- iu = getIU(repository, "org.eclipse.team.cvs.core");
+ iu = getIU(repository, "org.eclipse.ant.optional.junit");
assertNotNull(iu);
- entries.add("plugins/org.eclipse.team.cvs.core_" + iu.getVersion() + ".jar");
- IFile file = buildFolder.getFile("buildRepo/plugins/org.eclipse.team.cvs.core_" + iu.getVersion() + ".jar");
+ entries.add("plugins/org.eclipse.ant.optional.junit_" + iu.getVersion() + ".jar");
+ IFile file = buildFolder
+ .getFile("buildRepo/plugins/org.eclipse.ant.optional.junit_" + iu.getVersion() + ".jar");
assertTrue(file.exists());
assertJarVerifies(file.getLocation().toFile());
- iu = getIU(repository, "org.eclipse.cvs");
+ iu = getIU(repository, "org.eclipse.test");
assertNotNull(iu);
- entries.add("plugins/org.eclipse.cvs_" + iu.getVersion() + ".jar");
- assertResourceFile(buildFolder, "buildRepo/plugins/org.eclipse.cvs_" + iu.getVersion() + ".jar");
+ entries.add("plugins/org.eclipse.test_" + iu.getVersion() + ".jar");
+ assertResourceFile(buildFolder, "buildRepo/plugins/org.eclipse.test_" + iu.getVersion() + ".jar");
- iu = getIU(repository, "org.eclipse.team.cvs.ui");
+ iu = getIU(repository, "org.eclipse.test.performance");
assertNotNull(iu);
- entries.add("plugins/org.eclipse.team.cvs.ui_" + iu.getVersion() + ".jar");
- assertResourceFile(buildFolder, "buildRepo/plugins/org.eclipse.team.cvs.ui_" + iu.getVersion() + ".jar");
+ entries.add("plugins/org.eclipse.test.performance_" + iu.getVersion() + ".jar");
+ assertResourceFile(buildFolder, "buildRepo/plugins/org.eclipse.test.performance_" + iu.getVersion() + ".jar");
- iu = getIU(repository, "org.eclipse.team.cvs.ssh2");
+ iu = getIU(repository, "org.eclipse.test.performance.win32");
assertNotNull(iu);
- entries.add("plugins/org.eclipse.team.cvs.ssh2_" + iu.getVersion() + ".jar");
- assertResourceFile(buildFolder, "buildRepo/plugins/org.eclipse.team.cvs.ssh2_" + iu.getVersion() + ".jar");
+ entries.add("plugins/org.eclipse.test.performance.win32_" + iu.getVersion() + ".jar");
+ assertResourceFile(buildFolder,
+ "buildRepo/plugins/org.eclipse.test.performance.win32_" + iu.getVersion() + ".jar");
- iu = getIU(repository, "org.eclipse.cvs.feature.jar");
- file = buildFolder.getFile("buildRepo/features/org.eclipse.cvs_" + iu.getVersion() + ".jar");
+ iu = getIU(repository, "org.eclipse.test.feature.jar");
+ file = buildFolder.getFile("buildRepo/features/org.eclipse.test_" + iu.getVersion() + ".jar");
assertTrue(file.exists());
- entries.add("features/org.eclipse.cvs_" + iu.getVersion() + ".jar");
+ entries.add("features/org.eclipse.test_" + iu.getVersion() + ".jar");
assertJarVerifies(file.getLocation().toFile());
entries.add("artifacts.xml");
