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/22 13:43:57 UTC
[sling-org-apache-sling-scripting-thymeleaf] 02/02: SLING-7422 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-scripting-thymeleaf.git
commit 6f9317968e5e55c22abebc599060fb66423a8f1a
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Jan 22 14:43:29 2018 +0100
SLING-7422 Use bnd Maven plugins
---
bnd.bnd | 31 +++++++++++++++++++++++++++++++
pom.xml | 32 ++++++--------------------------
2 files changed, 37 insertions(+), 26 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
new file mode 100644
index 0000000..4a41cbd
--- /dev/null
+++ b/bnd.bnd
@@ -0,0 +1,31 @@
+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
+
+Export-Package:\
+ org.apache.sling.scripting.thymeleaf,\
+ org.thymeleaf.*;version=${org.thymeleaf.version};-split-package:=merge-first
+
+Import-Package:\
+ com.fasterxml.jackson.*;version=${com.fasterxml.jackson.version};resolution:=optional,\
+ *
+
+ScriptEngine-Name: ${project.name}
+
+ScriptEngine-Version: ${project.version}
+
+-baseline: *
+
+-exportcontents: ${packages;VERSIONED}
+
+-removeheaders:\
+ Embed-Dependency,\
+ Embed-Transitive,\
+ Include-Resource,\
+ Private-Package
diff --git a/pom.xml b/pom.xml
index 4d64b09..9e33ac3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,6 @@
<artifactId>org.apache.sling.scripting.thymeleaf</artifactId>
<version>1.1.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Scripting Thymeleaf</name>
<description>Apache Sling Scripting Thymeleaf</description>
@@ -259,31 +258,12 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Import-Package>
- com.fasterxml.jackson.*;version=${com.fasterxml.jackson.version};resolution:=optional,
- *
- </Import-Package>
- <Export-Package>
- org.apache.sling.scripting.thymeleaf,
- org.thymeleaf.*;version=${org.thymeleaf.version};-split-package:=merge-first
- </Export-Package>
- <ScriptEngine-Name>${project.name}</ScriptEngine-Name>
- <ScriptEngine-Version>${project.version}</ScriptEngine-Version>
- <_removeheaders>
- Embed-Dependency,
- Private-Package,
- Include-Resource
- </_removeheaders>
- </instructions>
- <filters>
- <filter>!org.thymeleaf</filter>
- </filters>
- </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
olli@apache.org.