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 2018/11/30 11:03:02 UTC
[sling-ide-tooling] branch master updated: SLING-5648 only set
common bundle headers once in parent
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-ide-tooling.git
The following commit(s) were added to refs/heads/master by this push:
new 9a582c5 SLING-5648 only set common bundle headers once in parent
9a582c5 is described below
commit 9a582c50903d9fe6c55c7699ef298eaac9edc44c
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Nov 30 12:02:55 2018 +0100
SLING-5648 only set common bundle headers once in parent
---
shared/modules/api/bnd.bnd | 3 ---
shared/modules/artifacts/bnd.bnd | 6 +-----
shared/modules/impl-resource/bnd.bnd | 2 --
shared/modules/impl-vlt/bnd.bnd | 4 +---
shared/modules/parent/pom.xml | 38 ++++++++++++++++++++++++++++++++++++
shared/modules/sync-fs/bnd.bnd | 1 -
6 files changed, 40 insertions(+), 14 deletions(-)
diff --git a/shared/modules/api/bnd.bnd b/shared/modules/api/bnd.bnd
index 560e80b..41da898 100644
--- a/shared/modules/api/bnd.bnd
+++ b/shared/modules/api/bnd.bnd
@@ -1,5 +1,2 @@
-Bundle-ActivationPolicy: lazy
-
--exportcontents: ${packages;VERSIONED}
Import-Package: org.apache.commons.io;version="[1.4,3)", \
*
\ No newline at end of file
diff --git a/shared/modules/artifacts/bnd.bnd b/shared/modules/artifacts/bnd.bnd
index a2bd473..09df554 100644
--- a/shared/modules/artifacts/bnd.bnd
+++ b/shared/modules/artifacts/bnd.bnd
@@ -1,5 +1 @@
-Bundle-ActivationPolicy: lazy
-
--exportcontents: ${packages;VERSIONED}
-
--includeresource: org.apache.sling.tooling.support*.jar
\ No newline at end of file
+-includeresource: org.apache.sling.tooling.support*.jar
diff --git a/shared/modules/impl-resource/bnd.bnd b/shared/modules/impl-resource/bnd.bnd
index bd7875f..e69de29 100644
--- a/shared/modules/impl-resource/bnd.bnd
+++ b/shared/modules/impl-resource/bnd.bnd
@@ -1,2 +0,0 @@
-Bundle-ActivationPolicy: lazy
--exportcontents: ${packages;VERSIONED}
diff --git a/shared/modules/impl-vlt/bnd.bnd b/shared/modules/impl-vlt/bnd.bnd
index 398eae2..c6f4421 100644
--- a/shared/modules/impl-vlt/bnd.bnd
+++ b/shared/modules/impl-vlt/bnd.bnd
@@ -1,5 +1,3 @@
-Bundle-ActivationPolicy: lazy
--exportcontents: ${packages;VERSIONED}
-includeresource: plugin.xml, .options
Bundle-SymbolicName: org.apache.sling.ide.impl-vlt;singleton:=true
-SlingIDE-PluginLoggerEnabled: true
\ No newline at end of file
+SlingIDE-PluginLoggerEnabled: true
diff --git a/shared/modules/parent/pom.xml b/shared/modules/parent/pom.xml
index c1821a0..02c84ac 100644
--- a/shared/modules/parent/pom.xml
+++ b/shared/modules/parent/pom.xml
@@ -53,6 +53,44 @@
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</plugin>
+ <plugin>
+ <!-- TODO: consolidate once sling-parent 35 is released, because most properties are set correctly there -->
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>4.1.0</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <!-- default OSGi headers (mainly for usage within Eclipse) -->
+ <bnd><![CDATA[
+Bundle-Category: sling
+
+Bundle-Description: "${project.description}"
+
+Bundle-DocURL: https://sling.apache.org/documentation/development/ide-tooling.html
+
+Bundle-License: Apache License, Version 2.0
+
+Bundle-Vendor: The Apache Software Foundation
+
+Bundle-SCM: url=${project.scm.url},connection=${project.scm.connection},developer-connection=${project.scm.developerConnection},tag=${project.scm.tag}
+
+# export all versioned packages by default
+-exportcontents: ${packages;VERSIONED}
+
+# overwrite timestamp format used as qualifier for snapshots to make the resolution higher (i.e. make them differ for each build),
+# compare with https://www.mail-archive.com/dev@sling.apache.org/msg76177.html
+-snapshot: ${tstamp;yyyyMMddHHmmssSSS}
+
+Bundle-ActivationPolicy: lazy
+ ]]></bnd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/shared/modules/sync-fs/bnd.bnd b/shared/modules/sync-fs/bnd.bnd
index 1e09af3..e69de29 100644
--- a/shared/modules/sync-fs/bnd.bnd
+++ b/shared/modules/sync-fs/bnd.bnd
@@ -1 +0,0 @@
--exportcontents: ${packages;VERSIONED}
\ No newline at end of file