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/17 20:21:43 UTC
[sling-org-apache-sling-installer-provider-file] branch master
updated: SLING-8963 update to parent 36
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-provider-file.git
The following commit(s) were added to refs/heads/master by this push:
new 938685c SLING-8963 update to parent 36
938685c is described below
commit 938685c6aee750ad48a3ed94bd5d30dc3b787717
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jan 17 21:21:33 2020 +0100
SLING-8963 update to parent 36
---
bnd.bnd | 0
pom.xml | 41 +++++++++-------------
.../installer/provider/file/impl/Activator.java | 3 ++
3 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..e69de29
diff --git a/pom.xml b/pom.xml
index 610f61e..7adffaf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,51 +22,42 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>36</version>
<relativePath/>
</parent>
<artifactId>org.apache.sling.installer.provider.file</artifactId>
<version>1.1.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling File Installer</name>
<description>
Installs OSGi bundles and configurations from the file system.
</description>
+ <properties>
+ <sling.java.version>8</sling.java.version>
+ <project.build.outputTimestamp>2020-01-14T08:04:00Z</project.build.outputTimestamp>
+ </properties>
+
<scm>
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-provider-file.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-installer-provider-file.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-installer-provider-file.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.provider.file.impl.Activator
- </Bundle-Activator>
- <Private-Package>
- org.apache.sling.installer.provider.file.impl.*
- </Private-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
+ <!-- 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>osgi.core</artifactId>
+ <artifactId>org.osgi.framework</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/src/main/java/org/apache/sling/installer/provider/file/impl/Activator.java b/src/main/java/org/apache/sling/installer/provider/file/impl/Activator.java
index 2b06592..afeeb85 100644
--- a/src/main/java/org/apache/sling/installer/provider/file/impl/Activator.java
+++ b/src/main/java/org/apache/sling/installer/provider/file/impl/Activator.java
@@ -22,12 +22,15 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
+import org.osgi.annotation.bundle.Header;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
+import org.osgi.framework.Constants;
/**
* The <code>Activator</code>
*/
+@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class Activator implements BundleActivator {
public static final String KEY_DIR = "sling.fileinstall.dir";