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:11 UTC
[sling-org-apache-sling-capabilities] 02/02: SLING-9121 Update Pax
Exam to 4.13.2
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>