incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1560941 - in /sling/trunk/testing/sling-pax-util: pom.xml src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
Date Fri, 24 Jan 2014 11:03:21 GMT
Author: bdelacretaz
Date: Fri Jan 24 11:03:20 2014
New Revision: 1560941

URL: http://svn.apache.org/r1560941
Log:
SLING-2788 - prepare for release

Modified:
    sling/trunk/testing/sling-pax-util/pom.xml
    sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
    sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java

Modified: sling/trunk/testing/sling-pax-util/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/pom.xml?rev=1560941&r1=1560940&r2=1560941&view=diff
==============================================================================
--- sling/trunk/testing/sling-pax-util/pom.xml (original)
+++ sling/trunk/testing/sling-pax-util/pom.xml Fri Jan 24 11:03:20 2014
@@ -38,6 +38,21 @@
     <build>
         <plugins>
             <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <configuration>
+                    <filesets>
+                        <fileset>
+                            <directory>${basedir}</directory>
+                            <includes>
+                                <include>derby.log</include>
+                                <include>jackrabbit/**</include>
+                                <include>coverage.ec</include>
+                            </includes>
+                        </fileset>
+                    </filesets>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
@@ -95,7 +110,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>maven-launchpad-plugin</artifactId>
-            <version>2.2.1-SNAPSHOT</version>
+            <version>2.2.0</version>
             <type>maven-plugin</type>
         </dependency>
         <dependency>

Modified: sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java?rev=1560941&r1=1560940&r2=1560941&view=diff
==============================================================================
--- sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
(original)
+++ sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingRepositoryTest.java
Fri Jan 24 11:03:20 2014
@@ -48,7 +48,7 @@ public class SlingRepositoryTest {
     
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {
-        return SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
+        return SlingPaxOptions.defaultLaunchpadOptions("6").getOptions();
     }
 
     @Test
@@ -69,4 +69,4 @@ public class SlingRepositoryTest {
         assertNotNull(s);
         s.logout();
     }
- }
\ No newline at end of file
+ }

Modified: sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java?rev=1560941&r1=1560940&r2=1560941&view=diff
==============================================================================
--- sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
(original)
+++ sling/trunk/testing/sling-pax-util/src/test/java/org/apache/sling/paxexam/util/SlingSetupTest.java
Fri Jan 24 11:03:20 2014
@@ -45,7 +45,7 @@ public class SlingSetupTest {
     
     @org.ops4j.pax.exam.Configuration
     public Option[] config() {
-        return SlingPaxOptions.defaultLaunchpadOptions("7-SNAPSHOT").getOptions();
+        return SlingPaxOptions.defaultLaunchpadOptions("6").getOptions();
     }
 
     private void assertBundleActive(String symbolicName) {
@@ -98,47 +98,32 @@ public class SlingSetupTest {
                 "org.apache.sling.commons.classloader",
                 "org.apache.sling.commons.json",
                 "org.apache.sling.commons.log",
-                "org.apache.sling.commons.logservice",
                 "org.apache.sling.commons.mime",
                 "org.apache.sling.commons.osgi",
                 "org.apache.sling.commons.scheduler",
                 "org.apache.sling.commons.threads",
-                "org.apache.sling.discovery.api",
-                "org.apache.sling.discovery.impl",
-                "org.apache.sling.discovery.support",
                 "org.apache.sling.engine",
                 "org.apache.sling.event",
                 "org.apache.sling.extensions.explorer",
-                "org.apache.sling.extensions.groovy",
                 "org.apache.sling.extensions.threaddump",
                 "org.apache.sling.extensions.webconsolebranding",
                 "org.apache.sling.extensions.webconsolesecurityprovider",
-                "org.apache.sling.fragment.transaction",
-                "org.apache.sling.fragment.ws",
-                "org.apache.sling.fragment.xml",
                 "org.apache.sling.fsresource",
-                "org.apache.sling.installer.console",
                 "org.apache.sling.installer.core",
-                "org.apache.sling.installer.factory.configuration",
                 "org.apache.sling.installer.provider.file",
                 "org.apache.sling.installer.provider.jcr",
-                "org.apache.sling.jcr.jcr-wrapper",
                 "org.apache.sling.jcr.api",
                 "org.apache.sling.jcr.base",
                 "org.apache.sling.jcr.classloader",
                 "org.apache.sling.jcr.contentloader",
-                "org.apache.sling.jcr.davex",
                 "org.apache.sling.jcr.jackrabbit.accessmanager",
                 "org.apache.sling.jcr.jackrabbit.server",
                 "org.apache.sling.jcr.jackrabbit.usermanager",
                 "org.apache.sling.jcr.ocm",
-                "org.apache.sling.jcr.registration",
                 "org.apache.sling.jcr.resource",
                 "org.apache.sling.jcr.webconsole",
-                "org.apache.sling.jcr.webdav",
                 "org.apache.sling.launchpad.content",
                 "org.apache.sling.launchpad.installer",
-                "org.apache.sling.resourceresolver",
                 "org.apache.sling.scripting.api",
                 "org.apache.sling.scripting.core",
                 "org.apache.sling.scripting.javascript",
@@ -187,4 +172,4 @@ public class SlingSetupTest {
             fail("Some required services are missing:" + missing);
         }
     }
-}
\ No newline at end of file
+}



Mime
View raw message