SLING-11591: upgrade to sling parent 49 (#1)
Co-authored-by: Ashok Pelluru <apelluru@apache.org>
diff --git a/pom.xml b/pom.xml
index f7bc5db..82aa866 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,58 +20,50 @@
<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.deploymentpackage</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Deployment Package Installer</name>
<description>
Provides support for deployment packages to the Apache Sling OSGi installer
</description>
+ <properties>
+ <bnd.baseline.fail.on.missing>false</bnd.baseline.fail.on.missing>
+ </properties>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-factory-deploymentpackage.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-installer-factory-deploymentpackage.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.deploypck.impl.Activator
- </Bundle-Activator>
- <Private-Package>
- org.apache.sling.installer.factories.deploypck.impl.*
- </Private-Package>
- </instructions>
- </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>
+ <artifactId>osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>org.osgi.service.deploymentadmin</artifactId>
+ <version>1.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
diff --git a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java
index bff9c7b..75ed888 100644
--- a/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java
+++ b/src/main/java/org/apache/sling/installer/factories/deploypck/impl/Activator.java
@@ -31,7 +31,9 @@
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.deploymentadmin.DeploymentAdmin;
+import org.osgi.annotation.bundle.Header;
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements ServiceListener, BundleActivator {
private static final String DEPLOYMENT_ADMIN = "org.osgi.service.deploymentadmin.DeploymentAdmin";