SLING-10141 Update to Sling Bundle Parent 40
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..465482e
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1 @@
+Provide-Capability: osgi.extender;osgi.extender="org.apache.sling.bundleresource";version:Version="1.1"
diff --git a/pom.xml b/pom.xml
index 6a8b67a..f048618 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,12 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>32</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>40</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.bundleresource.impl</artifactId>
- <packaging>bundle</packaging>
<version>2.3.3-SNAPSHOT</version>
<name>Apache Sling Bundle Resource Provider</name>
@@ -36,31 +35,20 @@
based resources.
</description>
+ <properties>
+ <project.build.outputTimestamp>2020-10-15T22:24:47Z</project.build.outputTimestamp>
+ </properties>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-bundleresource-impl.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-bundleresource-impl.git</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>
- org.apache.sling.bundleresource.impl.Activator
- </Bundle-Activator>
- <Provide-Capability>
- osgi.extender;osgi.extender="org.apache.sling.bundleresource";version:Version="1.1"
- </Provide-Capability>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
@@ -100,8 +88,18 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.util.tracker</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ </dependency>
+
<!-- This is only used for some constants, no runtime dependency -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
diff --git a/src/main/java/org/apache/sling/bundleresource/impl/Activator.java b/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
index a25e22e..682f3a5 100644
--- a/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
+++ b/src/main/java/org/apache/sling/bundleresource/impl/Activator.java
@@ -21,14 +21,17 @@
import java.util.HashMap;
import java.util.Map;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleEvent;
import org.osgi.framework.BundleListener;
+import org.osgi.framework.Constants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator, BundleListener {
/**
