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/10/05 15:36:56 UTC
[sling-org-apache-sling-installer-factory-subsystems-base] branch master updated: SLING-11591: upgrade to sling parent 49 (#1)
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-factory-subsystems-base.git
The following commit(s) were added to refs/heads/master by this push:
new c7852e9 SLING-11591: upgrade to sling parent 49 (#1)
c7852e9 is described below
commit c7852e9a89f0ae7d830fad7abb2fe522f0108bbd
Author: Ashok Pelluru <37...@users.noreply.github.com>
AuthorDate: Wed Oct 5 17:36:52 2022 +0200
SLING-11591: upgrade to sling parent 49 (#1)
* SLING-11591: upgrade to sling parent 49
---
pom.xml | 45 +++++++++-------------
.../factories/subsystems/base/impl/Activator.java | 3 ++
2 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index c27ed3b..0cf6b78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,14 +20,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>26</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>49</version>
<relativePath/>
</parent>
<artifactId>org.apache.sling.installer.factory.subsystems-base</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Subsystems Base Installer</name>
<description>
@@ -35,7 +34,8 @@
</description>
<properties>
- <sling.java.version>7</sling.java.version>
+ <sling.java.version>8</sling.java.version>
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
</properties>
<scm>
@@ -46,28 +46,13 @@
<build>
<plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Activator>
- org.apache.sling.installer.factories.subsystems.base.impl.Activator
- </Bundle-Activator>
- <Private-Package>
- org.apache.sling.installer.factories.subsystems.base.impl.*
- </Private-Package>
- </instructions>
- </configuration>
- </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
+ <excludes>
<exclude>src/test/resources/*-base</exclude>
- </excludes>
+ </excludes>
</configuration>
</plugin>
</plugins>
@@ -77,16 +62,22 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>5.0.0</version>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>5.0.0</version>
+ <artifactId>org.osgi.service.subsystem</artifactId>
+ <version>1.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -108,8 +99,8 @@
</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>
<dependency>
diff --git a/src/main/java/org/apache/sling/installer/factories/subsystems/base/impl/Activator.java b/src/main/java/org/apache/sling/installer/factories/subsystems/base/impl/Activator.java
index 0708f71..27bcbcd 100644
--- a/src/main/java/org/apache/sling/installer/factories/subsystems/base/impl/Activator.java
+++ b/src/main/java/org/apache/sling/installer/factories/subsystems/base/impl/Activator.java
@@ -30,6 +30,9 @@ import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.annotation.bundle.Header;
+
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
private ServiceTracker<SlingSettingsService, SlingSettingsService> slingSettingsTracker;