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/11/22 15:29:32 UTC
[sling-org-apache-sling-commons-fsclassloader] branch SLING-11697 updated: SLING-11697: upgrade to sling 49
This is an automated email from the ASF dual-hosted git repository.
apelluru pushed a commit to branch SLING-11697
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-fsclassloader.git
The following commit(s) were added to refs/heads/SLING-11697 by this push:
new 81b4b06 SLING-11697: upgrade to sling 49
81b4b06 is described below
commit 81b4b061c79d14dd298a8f7cf33655a8d283603c
Author: Ashok Pelluru <ap...@apache.org>
AuthorDate: Tue Nov 22 16:29:25 2022 +0100
SLING-11697: upgrade to sling 49
---
bnd.bnd | 2 ++
pom.xml | 50 +++++++++++++++++++++++++++++---------------------
2 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..e524b9a
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,2 @@
+Import-Package: \
+ org.apache.felix.webconsole;resolution:=optional,*
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 12e528d..eab4586 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>49</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.commons.fsclassloader</artifactId>
<version>1.0.15-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Commons FileSystem ClassLoader</name>
<description>
@@ -41,23 +40,11 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-fsclassloader.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-fsclassloader.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-commons-fsclassloader.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>
- <Import-Package>
- org.apache.felix.webconsole;resolution:=optional,*
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
@@ -78,14 +65,32 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.versioning</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>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.metatype.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
@@ -96,6 +101,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -120,22 +126,24 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
+ <version>4.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito</artifactId>
- <version>1.6.5</version>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <version>2.0.9</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>