You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by si...@apache.org on 2019/06/26 12:04:07 UTC
[sling-whiteboard] 02/02: @releng updated parent to latest
sling-bundle-parent
This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
commit 64f179e520124f709d827eaaffae7bc97485ce66
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Wed Jun 26 14:03:47 2019 +0200
@releng updated parent to latest sling-bundle-parent
---
feature-diff/pom.xml | 2 +-
runtime2feature/pom.xml | 25 ++++---------------------
2 files changed, 5 insertions(+), 22 deletions(-)
diff --git a/feature-diff/pom.xml b/feature-diff/pom.xml
index 256dc56..8ea030d 100644
--- a/feature-diff/pom.xml
+++ b/feature-diff/pom.xml
@@ -36,7 +36,7 @@
<properties>
<sling.java.version>8</sling.java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jackson.version>2.9.8</jackson.version>
+ <bnd.baseline.skip>true</bnd.baseline.skip>
</properties>
<dependencies>
diff --git a/runtime2feature/pom.xml b/runtime2feature/pom.xml
index 8b344df..d1ece0f 100644
--- a/runtime2feature/pom.xml
+++ b/runtime2feature/pom.xml
@@ -22,8 +22,8 @@
<parent>
<groupId>org.apache.sling</groupId>
- <artifactId>sling</artifactId>
- <version>34</version>
+ <artifactId>sling-bundle-parent</artifactId>
+ <version>35</version>
<relativePath />
</parent>
@@ -36,6 +36,7 @@
<properties>
<sling.java.version>8</sling.java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <bnd.baseline.skip>true</bnd.baseline.skip>
</properties>
<dependencies>
@@ -63,6 +64,7 @@
<artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
+
<!--
| Apache Sling Feature APIs
-->
@@ -94,23 +96,4 @@
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bnd-maven-plugin</artifactId>
- <version>4.1.0</version>
- </plugin>
- </plugins>
- </build>
-
</project>