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/08 14:53:03 UTC
[sling-org-apache-sling-feature-io] branch master updated:
SLING-8971 update to parent 35
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-feature-io.git
The following commit(s) were added to refs/heads/master by this push:
new f7d16f5 SLING-8971 update to parent 35
f7d16f5 is described below
commit f7d16f5e3363add2fe45d747eecd754cff598153
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed Jan 8 15:52:52 2020 +0100
SLING-8971 update to parent 35
---
bnd.bnd | 5 +++++
pom.xml | 33 ++++++++++-----------------------
2 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..b514d8b
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,5 @@
+-conditionalpackage: org.apache.felix.configurator.impl.json,\\
+ org.apache.felix.configurator.impl.model,\\
+ org.apache.felix.utils.collections,\\
+ org.apache.felix.utils.resource,\\
+ org.apache.felix.utils.version
diff --git a/pom.xml b/pom.xml
index 4c0453e..75efa17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,14 +16,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath/>
</parent>
<artifactId>org.apache.sling.feature.io</artifactId>
- <version>1.1.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
+ <version>1.2.0-SNAPSHOT</version>
<name>Apache Sling Feature IO Module</name>
<description>
@@ -44,22 +43,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Conditional-Package>
- org.apache.felix.configurator.impl.json,
- org.apache.felix.configurator.impl.model,
- org.apache.felix.utils.collections,
- org.apache.felix.utils.resource,
- org.apache.felix.utils.version
- </Conditional-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
@@ -153,13 +136,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
- <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
+ <artifactId>org.osgi.framework</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.resource</artifactId>
+ <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>