You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2020/01/07 08:13:36 UTC
[sling-org-apache-sling-installer-core] branch feature/new-parent
created (now b9701ab)
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a change to branch feature/new-parent
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git.
at b9701ab SLING-8963 update to parent 35
This branch includes the following new commits:
new b9701ab SLING-8963 update to parent 35
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[sling-org-apache-sling-installer-core] 01/01: SLING-8963 update to
parent 35
Posted by kw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch feature/new-parent
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git
commit b9701abcae4c66c485838fa08d73e55b98f10934
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Tue Jan 7 09:13:06 2020 +0100
SLING-8963 update to parent 35
---
bnd.bnd | 9 +++
pom.xml | 79 +++++++++++++---------
.../sling/installer/core/impl/Activator.java | 2 +
3 files changed, 57 insertions(+), 33 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..701f46f
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,9 @@
+-conditionalpackage: org.apache.felix.configurator.impl.*,\\
+ org.apache.sling.feature.io.*,\\
+ javax.json.*,\\
+ org.apache.johnzon.core.*,\\
+ org.apache.felix.converter.*,\\
+ org.apache.felix.cm.*,\\
+ org.apache.sling.commons.osgi.*\\
+Provide-Capability: osgi.service;objectClass:List<String>="org.apache.sling.installer.api.OsgiInstaller,org.apache.sling.installer.api.ResourceChangeListener,org.apache.sling.installer.api.info.InfoProvider,org.apache.sling.installer.api.tasks.RetryHandler",\\
+ osgi.service;objectClass:List<String>="org.apache.sling.installer.api.event.InstallationListener,org.apache.sling.installer.api.jmx.InstallerMBean"
diff --git a/pom.xml b/pom.xml
index 34af857..e5fce61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,14 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath/>
</parent>
<artifactId>org.apache.sling.installer.core</artifactId>
<version>3.9.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Installer</name>
<description>
@@ -40,6 +39,7 @@
<properties>
<sling.java.version>8</sling.java.version>
+ <bnd.version>4.3.1</bnd.version>
</properties>
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-core.git</connection>
@@ -48,33 +48,13 @@
<tag>HEAD</tag>
</scm>
- <build>
+<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
<configuration>
- <instructions>
- <Bundle-Activator>
- org.apache.sling.installer.core.impl.Activator
- </Bundle-Activator>
- <Conditional-Package>
- org.apache.felix.configurator.impl.json,
- org.apache.felix.configurator.impl.model,
- org.apache.sling.feature.io,
- </Conditional-Package>
- <Embed-Dependency>
- org.apache.sling.commons.johnzon,
- org.apache.felix.converter,
- org.apache.felix.configadmin;inline="org/apache/felix/cm/file/ConfigurationHandler.*",
- org.apache.sling.commons.osgi;inline="org/apache/sling/commons/osgi/ManifestHeader*.*|org/apache/sling/commons/osgi/PropertiesUtil.*|org/apache/sling/commons/osgi/SortingServiceTracker.*"
- </Embed-Dependency>
- <Provide-Capability><![CDATA[
- osgi.service;objectClass:List<String>="org.apache.sling.installer.api.OsgiInstaller,org.apache.sling.installer.api.ResourceChangeListener,org.apache.sling.installer.api.info.InfoProvider,org.apache.sling.installer.api.tasks.RetryHandler",
- osgi.service;objectClass:List<String>="org.apache.sling.installer.api.event.InstallationListener,org.apache.sling.installer.api.jmx.InstallerMBean"
- ]]></Provide-Capability>
- </instructions>
+ <fullReport>true</fullReport>
</configuration>
</plugin>
<plugin>
@@ -143,9 +123,42 @@
</build>
<dependencies>
+ <!-- OSGi annotations (OSGi R7) -->
+ <!-- https://osgi.org/javadoc/osgi.annotation/7.0.0/org/osgi/annotation/versioning/package-frame.html -->
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- https://osgi.org/javadoc/osgi.annotation/7.0.0/org/osgi/annotation/bundle/package-frame.html -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.annotation.bundle</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <!-- OSGi framework 1.8, Core R6 (https://osgi.org/javadoc/r6/core/org/osgi/framework/package-summary.html) -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.startlevel</artifactId>
+ <version>1.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.url</artifactId>
+ <version>1.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.packageadmin</artifactId>
+ <version>1.2.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -154,34 +167,34 @@
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
- <version>16.0.2</version>
<scope>provided</scope>
</dependency>
+ <!-- all compile scope dependencies are embedded -->
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.osgi</artifactId>
<version>2.2.0</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<!-- We use a class from the config admin implementation to read config files -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
<version>1.8.12</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<!-- We use classes from the configurator, json api, converter and feature.io to read/write JSON config files -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configurator</artifactId>
<version>1.0.10</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.converter</artifactId>
<version>1.0.8</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
diff --git a/src/main/java/org/apache/sling/installer/core/impl/Activator.java b/src/main/java/org/apache/sling/installer/core/impl/Activator.java
index 99c9ec8..b0db93b 100644
--- a/src/main/java/org/apache/sling/installer/core/impl/Activator.java
+++ b/src/main/java/org/apache/sling/installer/core/impl/Activator.java
@@ -35,6 +35,7 @@ import org.apache.sling.installer.api.tasks.InstallTaskFactory;
import org.apache.sling.installer.api.tasks.ResourceTransformer;
import org.apache.sling.installer.api.tasks.RetryHandler;
import org.apache.sling.installer.core.impl.tasks.BundleTaskCreator;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
@@ -44,6 +45,7 @@ import org.osgi.framework.ServiceRegistration;
* The activator sets up the logging and registers the
* OSGi installer service.
*/
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
/** Vendor of all registered services. */