You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ap...@apache.org on 2022/09/19 07:26:51 UTC

[sling-org-apache-sling-resourcecollection] branch master updated: SLING-11564: upgrade to sling 49 (#2)

This is an automated email from the ASF dual-hosted git repository.

apelluru pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcecollection.git


The following commit(s) were added to refs/heads/master by this push:
     new dfcfd3c  SLING-11564: upgrade to sling 49 (#2)
dfcfd3c is described below

commit dfcfd3ca53a7ffec1146a09e850893beea15716e
Author: Ashok Pelluru <37...@users.noreply.github.com>
AuthorDate: Mon Sep 19 09:26:45 2022 +0200

    SLING-11564: upgrade to sling 49 (#2)
    
    * SLING-11564: upgrade to sling 49
---
 pom.xml | 35 ++++++-----------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index ca1516a..fba8149 100755
--- a/pom.xml
+++ b/pom.xml
@@ -24,8 +24,8 @@
     <!-- ======================================================================= -->
     <parent>
         <groupId>org.apache.sling</groupId>
-        <artifactId>sling</artifactId>
-        <version>34</version>
+        <artifactId>sling-bundle-parent</artifactId>
+        <version>49</version>
         <relativePath />
     </parent>
 
@@ -35,7 +35,6 @@
     <groupId>org.apache.sling</groupId>
     <artifactId>org.apache.sling.resourcecollection</artifactId>
     <version>1.0.3-SNAPSHOT</version>
-    <packaging>bundle</packaging>
 
     <name>Apache Sling Resource Collection API</name>
     <description>
@@ -46,38 +45,17 @@
         <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcecollection.git</connection>
         <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcecollection.git</developerConnection>
         <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-resourcecollection.git</url>
-      <tag>HEAD</tag>
-  </scm>
+        <tag>HEAD</tag>
+    </scm>
 
     <!-- ======================================================================= -->
     <!-- B U I L D                                                               -->
     <!-- ======================================================================= -->
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.sling</groupId>
-                <artifactId>maven-sling-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>scr-metadata</id>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <exportScr>true</exportScr>
-                </configuration>
-            </plugin>
 	        <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                
             </plugin>
         </plugins>
     </build>
@@ -86,7 +64,6 @@
     <!-- D E P E N D E N C I E S                                                 -->
     <!-- ======================================================================= -->
     <dependencies>
-
         <!-- sling -->
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -94,14 +71,12 @@
             <version>2.6.0</version>
             <scope>provided</scope>
         </dependency>
-        
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.jcr.api</artifactId>
             <version>2.1.0</version>
             <scope>provided</scope>
         </dependency>
-        <!-- OSGI -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
@@ -113,6 +88,7 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -127,6 +103,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         
        <!-- Testing -->