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/14 09:12:26 UTC
[sling-org-apache-sling-commons-classloader] branch master updated
(dedb69a -> 320567f)
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-commons-classloader.git.
from dedb69a SLING-8522 Make testing compliant with Java 9 and higher
new c053307 SLING-9204 Update to Sling Bundle Parent 38
new 320567f SLING-9101 Update Pax Exam to 4.13.2
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 | 18 ++++++++++--------
.../commons/classloader/it/ClassloaderTestSupport.java | 2 ++
2 files changed, 12 insertions(+), 8 deletions(-)
[sling-org-apache-sling-commons-classloader] 01/02: SLING-9204
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-commons-classloader.git
commit c05330785cde2eab7fa990e0239475c80fac726b
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 14 10:05:29 2020 +0100
SLING-9204 Update to Sling Bundle Parent 38
---
pom.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2691521..21662c7 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>
@@ -39,8 +39,8 @@
<connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-classloader.git</connection>
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-classloader.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=sling-org-apache-sling-commons-classloader.git</url>
- <tag>HEAD</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<properties>
<org.ops4j.pax.exam.version>4.13.1</org.ops4j.pax.exam.version>
@@ -203,4 +203,5 @@
<scope>test</scope>
</dependency>
</dependencies>
+
</project>
[sling-org-apache-sling-commons-classloader] 02/02: SLING-9101
Update Pax Exam to 4.13.2
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-commons-classloader.git
commit 320567f0897a5381f435fc487ba0ec8cc0503e60
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 14 10:10:42 2020 +0100
SLING-9101 Update Pax Exam to 4.13.2
* Update Pax Exam
* Update and align test dependencies
---
pom.xml | 9 +++++----
.../sling/commons/classloader/it/ClassloaderTestSupport.java | 2 ++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21662c7..0ffe41a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
</scm>
<properties>
- <org.ops4j.pax.exam.version>4.13.1</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.2</org.ops4j.pax.exam.version>
</properties>
<build>
@@ -67,6 +67,7 @@
</execution>
</executions>
<configuration>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
<systemProperties>
<property>
<name>bundle.filename</name>
@@ -105,7 +106,7 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.cmpn</artifactId>
+ <artifactId>org.osgi.service.cm</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -134,7 +135,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>
<!-- logging -->
@@ -187,7 +188,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-aether</artifactId>
- <version>2.6.1</version>
+ <version>2.6.2</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/test/java/org/apache/sling/commons/classloader/it/ClassloaderTestSupport.java b/src/test/java/org/apache/sling/commons/classloader/it/ClassloaderTestSupport.java
index 9023d33..546a202 100644
--- a/src/test/java/org/apache/sling/commons/classloader/it/ClassloaderTestSupport.java
+++ b/src/test/java/org/apache/sling/commons/classloader/it/ClassloaderTestSupport.java
@@ -21,6 +21,7 @@ import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import static org.apache.sling.testing.paxexam.SlingOptions.config;
+import static org.apache.sling.testing.paxexam.SlingOptions.eventadmin;
import static org.apache.sling.testing.paxexam.SlingOptions.paxUrl;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -35,6 +36,7 @@ public abstract class ClassloaderTestSupport extends TestSupport {
// Sling Commons Classloader
testBundle("bundle.filename"),
config(),
+ eventadmin(),
// testing
paxUrl(),
mavenBundle().groupId("org.ops4j.pax.url").artifactId("pax-url-aether").versionAsInProject(),