This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 47388d3 slingshot: switch to sling-bundle-parent 39
47388d3 is described below
commit 47388d327fd19b629448192a9692dd3ac01ddab5
Author: Robert Munteanu <[email protected]>
AuthorDate: Fri Aug 21 10:32:36 2020 +0200
slingshot: switch to sling-bundle-parent 39
---
slingshot/bnd.bnd | 3 +++
slingshot/pom.xml | 41 ++++++++++++-----------------------------
2 files changed, 15 insertions(+), 29 deletions(-)
diff --git a/slingshot/bnd.bnd b/slingshot/bnd.bnd
new file mode 100644
index 0000000..aa6c190
--- /dev/null
+++ b/slingshot/bnd.bnd
@@ -0,0 +1,3 @@
+Sling-Initial-Content: \
+
SLING-INF/content/slingshot;overwrite:=true;path:=/content/slingshot;maven:mount:=false,
\
+
SLING-INF/content/libs/slingshot;overwrite:=true;path:=/libs/slingshot;maven:mount:=true
diff --git a/slingshot/pom.xml b/slingshot/pom.xml
index 512fef5..bd9c1ab 100644
--- a/slingshot/pom.xml
+++ b/slingshot/pom.xml
@@ -22,14 +22,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>33</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>39</version>
<relativePath />
</parent>
<artifactId>org.apache.sling.sample.slingshot</artifactId>
<version>0.9.1-SNAPSHOT</version>
- <packaging>bundle</packaging>
<name>Apache Sling Sample Slingshot</name>
@@ -50,32 +49,12 @@
<plugins>
<!-- Bundling the sample project -->
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <!-- Configure extra execution of 'manifest' in
process-classes phase to make sure SCR metadata is generated before unit test
runs -->
- <execution>
- <id>scr-metadata</id>
- <goals>
- <goal>manifest</goal>
- </goals>
- <configuration>
-
<supportIncrementalBuild>true</supportIncrementalBuild>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <instructions>
- <!-- initial content to be loaded on bundle
installation -->
- <Sling-Initial-Content>
-
SLING-INF/content/slingshot;overwrite:=true;path:=/content/slingshot;maven:mount:=false,
-
SLING-INF/content/libs/slingshot;overwrite:=true;path:=/libs/slingshot;maven:mount:=true
- </Sling-Initial-Content>
- </instructions>
- <!-- Export SCR metadata to classpath to have them
available in unit tests -->
- <exportScr>true</exportScr>
- </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.sling</groupId>
@@ -177,6 +156,10 @@
<artifactId>org.osgi.annotation.versioning</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ </dependency>
<!-- Apache Sling -->
<dependency>
<groupId>org.apache.sling</groupId>
