Author: olli
Date: Sat Nov 7 16:44:51 2015
New Revision: 1713152
URL: http://svn.apache.org/viewvc?rev=1713152&view=rev
Log:
SLING-4412 upgrade Karaf to 4.0
ignore dependency bundles
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/JackrabbitSlingIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingIT.java
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/JackrabbitSlingIT.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/JackrabbitSlingIT.java?rev=1713152&r1=1713151&r2=1713152&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/JackrabbitSlingIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/JackrabbitSlingIT.java
Sat Nov 7 16:44:51 2015
@@ -19,6 +19,7 @@
package org.apache.sling.launchpad.karaf.tests.bootstrap;
import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -93,6 +94,7 @@ public class JackrabbitSlingIT extends K
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoAnnotation_1_1_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-annotation_1.1_spec");
assertNotNull(bundle);
@@ -100,6 +102,7 @@ public class JackrabbitSlingIT extends K
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoAtinject_1_0_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-atinject_1.0_spec");
assertNotNull(bundle);
@@ -107,6 +110,7 @@ public class JackrabbitSlingIT extends K
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoEl_2_2_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-el_2.2_spec");
assertNotNull(bundle);
@@ -114,6 +118,7 @@ public class JackrabbitSlingIT extends K
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoInterceptor_1_1_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-interceptor_1.1_spec");
assertNotNull(bundle);
@@ -121,6 +126,7 @@ public class JackrabbitSlingIT extends K
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoJcdi_1_0_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-jcdi_1.0_spec");
assertNotNull(bundle);
@@ -128,6 +134,7 @@ public class JackrabbitSlingIT extends K
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoJta_1_1_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-jta_1.1_spec");
assertNotNull(bundle);
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.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/SlingCommonsSchedulerIT.java?rev=1713152&r1=1713151&r2=1713152&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingCommonsSchedulerIT.java
Sat Nov 7 16:44:51 2015
@@ -19,6 +19,7 @@
package org.apache.sling.launchpad.karaf.tests.bootstrap;
import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -51,6 +52,7 @@ public class SlingCommonsSchedulerIT ext
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoJta_1_1_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-jta_1.1_spec");
assertNotNull(bundle);
@@ -58,6 +60,7 @@ public class SlingCommonsSchedulerIT ext
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoServlet_3_0_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-servlet_3.0_spec");
assertNotNull(bundle);
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.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/SlingIT.java?rev=1713152&r1=1713151&r2=1713152&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingIT.java
Sat Nov 7 16:44:51 2015
@@ -22,6 +22,7 @@ import javax.inject.Inject;
import org.apache.sling.engine.SlingRequestProcessor;
import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -150,6 +151,7 @@ public class SlingIT extends KarafTestSu
}
@Test
+ @Ignore
public void testJavaxJcr() {
final Bundle bundle = findBundle("javax.jcr");
assertNotNull(bundle);
@@ -157,6 +159,7 @@ public class SlingIT extends KarafTestSu
}
@Test
+ @Ignore
public void testOrgApacheGeronimoBundlesJson() {
final Bundle bundle = findBundle("org.apache.geronimo.bundles.json");
assertNotNull(bundle);
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingIT.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/SlingScriptingIT.java?rev=1713152&r1=1713151&r2=1713152&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingIT.java
Sat Nov 7 16:44:51 2015
@@ -19,6 +19,7 @@
package org.apache.sling.launchpad.karaf.tests.bootstrap;
import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -58,6 +59,7 @@ public class SlingScriptingIT extends Ka
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoServlet_3_0_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-servlet_3.0_spec");
assertNotNull(bundle);
Modified:
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.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/SlingScriptingJavaIT.java?rev=1713152&r1=1713151&r2=1713152&view=diff
==============================================================================
---
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java
(original)
+++
sling/trunk/contrib/launchpad/karaf/org.apache.sling.launchpad.karaf-integration-tests/src/test/java/org/apache/sling/launchpad/karaf/tests/bootstrap/SlingScriptingJavaIT.java
Sat Nov 7 16:44:51 2015
@@ -19,6 +19,7 @@
package org.apache.sling.launchpad.karaf.tests.bootstrap;
import org.apache.sling.launchpad.karaf.testing.KarafTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Configuration;
@@ -51,6 +52,7 @@ public class SlingScriptingJavaIT extend
}
@Test
+ @Ignore
public void testOrgApacheGeronimoSpecsGeronimoServlet_3_0_Spec() {
final Bundle bundle =
findBundle("org.apache.geronimo.specs.geronimo-servlet_3.0_spec");
assertNotNull(bundle);
