From 7f3e2ad385342e07aa53e3ddf148fe4e6418d8ea Mon Sep 17 00:00:00 2001
From: Lorenzo Bettini <lorenzo.bettini@gmail.com>
Date: Thu, 28 Jul 2022 16:05:49 +0200
Subject: [PATCH] 195: changed the id of org.pitest.bundles

Still not working

Task-Url: https://github.com/pitest/pitclipse/issues/195
---
 bundles/org.pitest.bundles/META-INF/MANIFEST.MF               | 4 ++--
 bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF        | 2 +-
 bundles/org.pitest.pitclipse.listeners/META-INF/MANIFEST.MF   | 2 +-
 bundles/org.pitest.pitclipse.runner/META-INF/MANIFEST.MF      | 2 +-
 .../src/org/pitest/pitclipse/runner/PitRunnerTest.java        | 2 +-
 tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bundles/org.pitest.bundles/META-INF/MANIFEST.MF b/bundles/org.pitest.bundles/META-INF/MANIFEST.MF
index 5a26400e..34f03e8e 100644
--- a/bundles/org.pitest.bundles/META-INF/MANIFEST.MF
+++ b/bundles/org.pitest.bundles/META-INF/MANIFEST.MF
@@ -1,13 +1,13 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Pitest Bundles
-Bundle-SymbolicName: org.pitest.bundles;singleton:=true
+Bundle-SymbolicName: org.pitest;singleton:=true
 Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: Henry Coles
-Automatic-Module-Name: org.pitest.bundles
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: wrapped.org.pitest.pitest;visibility:=reexport,
  wrapped.org.pitest.pitest-command-line;visibility:=reexport,
  wrapped.org.pitest.pitest-entry;visibility:=reexport,
  wrapped.org.pitest.pitest-html-report;visibility:=reexport,
  org.junit;bundle-version="4.12.0"
+Automatic-Module-Name: org.pitest
diff --git a/bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF
index d455dc48..20861008 100644
--- a/bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF
+++ b/bundles/org.pitest.pitclipse.core/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.11.1,4.0.0)",
  org.pitest.pitclipse.runner;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.resources;bundle-version="[3.10.1,4.0.0)",
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
- org.pitest.bundles;visibility:=reexport
+ org.pitest;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: Pitest.org
diff --git a/bundles/org.pitest.pitclipse.listeners/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.listeners/META-INF/MANIFEST.MF
index 0de60b3c..c33c0a05 100644
--- a/bundles/org.pitest.pitclipse.listeners/META-INF/MANIFEST.MF
+++ b/bundles/org.pitest.pitclipse.listeners/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Pitclipse's Pitest Listeners
 Bundle-SymbolicName: org.pitest.pitclipse.listeners
 Bundle-Version: 2.2.0.qualifier
-Fragment-Host: org.pitest.bundles;bundle-version="1.6.8"
+Fragment-Host: org.pitest;bundle-version="1.6.8"
 Automatic-Module-Name: org.pitest.pitclipse.listeners
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.pitest.pitclipse.runner;bundle-version="2.0.0"
diff --git a/bundles/org.pitest.pitclipse.runner/META-INF/MANIFEST.MF b/bundles/org.pitest.pitclipse.runner/META-INF/MANIFEST.MF
index 4f1e6735..5a5a881e 100644
--- a/bundles/org.pitest.pitclipse.runner/META-INF/MANIFEST.MF
+++ b/bundles/org.pitest.pitclipse.runner/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 2.2.0.qualifier
 Bundle-Vendor: Pitest.org
 Automatic-Module-Name: org.pitest.pitclipse.runner
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.pitest.bundles;visibility:=reexport
+Require-Bundle: org.pitest
 Export-Package: org.pitest.pitclipse.runner,
  org.pitest.pitclipse.runner.client,
  org.pitest.pitclipse.runner.config,
diff --git a/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/PitRunnerTest.java b/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/PitRunnerTest.java
index 286072b5..d272676d 100644
--- a/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/PitRunnerTest.java
+++ b/tests/org.pitest.pitclipse.runner.tests/src/org/pitest/pitclipse/runner/PitRunnerTest.java
@@ -162,7 +162,7 @@ private static PitOptions options(String classUnderTest, List<String> classesToM
     
     private static List<String> classPathWithPitestAndJUnit() throws IOException {
         final String jarDir = "lib";
-        EquinoxBundle pitestBundle = (EquinoxBundle) Platform.getBundle("org.pitest.bundles");
+        EquinoxBundle pitestBundle = (EquinoxBundle) Platform.getBundle("org.pitest");
         Bundle[] bundles = Platform.getBundle("org.eclipse.core.runtime").getBundleContext().getBundles();
         System.out.println("symbolic name: " + pitestBundle.getSymbolicName());
         List<EquinoxBundle> pitestWrappedBundles = Stream.of(bundles)
diff --git a/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF b/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF
index 92813a86..6d6158f1 100644
--- a/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.pitest.pitclipse.ui.tests/META-INF/MANIFEST.MF
@@ -29,4 +29,4 @@ Require-Bundle: org.eclipse.swtbot.eclipse.finder,
  wrapped.io.cucumber.cucumber-junit;bundle-version="4.3.0",
  wrapped.io.cucumber.cucumber-core;bundle-version="4.3.0",
  wrapped.io.cucumber.datatable;bundle-version="1.1.12",
- org.pitest.bundles
+ org.pitest