You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by en...@apache.org on 2020/09/22 18:00:12 UTC
[sling-org-apache-sling-testing-serversetup] branch master updated:
SLING-9758 Update to Sling Bundle Parent 39
This is an automated email from the ASF dual-hosted git repository.
enorman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-serversetup.git
The following commit(s) were added to refs/heads/master by this push:
new 239c645 SLING-9758 Update to Sling Bundle Parent 39
239c645 is described below
commit 239c6455f54890454c7e200e674e183426fdbea3
Author: Eric Norman <en...@apache.org>
AuthorDate: Tue Sep 22 11:00:01 2020 -0700
SLING-9758 Update to Sling Bundle Parent 39
---
bnd.bnd | 10 ++++++++++
pom.xml | 35 ++++++++++-------------------------
2 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..a2205a3
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,10 @@
+Export-Package: org.apache.sling.testing.serversetup.*,\
+ org.apache.sling.testing.serversetup.jarexec,\
+ org.apache.sling.testing.serversetup.instance
+
+Import-Package: org.apache.commons.exec.*; resolution:=optional,\
+ *
+
+-removeheaders:\
+ Include-Resource,\
+ Private-Package
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index b4ee0f9..f774dd8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,14 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>30</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>39</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.testing.serversetup</artifactId>
<version>1.0.2-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Server Setup Tools</name>
<description>
@@ -45,26 +44,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Export-Package>
- org.apache.sling.testing.serversetup.*,
- org.apache.sling.testing.serversetup.jarexec,
- org.apache.sling.testing.serversetup.instance
- </Export-Package>
- <Import-Package>
- org.apache.commons.exec.*; resolution:=optional,
- *
- </Import-Package>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
@@ -72,12 +57,12 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.annotation.versioning</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- <scope>provided</scope>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>