You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2020/04/02 11:00:42 UTC
[sling-org-apache-sling-junit-teleporter] 05/05: SLING-9327 -
remove osgi.core dependency which was not really used
This is an automated email from the ASF dual-hosted git repository.
bdelacretaz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-junit-teleporter.git
commit 9cf6c329304e0168222e3b1a9792a7c4981b99d4
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Thu Apr 2 13:00:22 2020 +0200
SLING-9327 - remove osgi.core dependency which was not really used
---
pom.xml | 6 ------
.../sling/testing/teleporter/client/ClientSideTeleporter.java | 3 +--
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 19f6ed8..9a5a4dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,12 +146,6 @@
<version>1.1.4</version>
<scope>test</scope>
</dependency>
- <!-- OSGi -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
</dependencies>
<scm>
diff --git a/src/main/java/org/apache/sling/testing/teleporter/client/ClientSideTeleporter.java b/src/main/java/org/apache/sling/testing/teleporter/client/ClientSideTeleporter.java
index f1073a9..ed0e199 100644
--- a/src/main/java/org/apache/sling/testing/teleporter/client/ClientSideTeleporter.java
+++ b/src/main/java/org/apache/sling/testing/teleporter/client/ClientSideTeleporter.java
@@ -43,7 +43,6 @@ import org.junit.runner.Description;
import org.junit.runners.model.Statement;
import org.ops4j.pax.tinybundles.core.TinyBundle;
import org.ops4j.pax.tinybundles.core.TinyBundles;
-import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.helpers.NOPLogger;
@@ -79,7 +78,7 @@ public class ClientSideTeleporter extends TeleporterRule {
private InputStream buildTestBundle(Class<?> c, Collection<Class<?>> embeddedClasses, String bundleSymbolicName) throws IOException {
final TinyBundle b = TinyBundles.bundle()
- .set(Constants.BUNDLE_SYMBOLICNAME, bundleSymbolicName)
+ .set("Bundle-SymbolicName", bundleSymbolicName)
.set("Sling-Test-Regexp", c.getName() + ".*")
.set("Sling-Test-WaitForService-Timeout", Integer.toString(waitForServiceTimout))
.add(c);