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 2015/05/05 21:34:30 UTC
svn commit: r1677883 - in
/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src:
main/java/org/apache/sling/launchpad/karaf/testing/
test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/
Author: olli
Date: Tue May 5 19:34:29 2015
New Revision: 1677883
URL: http://svn.apache.org/r1677883
Log:
SLING-3017 replace feature derby-sling by new option derby (withDerby())
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java?rev=1677883&r1=1677882&r2=1677883&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/main/java/org/apache/sling/launchpad/karaf/testing/KarafTestSupport.java Tue May 5 19:34:29 2015
@@ -157,4 +157,8 @@ public abstract class KarafTestSupport {
);
}
+ protected Option withDerby() {
+ return mavenBundle().groupId("org.apache.derby").artifactId("derby").version("10.11.1.1");
+ }
+
}
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java?rev=1677883&r1=1677882&r2=1677883&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingLoginIT.java Tue May 5 19:34:29 2015
@@ -39,7 +39,7 @@ public class SlingAuthXingLoginIT extend
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addBootFeature("derby-sling"),
+ withDerby(),
addBootFeature("sling-jcr-jackrabbit"),
addBootFeature("sling-auth-xing-login")
);
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java?rev=1677883&r1=1677882&r2=1677883&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingAuthXingOauthIT.java Tue May 5 19:34:29 2015
@@ -39,7 +39,7 @@ public class SlingAuthXingOauthIT extend
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addBootFeature("derby-sling"),
+ withDerby(),
addBootFeature("sling-jcr-jackrabbit"),
addBootFeature("sling-auth-xing-oauth")
);
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java?rev=1677883&r1=1677882&r2=1677883&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitIT.java Tue May 5 19:34:29 2015
@@ -39,7 +39,7 @@ public class SlingJcrJackrabbitIT extend
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addBootFeature("derby-sling"),
+ withDerby(),
addBootFeature("sling-jcr-jackrabbit")
);
}
Modified: sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java?rev=1677883&r1=1677882&r2=1677883&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java (original)
+++ sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java Tue May 5 19:34:29 2015
@@ -39,7 +39,7 @@ public class SlingJcrJackrabbitSecurityI
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addBootFeature("derby-sling"),
+ withDerby(),
addBootFeature("sling-jcr-jackrabbit-security")
);
}