You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by da...@apache.org on 2018/07/09 08:52:30 UTC
[sling-org-apache-sling-feature] branch master updated: Clean up
pom and embed felix utils dependency
This is an automated email from the ASF dual-hosted git repository.
davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature.git
The following commit(s) were added to refs/heads/master by this push:
new 1b0f210 Clean up pom and embed felix utils dependency
1b0f210 is described below
commit 1b0f2102354f1c1f257d71c2f4e6a1ed0c339c29
Author: David Bosschaert <bo...@adobe.com>
AuthorDate: Mon Jul 9 09:52:09 2018 +0100
Clean up pom and embed felix utils dependency
---
pom.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 555f71d..336ee78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,12 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <instructions>
+ <Conditional-Package>
+ org.apache.felix.utils.*,
+ </Conditional-Package>
+ </instructions>
+
<!-- Skip baselining for 0.x version -->
<skip>true</skip>
</configuration>
@@ -67,19 +73,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>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-json_1.0_spec</artifactId>
- <version>1.0-alpha-1</version>
+ <artifactId>geronimo-json_1.1_spec</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
<dependency>