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/06/30 15:54:11 UTC
[sling-org-apache-sling-installer-provider-installhook] branch master updated: SLING-11417: Upgrade to sling 48 (#3)
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-installer-provider-installhook.git
The following commit(s) were added to refs/heads/master by this push:
new 083111c SLING-11417: Upgrade to sling 48 (#3)
083111c is described below
commit 083111ca6512a01b70b5516d1ff6b1479cafe0cb
Author: Ashok Pelluru <37...@users.noreply.github.com>
AuthorDate: Thu Jun 30 17:54:06 2022 +0200
SLING-11417: Upgrade to sling 48 (#3)
* SLING-11417: Upgrade to sling 48
* SLING-11417: fix typos
---
.gitignore | 3 +-
.../META-INF/MANIFEST.MF => bnd.bnd | 0
pom.xml | 32 ++++------------------
3 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8b0fe0c..fa83a29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
.project
.classpath
.settings/
-.DS_Store
\ No newline at end of file
+.DS_Store
+/.idea/
diff --git a/src/main/appended-resources/META-INF/MANIFEST.MF b/bnd.bnd
similarity index 100%
rename from src/main/appended-resources/META-INF/MANIFEST.MF
rename to bnd.bnd
diff --git a/pom.xml b/pom.xml
index 9e38f86..c3eea6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,14 +14,13 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>48</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.installer.provider.installhook</artifactId>
- <version>1.1.2-SSNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>1.1.2-SNAPSHOT</version>
<name>Sling Installer Vault Package Install Hook</name>
<description>
@@ -32,9 +31,10 @@
<properties>
<jackrabbit.version>2.10.0</jackrabbit.version>
- <sling.java.version>7</sling.java.version>
+ <sling.java.version>8</sling.java.version>
<filevault.version>3.1.18</filevault.version>
<jackrabbit.version>2.10.1</jackrabbit.version>
+ <project.build.outputTimestamp>1</project.build.outputTimestamp>
</properties>
<scm>
@@ -44,21 +44,6 @@
<tag>HEAD</tag>
</scm>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <_include>src/main/appended-resources/META-INF/MANIFEST.MF</_include>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<dependency>
<groupId>org.slf4j</groupId>
@@ -107,11 +92,6 @@
<artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- Basic dependencies for Unit Tests -->
<dependency>
@@ -127,7 +107,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>2.13.0</version>
+ <version>4.5.1</version>
<scope>test</scope>
</dependency>
</dependencies>