commit 94d0d08ba0f8d3a317098878be1b60f42dd6aecf
author Robert Munteanu <rombert@apache.org> Wed Sep 22 12:01:04 2021 +0200
committer Robert Munteanu <robert.munteanu@gmail.com> Wed Sep 22 13:02:34 2021 +0200
tree 9529651f641b502b0cf95ace6a3dac4d0f9f018b
parent 1bbed201019c0a81f5753f60ea9cea19b49e851c

SLING-10836 - Update commons.threads to parent pom 45

bnd.bnd

diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..6ef6ae7
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+Provide-Capability: osgi.service;objectClass=org.apache.sling.commons.threads.ThreadPoolManager,\
+    osgi.service;objectClass=org.apache.sling.commons.threads.jmx.ThreadPoolMBean
\ No newline at end of file

pom.xml

diff --git a/pom.xml b/pom.xml
index ae1ce01..a539ac2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,13 +22,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>32</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>45</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.commons.threads</artifactId>
-    <packaging>bundle</packaging>
     <version>3.2.23-SNAPSHOT</version>
 
     <name>Apache Sling Commons Threads</name>
@@ -46,22 +45,6 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-Activator>
-                            org.apache.sling.commons.threads.impl.Activator
-                        </Bundle-Activator>
-                        <Provide-Capability>
-                            osgi.service;objectClass=org.apache.sling.commons.threads.ThreadPoolManager,
-                            osgi.service;objectClass=org.apache.sling.commons.threads.jmx.ThreadPoolMBean
-                        </Provide-Capability>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
@@ -82,6 +65,14 @@
             <artifactId>osgi.cmpn</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation.bundle</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
@@ -105,4 +96,9 @@
             <version>1.2.6</version>
         </dependency>
     </dependencies>
+
+    <properties>
+        <sling.java.version>8</sling.java.version>
+        <project.build.outputTimestamp>2021-08-06T09:01:40Z</project.build.outputTimestamp>
+    </properties>
 </project>

src/main/java/org/apache/sling/commons/threads/impl/Activator.java

diff --git a/src/main/java/org/apache/sling/commons/threads/impl/Activator.java b/src/main/java/org/apache/sling/commons/threads/impl/Activator.java
index 5bb85fe..34a5d53 100644
--- a/src/main/java/org/apache/sling/commons/threads/impl/Activator.java
+++ b/src/main/java/org/apache/sling/commons/threads/impl/Activator.java
@@ -22,6 +22,7 @@
 import java.util.Hashtable;
 
 import org.apache.sling.commons.threads.ThreadPoolManager;
+import org.osgi.annotation.bundle.Header;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Constants;
@@ -31,6 +32,7 @@
 /**
  * This activator registers the thread pool manager.
  */
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
 public class Activator implements BundleActivator {
 
     /** The service registration for the thread pool manager. */