This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/master by this push:
new dcfd6da Updating to use the bnd plugin for the archetype
dcfd6da is described below
commit dcfd6da2367099c37cff94a8a4e4f0736932cddf
Author: Dan Klco <[email protected]>
AuthorDate: Sat Feb 1 13:15:47 2020 -0500
Updating to use the bnd plugin for the archetype
---
.../src/main/resources/archetype-resources/pom.xml | 77 ++++++++++++++++++++--
1 file changed, 73 insertions(+), 4 deletions(-)
diff --git a/archetype/src/main/resources/archetype-resources/pom.xml
b/archetype/src/main/resources/archetype-resources/pom.xml
index e42de37..6dc3dc3 100644
--- a/archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/pom.xml
@@ -5,10 +5,10 @@ writing, software distributed under the License is
distributed on an "AS IS" BAS
License. -->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<groupId>${groupId}</groupId>
<artifactId>${artifactId}</artifactId>
<version>${version}</version>
- <packaging>bundle</packaging>
<name>${appName}</name>
<description>${appName} Sling CMS Project</description>
@@ -29,6 +29,17 @@ License. -->
</properties>
<build>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling-maven-plugin</artifactId>
+ <version>2.4.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<!-- Handle the NodeJS Build -->
@@ -66,14 +77,46 @@ License. -->
</plugin>
<plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-maven-plugin</artifactId>
+ <version>5.0.0</version>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <goals>
+ <goal>bnd-process</goal>
+ </goals>
+ <configuration>
+ <bnd>
+ <![CDATA[
+# see https://issues.apache.org/jira/browse/SLING-8980
+-snapshot: SNAPSHOT
+ ]]>
+ </bnd>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <archive>
+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
</plugin>
</plugins>
</build>
<dependencies>
-
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.jcr</groupId>
<artifactId>jcr</artifactId>
@@ -214,4 +257,30 @@ License. -->
</dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <!-- Use this profile to install the OSGi bundle automatically, during
development -->
+ <id>autoInstallBundle</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>sling-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-bundle</id>
+ <goals>
+ <goal>install</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
