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 12:18:09 UTC
[sling-org-apache-sling-capabilities] branch master updated
(fee4525 -> 01667d8)
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 fee4525 SLING-8507 Make testing compliant with Java 9 and higher
new b234900 style
new 01667d8 SLING-9121 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 | 2 +-
.../capabilities/it/CapabilitiesTestSupport.java | 8 +++---
src/test/resources/exam.properties | 19 --------------
src/test/resources/logback.xml | 30 ----------------------
4 files changed, 5 insertions(+), 54 deletions(-)
delete mode 100644 src/test/resources/exam.properties
delete mode 100644 src/test/resources/logback.xml
[sling-org-apache-sling-capabilities] 01/02: style
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 b234900bda44262fdbaa013a5d564934ca96934f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Feb 23 00:38:45 2020 +0100
style
---
.../org/apache/sling/capabilities/it/CapabilitiesTestSupport.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java b/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java
index 6d68e89..3680604 100644
--- a/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java
+++ b/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java
@@ -27,6 +27,7 @@ import static org.apache.sling.testing.paxexam.SlingOptions.logback;
import static org.apache.sling.testing.paxexam.SlingOptions.scr;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.options;
public abstract class CapabilitiesTestSupport extends TestSupport {
@@ -36,7 +37,7 @@ public abstract class CapabilitiesTestSupport extends TestSupport {
// compatible with older Sling versions.
SlingOptions.versionResolver.setVersion("slf4j", "slf4j-api", "1.7.6");
- return new Option[]{
+ return options(
baseConfiguration(),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version("1.1.2"),
@@ -49,6 +50,6 @@ public abstract class CapabilitiesTestSupport extends TestSupport {
// Test stuff
junitBundles(),
logback()
- };
+ );
}
}
[sling-org-apache-sling-capabilities] 02/02: SLING-9121 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-capabilities.git
commit 01667d836dab3b0617ac16d075e8f4fc45cf0885
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Mar 14 13:17:42 2020 +0100
SLING-9121 Update Pax Exam to 4.13.2
---
pom.xml | 2 +-
.../capabilities/it/CapabilitiesTestSupport.java | 3 +--
src/test/resources/exam.properties | 19 --------------
src/test/resources/logback.xml | 30 ----------------------
4 files changed, 2 insertions(+), 52 deletions(-)
diff --git a/pom.xml b/pom.xml
index c7a13ec..f53f426 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.1</org.ops4j.pax.exam.version>
+ <org.ops4j.pax.exam.version>4.13.2</org.ops4j.pax.exam.version>
</properties>
<scm>
diff --git a/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java b/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java
index 3680604..d0c69b4 100644
--- a/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java
+++ b/src/test/java/org/apache/sling/capabilities/it/CapabilitiesTestSupport.java
@@ -48,8 +48,7 @@ public abstract class CapabilitiesTestSupport extends TestSupport {
testBundle("bundle.filename"),
// Test stuff
- junitBundles(),
- logback()
+ junitBundles()
);
}
}
diff --git a/src/test/resources/exam.properties b/src/test/resources/exam.properties
deleted file mode 100644
index c98a668..0000000
--- a/src/test/resources/exam.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-pax.exam.logging=none
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml
deleted file mode 100644
index d46a4ae..0000000
--- a/src/test/resources/logback.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<configuration>
- <appender name="file" class="ch.qos.logback.core.FileAppender">
- <file>target/testing.log</file>
- <encoder>
- <pattern>%date %level [%thread] %logger{10} [%file : %line] %msg%n</pattern>
- </encoder>
- </appender>
- <root level="debug">
- <appender-ref ref="file"/>
- </root>
-</configuration>