Upgrade dependency management to OSGi R7 (#207)

* replaced aggregated osgi.core dependency with individual artifacts * added missing OSGi dependencies for 6.3.3 UberJar
adobe · Jul 9, 2019 · d99985a · d99985a
1 parent a7ba2ac
commit d99985a
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 27 deletions.
diff --git a/src/main/archetype/core/pom.xml b/src/main/archetype/core/pom.xml
@@ -101,15 +101,43 @@
         <!-- OSGi Dependencies -->
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
+            <artifactId>org.osgi.annotation.versioning</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
+            <artifactId>org.osgi.annotation.bundle</artifactId>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
-            <artifactId>osgi.annotation</artifactId>
+            <artifactId>org.osgi.service.metatype.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component.annotations</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.component</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.cm</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.event</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.service.log</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.framework</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.resource</artifactId>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>

diff --git a/src/main/archetype/core/src/main/java/core/filters/LoggingFilter.java b/src/main/archetype/core/src/main/java/core/filters/LoggingFilter.java
@@ -25,8 +25,10 @@
 
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.engine.EngineConstants;
-import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceDescription;
+import org.osgi.service.component.propertytypes.ServiceRanking;
+import org.osgi.service.component.propertytypes.ServiceVendor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,11 +37,11 @@
  */
 @Component(service = Filter.class,
            property = {
-                   Constants.SERVICE_DESCRIPTION + "=Demo to filter incoming requests",
                    EngineConstants.SLING_FILTER_SCOPE + "=" + EngineConstants.FILTER_SCOPE_REQUEST,
-                   Constants.SERVICE_RANKING + ":Integer=-700"
-
            })
+@ServiceDescription("Demo to filter incoming requests")
+@ServiceRanking(-700)
+@ServiceVendor("Adobe")
 public class LoggingFilter implements Filter {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());

diff --git a/src/main/archetype/core/src/main/java/core/listeners/SimpleResourceListener.java b/src/main/archetype/core/src/main/java/core/listeners/SimpleResourceListener.java
@@ -16,8 +16,8 @@
 package ${package}.core.listeners;
 
 import org.apache.sling.api.SlingConstants;
-import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceDescription;
 import org.osgi.service.event.Event;
 import org.osgi.service.event.EventConstants;
 import org.osgi.service.event.EventHandler;
@@ -35,9 +35,9 @@
 @Component(service = EventHandler.class,
            immediate = true,
            property = {
-                   Constants.SERVICE_DESCRIPTION + "=Demo to listen on changes in the resource tree",
                    EventConstants.EVENT_TOPIC + "=org/apache/sling/api/resource/Resource/*"
            })
+@ServiceDescription("Demo to listen on changes in the resource tree")
 public class SimpleResourceListener implements EventHandler {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());

diff --git a/src/main/archetype/core/src/main/java/core/servlets/SimpleServlet.java b/src/main/archetype/core/src/main/java/core/servlets/SimpleServlet.java
@@ -22,9 +22,8 @@
 import org.apache.sling.api.servlets.HttpConstants;
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
 import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
-import org.apache.sling.api.resource.ValueMap;
-import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.propertytypes.ServiceDescription;
 
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
@@ -38,11 +37,11 @@
  */
 @Component(service=Servlet.class,
            property={
-                   Constants.SERVICE_DESCRIPTION + "=Simple Demo Servlet",
                    "sling.servlet.methods=" + HttpConstants.METHOD_GET,
                    "sling.servlet.resourceTypes="+ "${appsFolderName}/components/structure/page",
                    "sling.servlet.extensions=" + "txt"
            })
+@ServiceDescription("Simple Demo Servlet")
 public class SimpleServlet extends SlingSafeMethodsServlet {
 
     private static final long serialVersionUID = 1L;

diff --git a/src/main/archetype/it.tests/pom.xml b/src/main/archetype/it.tests/pom.xml
@@ -80,14 +80,6 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>osgi.cmpn</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/src/main/archetype/pom.xml b/src/main/archetype/pom.xml
@@ -473,20 +473,62 @@
             <!-- OSGi Dependencies -->
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>osgi.core</artifactId>
-                <version>6.0.0</version>
+                <artifactId>org.osgi.annotation.versioning</artifactId>
+                <version>1.1.0</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>osgi.cmpn</artifactId>
-                <version>6.0.0</version>
+                <artifactId>org.osgi.annotation.bundle</artifactId>
+                <version>1.0.0</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>
-                <artifactId>osgi.annotation</artifactId>
-                <version>6.0.1</version>
+                <artifactId>org.osgi.service.metatype.annotations</artifactId>
+                <version>1.4.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.component.annotations</artifactId>
+                <version>1.4.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.component</artifactId>
+                <version>1.4.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.cm</artifactId>
+                <version>1.6.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.event</artifactId>
+                <version>1.3.1</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.service.log</artifactId>
+                <version>1.4.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.resource</artifactId>
+                <version>1.0.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.osgi</groupId>
+                <artifactId>org.osgi.framework</artifactId>
+                <version>1.9.0</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -599,7 +641,7 @@
             <dependency>
                 <groupId>io.wcm</groupId>
                 <artifactId>io.wcm.testing.aem-mock.junit5</artifactId>
-                <version>2.4.8</version>
+                <version>2.5.2</version>
                 <scope>test</scope>
             </dependency>
             <dependency>