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-resource-presence.git

commit 8b703891b7a9daffe3ed93a50a829247df07c714
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Fri Feb 2 22:02:07 2018 +0100

    use Testing PaxExam 1.0.0
---
 pom.xml                                            |  6 ++---
 .../presence/ResourcePresenterTestSupport.java     | 24 ++++-------------
 src/test/resources/exam.properties                 | 19 --------------
 src/test/resources/logback.xml                     | 30 ----------------------
 4 files changed, 8 insertions(+), 71 deletions(-)

diff --git a/pom.xml b/pom.xml
index 60395b0..f38362f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,7 +38,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <sling.java.version>8</sling.java.version>
-    <org.ops4j.pax.exam.version>4.10.0</org.ops4j.pax.exam.version>
+    <org.ops4j.pax.exam.version>4.11.0</org.ops4j.pax.exam.version>
   </properties>
 
   <scm>
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>5.6.2</version>
+      <version>5.6.10</version>
       <scope>test</scope>
     </dependency>
     <!-- Apache Sling -->
@@ -103,7 +103,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.paxexam</artifactId>
-      <version>0.0.4</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <!-- jsr305 -->
diff --git 
a/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
 
b/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
index 52fca3c..e62645c 100644
--- 
a/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
+++ 
b/src/test/java/org/apache/sling/resource/presence/ResourcePresenterTestSupport.java
@@ -20,13 +20,11 @@ package org.apache.sling.resource.presence;
 
 import org.apache.sling.testing.paxexam.TestSupport;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.util.PathUtils;
 
-import static 
org.apache.sling.testing.paxexam.SlingOptions.slingLaunchpadOakTar;
+import static 
org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar;
 import static org.ops4j.pax.exam.CoreOptions.composite;
 import static org.ops4j.pax.exam.CoreOptions.junitBundles;
 import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static 
org.ops4j.pax.exam.cm.ConfigurationAdminOptions.factoryConfiguration;
 
 public abstract class ResourcePresenterTestSupport extends TestSupport {
@@ -36,7 +34,7 @@ public abstract class ResourcePresenterTestSupport extends 
TestSupport {
     protected Option baseConfiguration() {
         return composite(
             super.baseConfiguration(),
-            launchpad(),
+            slingQuickstart(),
             // Sling Resource Presenter
             testBundle("bundle.filename"),
             
factoryConfiguration("org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended")
@@ -44,26 +42,14 @@ public abstract class ResourcePresenterTestSupport extends 
TestSupport {
                 .asOption(),
             // testing
             
mavenBundle().groupId("org.apache.servicemix.bundles").artifactId("org.apache.servicemix.bundles.hamcrest").versionAsInProject(),
-            junitBundles(),
-            logging()
+            junitBundles()
         );
     }
 
-    protected Option launchpad() {
+    protected Option slingQuickstart() {
         final int httpPort = findFreePort();
         final String workingDirectory = workingDirectory();
-        return slingLaunchpadOakTar(workingDirectory, httpPort);
-    }
-
-    protected Option logging() {
-        final String filename = 
String.format("file:%s/src/test/resources/logback.xml", PathUtils.getBaseDir());
-        return composite(
-            systemProperty("logback.configurationFile").value(filename),
-            
mavenBundle().groupId("org.slf4j").artifactId("slf4j-api").version("1.7.21"),
-            
mavenBundle().groupId("org.slf4j").artifactId("jcl-over-slf4j").version("1.7.21"),
-            
mavenBundle().groupId("ch.qos.logback").artifactId("logback-core").version("1.1.7"),
-            
mavenBundle().groupId("ch.qos.logback").artifactId("logback-classic").version("1.1.7")
-        );
+        return slingQuickstartOakTar(workingDirectory, httpPort);
     }
 
 }
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>

-- 
To stop receiving notification emails like this one, please contact
o...@apache.org.

Reply via email to