This is an automated email from the ASF dual-hosted git repository. apelluru pushed a commit to branch SLING-11591 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-subsystems-base.git
commit e0aea65baf0e1a3412c0e015975088f5c2e69731 Author: Ashok Pelluru <[email protected]> AuthorDate: Tue Sep 20 16:45:55 2022 +0200 SLING-11591: upgrade to sling parent 49 --- pom.xml | 55 +++++++--------------- .../factories/subsystems/base/impl/Activator.java | 3 ++ 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/pom.xml b/pom.xml index c27ed3b..a2bca96 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> @@ -44,49 +44,26 @@ <url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-installer-factory-subsystems-base.git</url> </scm> - <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> - <exclude>src/test/resources/*-base</exclude> - </excludes> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> <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 +85,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;
