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:56 UTC
[sling-org-apache-sling-capabilities] branch master updated
(01667d8 -> b4461ac)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-capabilities.git.
from 01667d8 SLING-9121 Update Pax Exam to 4.13.2
new 12c0bb5 embed JSONWriter from Felix Utils with bnd
new 11e9ce1 SLING-9234 Update to Sling Bundle Parent 38
new b4461ac SLING-9235 Update Pax Exam to 4.13.3
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bnd.bnd | 3 +++
pom.xml | 53 +++++++++++++++++++++++++----------------------------
2 files changed, 28 insertions(+), 28 deletions(-)
[sling-org-apache-sling-capabilities] 03/03: SLING-9235 Update Pax
Exam to 4.13.3
Posted by ol...@apache.org.
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 b4461ac6119628aa3ea36bd101904ba830e3c4e4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 23 21:32:32 2020 +0100
SLING-9235 Update Pax Exam to 4.13.3
* Update Pax Exam
* Update Testing PaxExam
* Use proper OSGi dependecies
---
pom.xml | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9c48143..cf2b374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<!-- This module can work with older versions of Sling
as well, so be conservative here -->
<sling.java.version>8</sling.java.version>
- <org.ops4j.pax.exam.version>4.13.2</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.3</org.ops4j.pax.exam.version>
</properties>
<scm>
@@ -86,11 +86,32 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.event</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.log</artifactId>
+ <version>1.4.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
<scope>provided</scope>
</dependency>
@@ -150,7 +171,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.paxexam</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
[sling-org-apache-sling-capabilities] 01/03: embed JSONWriter from
Felix Utils with bnd
Posted by ol...@apache.org.
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>
[sling-org-apache-sling-capabilities] 02/03: SLING-9234 Update to
Sling Bundle Parent 38
Posted by ol...@apache.org.
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 11e9ce153b157aa28f6e0c7311e75680b694622f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Mar 23 21:29:19 2020 +0100
SLING-9234 Update to Sling Bundle Parent 38
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d0c38a8..9c48143 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>35</version>
+ <version>38</version>
<relativePath />
</parent>