commit c32714845a032d6ee73501836f0193e406147389
author Andrei Dulvac <dulvac@apache.org> Wed Jun 15 15:00:53 2016 +0000
committer Andrei Dulvac <dulvac@apache.org> Wed Jun 15 15:00:53 2016 +0000
tree 1b4632a7a0072f2d964f6d7ae46902b68305581f
parent 0a457c572138e72dbf2752b49f252e4eeb959446

SLING-5727 Remove o.a.s.testing.tools dependency in o.a.s.testing.serversetup and adapt http code



git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1748593 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index d7596a4..7f99b59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,10 +73,15 @@
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.testing.clients</artifactId>
             <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.testing.serversetup</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.sling</groupId>
-                    <artifactId>org.apache.sling.testing.tools</artifactId>
+                    <artifactId>org.apache.sling.testing.clients</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -111,10 +116,5 @@
             <version>4.12</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.testing.tools</artifactId>
-            <version>1.0.12</version>
-        </dependency>
     </dependencies>
 </project>

src/main/java/org/apache/sling/testing/junit/rules/SlingInstanceRule.java

diff --git a/src/main/java/org/apache/sling/testing/junit/rules/SlingInstanceRule.java b/src/main/java/org/apache/sling/testing/junit/rules/SlingInstanceRule.java
index 0e8439f..80d33a4 100644
--- a/src/main/java/org/apache/sling/testing/junit/rules/SlingInstanceRule.java
+++ b/src/main/java/org/apache/sling/testing/junit/rules/SlingInstanceRule.java
@@ -22,7 +22,7 @@
 import org.apache.sling.testing.clients.instance.InstanceConfiguration;
 import org.apache.sling.testing.junit.rules.instance.ExistingInstance;
 import org.apache.sling.testing.junit.rules.instance.Instance;
-import org.apache.sling.testing.tools.sling.SlingTestBase;
+import org.apache.sling.testing.serversetup.instance.SlingTestBase;
 import org.junit.rules.RuleChain;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
@@ -36,6 +36,7 @@
  * Junit Rule that allows access to a Sling instance.
  * It is wrapped by a {@link SlingClassRule}
  */
+@SuppressWarnings("ALL")
 public class SlingInstanceRule implements TestRule {
 
     // Until we extract this logic from SlingTestBase, we can just reuse it here
@@ -53,8 +54,7 @@
     /** ExistingInstance for default instance */
     public final Instance defaultInstance = new ExistingInstance().withRunMode("default").orDefault(DEFAULT_INSTANCE);
 
-    protected TestRule ruleChain = RuleChain.outerRule(slingClassRule)
-            .around(defaultInstance);
+    protected TestRule ruleChain = RuleChain.outerRule(slingClassRule).around(defaultInstance);
 
 
     public <T extends SlingClient> T getAdminClient(Class<T> clientClass) {