This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker-it.git
The following commit(s) were added to refs/heads/master by this push:
new e9e5676 SLING-9776 - Add a BND plugin to the
scriptingbundle-maven-plugin
e9e5676 is described below
commit e9e567633eb536b7212aeeaf0e81e54a6f683a54
Author: Radu Cotescu <[email protected]>
AuthorDate: Thu Apr 8 20:02:32 2021 +0200
SLING-9776 - Add a BND plugin to the scriptingbundle-maven-plugin
* switched configuration to use the bdn functionality of the plugin
---
.../bnd.bnd | 3 ++
.../pom.xml | 44 +++++++---------------
2 files changed, 17 insertions(+), 30 deletions(-)
diff --git
a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/bnd.bnd
b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/bnd.bnd
new file mode 100644
index 0000000..f8c173f
--- /dev/null
+++
b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/bnd.bnd
@@ -0,0 +1,3 @@
+-plugin:
org.apache.sling.scriptingbundle.plugin.bnd.BundledScriptsScannerPlugin
+Require-Capability:
osgi.extender;filter:="(&(osgi.extender=sling.scripting)(version>=1.0.0)(!(version>=2.0.0)))"
+Sling-Initial-Content:
SLING-INF/content;overwrite:=true;path:=/content/bundled-scripts/examplebundle-precompiled-extend1
diff --git
a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/pom.xml
b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/pom.xml
index 3c2290d..0425e58 100644
---
a/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/pom.xml
+++
b/examples/org-apache-sling-scripting-examplebundle-precompiled-extend1/pom.xml
@@ -23,15 +23,14 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>41</version>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.sling.scripting.examplebundle.precompiled.extend1</artifactId>
<version>0.1.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<build>
<plugins>
@@ -43,36 +42,21 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.sling</groupId>
- <artifactId>scriptingbundle-maven-plugin</artifactId>
- <version>0.2.3-SNAPSHOT</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <goals>
- <goal>metadata</goal>
- </goals>
- </execution>
- </executions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>scriptingbundle-maven-plugin</artifactId>
+ <version>0.2.3-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-baseline-maven-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>!*</Export-Package>
- <Provide-Capability>
-
${org.apache.sling.scriptingbundle.maven.plugin.Provide-Capability}
- </Provide-Capability>
- <Require-Capability>
-
osgi.extender;filter:="(&(osgi.extender=sling.scripting)(version>=1.0.0)(!(version>=2.0.0)))",
-
${org.apache.sling.scriptingbundle.maven.plugin.Require-Capability}
- </Require-Capability>
- <Sling-Initial-Content>
-
SLING-INF/content;overwrite:=true;path:=/content/bundled-scripts/examplebundle-precompiled-extend1
- </Sling-Initial-Content>
- </instructions>
+ <skip>true</skip>
</configuration>
</plugin>
<plugin>
