You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2020/03/23 20:32:57 UTC
[sling-org-apache-sling-capabilities] 01/03: embed JSONWriter from
Felix Utils with bnd
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-capabilities.git
commit 12c0bb5506117de28b78cc500d7d1806c077d16b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 23 21:25:38 2020 +0100
embed JSONWriter from Felix Utils with bnd
---
bnd.bnd | 3 +++
pom.xml | 26 +-------------------------
2 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/bnd.bnd b/bnd.bnd
index 27f9589..8d32e82 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -2,6 +2,9 @@ Import-Package:\
org.apache.felix.utils.json;resolution:=optional,\
*
+-includeresource:\
+ @org.apache.felix.utils-*.jar!/org/apache/felix/utils/json/JSONWriter**
+
-removeheaders:\
Include-Resource,\
Private-Package
diff --git a/pom.xml b/pom.xml
index f53f426..d0c38a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,30 +57,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack-dependencies</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>unpack-dependencies</goal>
- </goals>
- <configuration>
- <!-- embed a single class from felix.utils, this was previously done
- using Embed-Dependency with maven-bundle-plugin, maybe there's
- a better way?
- -->
- <includeArtifactIds>org.apache.felix.utils</includeArtifactIds>
- <includes>**/JSONWriter.class</includes>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
@@ -132,7 +108,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.utils</artifactId>
- <version>1.9.0</version>
+ <version>1.11.4</version>
<scope>provided</scope>
</dependency>
<dependency>