From b3c2523810f82458e5ceb87d2272b9ef69f43370 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Fri, 11 Aug 2023 19:19:41 +0200
Subject: [PATCH] #1919: 4.0.2 tag fails to run the Bundles tests (2)

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .../testing/osgi/OSGITestHelper.java          | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/bundles/tests/src/test/java/org/eclipse/persistence/testing/osgi/OSGITestHelper.java b/bundles/tests/src/test/java/org/eclipse/persistence/testing/osgi/OSGITestHelper.java
index 2112153ea7f..8d4a59b872d 100644
--- a/bundles/tests/src/test/java/org/eclipse/persistence/testing/osgi/OSGITestHelper.java
+++ b/bundles/tests/src/test/java/org/eclipse/persistence/testing/osgi/OSGITestHelper.java
@@ -69,23 +69,23 @@ public static Option[] getDefaultOptions() {
     public static Option[] getOptionsWithBeanValidation() {
         return options(
                 // JAXB API
-                bundle("file:" + PLUGINS_DIR + ACTIVATION_JAR),
-                bundle("file:" + PLUGINS_DIR + JAXB_API_JAR),
+                bundle(pathToUrl(PLUGINS_DIR + ACTIVATION_JAR)),
+                bundle(pathToUrl(PLUGINS_DIR + JAXB_API_JAR)),
 
                 // JAX-RS API
-                bundle("file:" + PLUGINS_DIR + JAXRS_JAR),
+                bundle(pathToUrl(PLUGINS_DIR + JAXRS_JAR)),
 
                 // EclipseLink bundles
-                bundle("file:" + PLUGINS_DIR + "org.eclipse.persistence.moxy.jar"),
-                bundle("file:" + PLUGINS_DIR + "org.eclipse.persistence.core.jar"),
-                bundle("file:" + PLUGINS_DIR + ASM_JAR),
+                bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.moxy.jar")),
+                bundle(pathToUrl(PLUGINS_DIR + "org.eclipse.persistence.core.jar")),
+                bundle(pathToUrl(PLUGINS_DIR + ASM_JAR)),
 
-                bundle("file:" + PLUGINS_DIR + "jakarta.validation-api.jar"),
-                bundle("file:" + PLUGINS_DIR + "hibernate-validator.jar"),
-                bundle("file:" + PLUGINS_DIR + "classmate.jar"),
-                bundle("file:" + PLUGINS_DIR + "jakarta.el-api.jar"),
-                bundle("file:" + PLUGINS_DIR + "jakarta.el.jar"),
-                bundle("file:" + PLUGINS_DIR + "jboss-logging.jar"),
+                bundle(pathToUrl(PLUGINS_DIR + "jakarta.validation-api.jar")),
+                bundle(pathToUrl(PLUGINS_DIR + "hibernate-validator.jar")),
+                bundle(pathToUrl(PLUGINS_DIR + "classmate.jar")),
+                bundle(pathToUrl(PLUGINS_DIR + "jakarta.el-api.jar")),
+                bundle(pathToUrl(PLUGINS_DIR + "jakarta.el.jar")),
+                bundle(pathToUrl(PLUGINS_DIR + "jboss-logging.jar")),
                 cleanCaches(),
                 junitBundles()
         );