commit 1451bef39773d1063ebda6882140e4ea7cbec546
author Ashok Pelluru <37666786+ashokmca07@users.noreply.github.com> Tue May 31 15:50:29 2022 +0200
committer GitHub <noreply@github.com> Tue May 31 15:50:29 2022 +0200
tree 17dd1cef0fd42a4a168177a0c02cf8deb43d4e93
parent 14d1d7df3d3eb3fa446caac41e55a6645bb7e09a

SLING-11345: Sling bundle parent update to 47 (#2)

pom.xml

diff --git a/pom.xml b/pom.xml
index 7e8a759..b85bae9 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>30</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>47</version>
         <relativePath />
     </parent>
 
     <artifactId>org.apache.sling.jobs</artifactId>
-    <packaging>bundle</packaging>
     <version>1.0.1-SNAPSHOT</version>
 
     <name>Apache Sling Jobs Support</name>
@@ -39,30 +38,21 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jobs.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jobs.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-jobs.git</url>
+        <tag>HEAD</tag>
     </scm>
 
     <properties>
+        <project.build.outputTimestamp>1</project.build.outputTimestamp>
         <site.jira.version.id>12315369</site.jira.version.id>
-        <sling.java.version>7</sling.java.version>
-        <exam.version>4.4.0</exam.version>
-        <url.version>2.4.5</url.version>
-        <bundle.build.dir>${basedir}/target</bundle.build.dir>
-        <bundle.file.name>${bundle.build.dir}/${project.build.finalName}.jar</bundle.file.name>
-        <min.port>37000</min.port>
-        <max.port>37999</max.port>
+        <sling.java.version>8</sling.java.version>
     </properties>
 
 
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-scr-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
@@ -92,23 +82,29 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>16.0.2</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>biz.aQute.bnd</groupId>
-            <artifactId>biz.aQute.bndlib</artifactId>
-            <scope>provided</scope>
-        </dependency>
+
       <!-- Testing -->
         <dependency>
             <groupId>junit</groupId>
@@ -123,13 +119,13 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.service.cm</artifactId>
-            <version>1.5.0</version>
+            <version>1.6.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <artifactId>mockito-core</artifactId>
+            <version>4.5.1</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

src/test/java/org/apache/sling/jobs/impl/JobManagerImplTest.java

diff --git a/src/test/java/org/apache/sling/jobs/impl/JobManagerImplTest.java b/src/test/java/org/apache/sling/jobs/impl/JobManagerImplTest.java
index 5cab281..0a12daa 100644
--- a/src/test/java/org/apache/sling/jobs/impl/JobManagerImplTest.java
+++ b/src/test/java/org/apache/sling/jobs/impl/JobManagerImplTest.java
@@ -35,7 +35,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Queue;

src/test/java/org/apache/sling/jobs/impl/ManagerSubscriberTest.java

diff --git a/src/test/java/org/apache/sling/jobs/impl/ManagerSubscriberTest.java b/src/test/java/org/apache/sling/jobs/impl/ManagerSubscriberTest.java
index 7acc35c..89fc4fa 100644
--- a/src/test/java/org/apache/sling/jobs/impl/ManagerSubscriberTest.java
+++ b/src/test/java/org/apache/sling/jobs/impl/ManagerSubscriberTest.java
@@ -19,7 +19,6 @@
 
 package org.apache.sling.jobs.impl;
 
-import aQute.libg.command.Command;
 import org.apache.sling.jobs.Job;
 import org.apache.sling.jobs.JobUpdate;
 import org.apache.sling.jobs.Types;