SLING-2965 - refactor to allow for multiple server-side tests

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1503306 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 9ec3d69..bc7daac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,9 @@
                         	/sling-test/sling/from-bundle;path:=/SLING-INF/res/sling-test/sling/from-bundle,
                         	/system;path:=/SLING-INF/res/sling-test/sling/SLING-1733
                         </Sling-Bundle-Resources>
+                        <Sling-Test-Regexp>
+                            org.apache.sling.launchpad.testservices.serversidetests.*Test
+                        </Sling-Test-Regexp>
                     </instructions>
                 </configuration>
             </plugin>
@@ -123,7 +126,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
-            <version>2.1.0</version>
+            <version>2.4.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -142,6 +145,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.junit.core</artifactId>
+            <version>1.0.8</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>adapter-annotations</artifactId>
             <version>1.0.0</version>
         </dependency>