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/28 09:06:33 UTC
[sling-org-apache-sling-rewriter] branch master updated (1cc0036 ->
022306b)
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-rewriter.git.
from 1cc0036 SLING-9127 Update Pax Exam to 4.13.2
new 9a43231 SLING-9283 Update to Sling Bundle Parent 38
new 022306b SLING-9284 Update Pax Exam to 4.13.3
The 2 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:
pom.xml | 40 ++++++++++++++++++++++++++++++++++------
1 file changed, 34 insertions(+), 6 deletions(-)
[sling-org-apache-sling-rewriter] 02/02: SLING-9284 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-rewriter.git
commit 022306b96c2f6108c99d900a6a216f8c27f59619
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 28 10:05:41 2020 +0100
SLING-9284 Update Pax Exam to 4.13.3
* Update Pax Exam
* Update Testing PaxExam
* Use proper OSGi dependencies
---
pom.xml | 35 +++++++++++++++++++++++++++++++----
1 file changed, 31 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index bcf3c69..8213caa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
</scm>
<properties>
- <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>
<build>
@@ -143,7 +143,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>
@@ -159,14 +159,41 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>osgi.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
+ <scope>test</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.service.http</artifactId>
+ <version>1.2.1</version>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
[sling-org-apache-sling-rewriter] 01/02: SLING-9283 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-rewriter.git
commit 9a43231b36f150ad0e913268a23b26a5726896b1
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 28 10:03:43 2020 +0100
SLING-9283 Update to Sling Bundle Parent 38
---
pom.xml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index aae870a..bcf3c69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling-bundle-parent</artifactId>
- <version>35</version>
+ <version>38</version>
<relativePath />
</parent>
@@ -249,4 +249,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>