You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2019/08/26 15:13:48 UTC
[sling-org-apache-sling-scripting-bundle-tracker] branch master
updated: SLING-8657 - Remove the biz.aQute.bndlib dependency
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker.git
The following commit(s) were added to refs/heads/master by this push:
new 76d9a40 SLING-8657 - Remove the biz.aQute.bndlib dependency
76d9a40 is described below
commit 76d9a40a08dd4c67b0f3444473521ce42a273084
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Mon Aug 26 17:13:21 2019 +0200
SLING-8657 - Remove the biz.aQute.bndlib dependency
---
pom.xml | 12 +++++++-----
.../bundle/tracker/internal/BundledScriptTracker.java | 10 +++++-----
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 30b853d..21d4552 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>4.2.0</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -102,11 +103,6 @@
<dependencies>
<dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bndlib</artifactId>
- <version>3.5.0</version>
- </dependency>
- <dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<scope>provided</scope>
@@ -144,6 +140,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.7</version>
diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
index 6a06ec3..ef16eb4 100644
--- a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
@@ -49,6 +49,7 @@ import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.request.RequestDispatcherOptions;
import org.apache.sling.api.servlets.ServletResolverConstants;
import org.apache.sling.commons.osgi.PropertiesUtil;
+import org.osgi.annotation.bundle.Capability;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
@@ -60,6 +61,7 @@ import org.osgi.framework.wiring.BundleCapability;
import org.osgi.framework.wiring.BundleRevision;
import org.osgi.framework.wiring.BundleWire;
import org.osgi.framework.wiring.BundleWiring;
+import org.osgi.namespace.extender.ExtenderNamespace;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
@@ -69,14 +71,12 @@ import org.osgi.util.tracker.BundleTrackerCustomizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import aQute.bnd.annotation.headers.ProvideCapability;
-
@Component(
service = {}
)
-@ProvideCapability(ns = "osgi.extender",
- name = BundledScriptTracker.NS_SLING_SCRIPTING_EXTENDER,
- version = "1.0.0")
+@Capability(namespace = ExtenderNamespace.EXTENDER_NAMESPACE,
+ name = BundledScriptTracker.NS_SLING_SCRIPTING_EXTENDER,
+ version = "1.0.0")
public class BundledScriptTracker implements BundleTrackerCustomizer<List<ServiceRegistration<Servlet>>> {
static final String NS_SLING_SCRIPTING_EXTENDER = "sling.scripting";