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/18 12:58:35 UTC
[sling-whiteboard] branch master updated: [feature-diff][r2f]
fixing OSGi headers
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
The following commit(s) were added to refs/heads/master by this push:
new 09c16aa [feature-diff][r2f] fixing OSGi headers
09c16aa is described below
commit 09c16aad21bb4e4e96cb8fa391c2595b43fb7044
Author: Simo Tripodi <st...@adobe.com>
AuthorDate: Tue Jun 18 14:58:27 2019 +0200
[feature-diff][r2f] fixing OSGi headers
---
feature-diff/pom.xml | 30 +++++++++++++++++++++++++++++-
runtime2feature/pom.xml | 4 ++--
2 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/feature-diff/pom.xml b/feature-diff/pom.xml
index 365744d..e89ae4b 100644
--- a/feature-diff/pom.xml
+++ b/feature-diff/pom.xml
@@ -37,6 +37,7 @@
<properties>
<sling.java.version>8</sling.java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <jackson.version>2.9.8</jackson.version>
</properties>
<dependencies>
@@ -67,7 +68,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4</version>
<scope>provided</scope>
</dependency>
@@ -75,6 +76,18 @@
| JSON patch
-->
<dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.flipkart.zjsonpatch</groupId>
<artifactId>zjsonpatch</artifactId>
<version>0.4.8</version>
@@ -97,6 +110,21 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>org.apache.sling.feature.diff*;version=${project.version}</Export-Package>
+ <Import-Package>
+ org.apache.commons.collections4*,
+ org.apache.commons.io*
+ </Import-Package>
+ <Embed-Dependency>
+ jackson-core;inline=true,
+ jackson-databind;inline=true,
+ zjsonpatch;inline=true
+ </Embed-Dependency>
+ <Embed-Transitive>false</Embed-Transitive>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
diff --git a/runtime2feature/pom.xml b/runtime2feature/pom.xml
index d0046be..33c8b90 100644
--- a/runtime2feature/pom.xml
+++ b/runtime2feature/pom.xml
@@ -60,13 +60,13 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.io</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>