You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2018/01/17 13:58:32 UTC
[sling-org-apache-sling-jcr-oak-server] 02/02: SLING-7393 Use bnd
Maven plugins
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-jcr-oak-server.git
commit 55d108c4479b8487f4469f6560de3d0b9dab90e9
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Wed Jan 17 14:58:10 2018 +0100
SLING-7393 Use bnd Maven plugins
---
bnd.bnd | 29 +++++++++++++++++++++++++++++
pom.xml | 31 ++++++-------------------------
2 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..4069512
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,29 @@
+Bundle-Category: sling
+
+Bundle-Description: ${project.description}
+
+Bundle-DocURL: https://sling.apache.org
+
+Bundle-License: Apache License, Version 2.0
+
+Bundle-Vendor: The Apache Software Foundation
+
+Import-Package:\
+ com.mongodb; resolution:=optional,\
+ org.apache.felix.jaas.boot,\
+ org.apache.jackrabbit.oak,\
+ org.apache.jackrabbit.oak.security.user; resolution:=optional,\
+ org.apache.jackrabbit.oak.spi.security.authentication,\
+ org.apache.jackrabbit.test; resolution:=optional,\
+ *
+
+-baseline: *
+
+-includeresource:\
+ @oak-lucene-*.jar!/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.*
+
+-removeheaders:\
+ Embed-Dependency,\
+ Embed-Transitive,\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index e5dd3d0..eb2006b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
<artifactId>org.apache.sling.jcr.oak.server</artifactId>
<version>1.1.5-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling JCR Oak Repository Server</name>
<description>This bundle provides a SlingRepository based on Apache Jackrabbit Oak.</description>
@@ -50,30 +49,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- org.apache.jackrabbit.test;resolution:=optional,
- com.mongodb;resolution:=optional,
- org.apache.jackrabbit.oak,
- org.apache.jackrabbit.oak.security.user;resolution:=optional,
- org.apache.jackrabbit.oak.spi.security.authentication,
- org.apache.felix.jaas.boot,
- *
- </Import-Package>
- <Embed-Dependency>
- oak-lucene;inline="org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.*"
- </Embed-Dependency>
- <_removeheaders>
- Embed-Dependency,
- Private-Package,
- Include-Resource
- </_removeheaders>
- </instructions>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.