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 2020/11/01 11:56:28 UTC
[sling-org-apache-sling-karaf-integration-tests] branch master
updated (d1ca2ae -> 5cf4d04)
This is an automated email from the ASF dual-hosted git repository.
olli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git.
from d1ca2ae SLING-9865 Update to Sling (Bundle) Parent 40
new bc01494 SLING-3027 Improve Launchpad Karaf Features
new 5cf4d04 SLING-9837 Use OSGi R7 HTTP Service
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/sling/karaf/testing/KarafTestSupport.java | 4 ++++
.../apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java | 10 ++--------
.../apache/sling/karaf/tests/bootstrap/FelixHealthcheckIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingAuthFormIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingBundleresourceIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingCaconfigIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingClamIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingCommonsFsclassloaderIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingDistributionIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java | 3 ++-
.../tests/bootstrap/SlingInstallerFactoryConfigurationIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingInstallerFactoryPackagesIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingInstallerHealthcheckIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingInstallerProviderFileIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingJcrCompilerIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingJcrIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingJcrRepoinitIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingQuickstartOakIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java | 1 +
.../sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingResourcemergerIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingScriptingFreemarkerIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingScriptingGroovyIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingScriptingHtlIT.java | 5 ++---
.../apache/sling/karaf/tests/bootstrap/SlingScriptingIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingScriptingJavascriptIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingScriptingJspIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingServletsIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingStarterContentIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingValidationIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java | 3 ++-
56 files changed, 113 insertions(+), 63 deletions(-)
[sling-org-apache-sling-karaf-integration-tests] 01/02: SLING-3027
Improve Launchpad Karaf Features
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
commit bc014946d03b951e6991d3a9d5ef834ea7faa2fb
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sat Oct 31 14:43:04 2020 +0100
SLING-3027 Improve Launchpad Karaf Features
remove config bundle for Composum
---
.../org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
index 8789443..68e08cf 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
@@ -51,13 +51,6 @@ public class ComposumNodesIT extends KarafTestSupport {
}
@Test
- public void testComComposumCoreConfig() {
- final Bundle bundle = findBundle("com.composum.core.config");
- assertNotNull(bundle);
- assertEquals(Bundle.ACTIVE, bundle.getState());
- }
-
- @Test
public void testComComposumCoreConsole() {
final Bundle bundle = findBundle("com.composum.core.console");
assertNotNull(bundle);
[sling-org-apache-sling-karaf-integration-tests] 02/02: SLING-9837
Use OSGi R7 HTTP Service
Posted by ol...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-karaf-integration-tests.git
commit 5cf4d04e898f4111d984bbb2853e69b31f4c1b8f
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Nov 1 12:54:31 2020 +0100
SLING-9837 Use OSGi R7 HTTP Service
add feature felix-http when required
---
src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java | 4 ++++
.../java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/FelixHealthcheckIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingAuthFormIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingBundleresourceIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingCaconfigIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingClamIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingCommonsFsclassloaderIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingDistributionIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java | 3 ++-
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java | 3 ++-
.../karaf/tests/bootstrap/SlingInstallerFactoryConfigurationIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingInstallerFactoryPackagesIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingInstallerHealthcheckIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingJcrCompilerIT.java | 3 ++-
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingJcrRepoinitIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java | 1 +
.../apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingResourcemergerIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingScriptingFreemarkerIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingScriptingGroovyIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingScriptingHtlIT.java | 5 ++---
.../org/apache/sling/karaf/tests/bootstrap/SlingScriptingIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java | 3 ++-
.../sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java | 3 ++-
.../java/org/apache/sling/karaf/tests/bootstrap/SlingServletsIT.java | 3 ++-
.../apache/sling/karaf/tests/bootstrap/SlingStarterContentIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java | 3 ++-
.../org/apache/sling/karaf/tests/bootstrap/SlingValidationIT.java | 3 ++-
src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java | 3 ++-
56 files changed, 113 insertions(+), 56 deletions(-)
diff --git a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
index b522702..d55e554 100644
--- a/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
+++ b/src/main/java/org/apache/sling/karaf/testing/KarafTestSupport.java
@@ -113,6 +113,10 @@ public abstract class KarafTestSupport {
return features(maven().groupId("org.apache.sling").artifactId("org.apache.sling.karaf-features").type("xml").classifier("features").versionAsInProject(), features);
}
+ protected Option addFelixHttpFeature() {
+ return features(maven().groupId("org.apache.karaf.features").artifactId("standard").type("xml").classifier("features").versionAsInProject(), "felix-http");
+ }
+
protected Option karafTestSupportBundle() {
return streamBundle(
bundle()
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
index 68e08cf..97bf5be 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/ComposumNodesIT.java
@@ -39,7 +39,8 @@ public class ComposumNodesIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("composum-nodes")
+ addSlingFeatures("composum-nodes"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/FelixHealthcheckIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/FelixHealthcheckIT.java
index 184d928..d31d89d 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/FelixHealthcheckIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/FelixHealthcheckIT.java
@@ -39,7 +39,8 @@ public class FelixHealthcheckIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("felix-healthcheck")
+ addSlingFeatures("felix-healthcheck"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java
index 831346b..0bca5c1 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAdapterIT.java
@@ -39,7 +39,8 @@ public class SlingAdapterIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-adapter")
+ addSlingFeatures("sling-adapter"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAuthFormIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAuthFormIT.java
index 661a0b0..be814c9 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAuthFormIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingAuthFormIT.java
@@ -39,7 +39,8 @@ public class SlingAuthFormIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-auth-form")
+ addSlingFeatures("sling-auth-form"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingBundleresourceIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingBundleresourceIT.java
index 48904c4..0b7846c 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingBundleresourceIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingBundleresourceIT.java
@@ -39,7 +39,8 @@ public class SlingBundleresourceIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-bundleresource")
+ addSlingFeatures("sling-bundleresource"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCaconfigIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCaconfigIT.java
index 65c8e18..d52e73b 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCaconfigIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCaconfigIT.java
@@ -39,7 +39,8 @@ public class SlingCaconfigIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-caconfig")
+ addSlingFeatures("sling-caconfig"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingClamIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingClamIT.java
index 4e2cea0..fdd89c2 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingClamIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingClamIT.java
@@ -39,7 +39,8 @@ public class SlingClamIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-clam")
+ addSlingFeatures("sling-clam"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java
index 0225ef0..cd02bda 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsCompilerIT.java
@@ -42,7 +42,8 @@ public class SlingCommonsCompilerIT extends KarafTestSupport {
addSlingFeatures(
"sling-commons-fsclassloader",
"sling-commons-compiler"
- )
+ ),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsFsclassloaderIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsFsclassloaderIT.java
index c24f9cd..6a98740 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsFsclassloaderIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingCommonsFsclassloaderIT.java
@@ -39,7 +39,8 @@ public class SlingCommonsFsclassloaderIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-commons-fsclassloader")
+ addSlingFeatures("sling-commons-fsclassloader"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java
index a53b689..9bbac91 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryIT.java
@@ -39,7 +39,8 @@ public class SlingDiscoveryIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-discovery")
+ addSlingFeatures("sling-discovery"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java
index b4a7e61..0b7f620 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryOakIT.java
@@ -39,7 +39,8 @@ public class SlingDiscoveryOakIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-discovery-oak")
+ addSlingFeatures("sling-discovery-oak"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java
index 76428d5..687c8a3 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDiscoveryStandaloneIT.java
@@ -39,7 +39,8 @@ public class SlingDiscoveryStandaloneIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-discovery-standalone")
+ addSlingFeatures("sling-discovery-standalone"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDistributionIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDistributionIT.java
index 63db8d0..6b77a59 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDistributionIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingDistributionIT.java
@@ -39,7 +39,8 @@ public class SlingDistributionIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-distribution")
+ addSlingFeatures("sling-distribution"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java
index 200e0bb..8a80613 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingEventIT.java
@@ -39,7 +39,8 @@ public class SlingEventIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-event")
+ addSlingFeatures("sling-event"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java
index a5cd7b5..4848020 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFeatureflagsIT.java
@@ -39,7 +39,8 @@ public class SlingFeatureflagsIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-featureflags")
+ addSlingFeatures("sling-featureflags"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java
index ed2f944..61374af 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingFsresourceIT.java
@@ -39,7 +39,8 @@ public class SlingFsresourceIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-fsresource")
+ addSlingFeatures("sling-fsresource"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
index cc9ad7b..c1cf085 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingHealthcheckIT.java
@@ -39,7 +39,8 @@ public class SlingHealthcheckIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-healthcheck")
+ addSlingFeatures("sling-healthcheck"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java
index 9ceda96..89d5ba1 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingI18nIT.java
@@ -39,7 +39,8 @@ public class SlingI18nIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-i18n")
+ addSlingFeatures("sling-i18n"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java
index e574183..9950819 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingIT.java
@@ -47,7 +47,8 @@ public class SlingIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling")
+ addSlingFeatures("sling"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryConfigurationIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryConfigurationIT.java
index 5fbb946..d36dc9b 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryConfigurationIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryConfigurationIT.java
@@ -39,7 +39,8 @@ public class SlingInstallerFactoryConfigurationIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-installer-factory-configuration")
+ addSlingFeatures("sling-installer-factory-configuration"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryPackagesIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryPackagesIT.java
index 7e59909..757dd8b 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryPackagesIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerFactoryPackagesIT.java
@@ -39,7 +39,8 @@ public class SlingInstallerFactoryPackagesIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-installer-factory-packages")
+ addSlingFeatures("sling-installer-factory-packages"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerHealthcheckIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerHealthcheckIT.java
index baf1538..c17201b 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerHealthcheckIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerHealthcheckIT.java
@@ -39,7 +39,8 @@ public class SlingInstallerHealthcheckIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-installer-healthcheck")
+ addSlingFeatures("sling-installer-healthcheck"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java
index 077c8d7..e4d945d 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerIT.java
@@ -39,7 +39,8 @@ public class SlingInstallerIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-installer")
+ addSlingFeatures("sling-installer"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java
index e19cbdc..0a09369 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerProviderFileIT.java
@@ -39,7 +39,8 @@ public class SlingInstallerProviderFileIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-installer-provider-file")
+ addSlingFeatures("sling-installer-provider-file"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java
index 78e1532..f75998a 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingInstallerProviderJcrIT.java
@@ -39,7 +39,8 @@ public class SlingInstallerProviderJcrIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-installer-provider-jcr")
+ addSlingFeatures("sling-installer-provider-jcr"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrCompilerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrCompilerIT.java
index cb256f1..e847f42 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrCompilerIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrCompilerIT.java
@@ -39,7 +39,8 @@ public class SlingJcrCompilerIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-jcr-compiler")
+ addSlingFeatures("sling-jcr-compiler"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrIT.java
index 2992851..f7b4240 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrIT.java
@@ -39,7 +39,8 @@ public class SlingJcrIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-jcr")
+ addSlingFeatures("sling-jcr"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java
index 0e90463..e201b8e 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrJackrabbitSecurityIT.java
@@ -39,7 +39,8 @@ public class SlingJcrJackrabbitSecurityIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-jcr-jackrabbit-security")
+ addSlingFeatures("sling-jcr-jackrabbit-security"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrRepoinitIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrRepoinitIT.java
index 8473abe..baa811a 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrRepoinitIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJcrRepoinitIT.java
@@ -39,7 +39,8 @@ public class SlingJcrRepoinitIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-jcr-repoinit")
+ addSlingFeatures("sling-jcr-repoinit"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java
index 0c0a7fe..ec0e5ca 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingJmxProviderIT.java
@@ -39,7 +39,8 @@ public class SlingJmxProviderIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-jmx-provider")
+ addSlingFeatures("sling-jmx-provider"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java
index e9f51f7..ff52d81 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsIT.java
@@ -39,7 +39,8 @@ public class SlingModelsIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-models")
+ addSlingFeatures("sling-models"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java
index 633c610..f2dd79a 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingModelsJacksonexporterIT.java
@@ -39,7 +39,8 @@ public class SlingModelsJacksonexporterIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-models-jacksonexporter")
+ addSlingFeatures("sling-models-jacksonexporter"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java
index 325c16d..e17ed12 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingPipesIT.java
@@ -39,7 +39,8 @@ public class SlingPipesIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-pipes")
+ addSlingFeatures("sling-pipes"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java
index e487b79..2a2ee15 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQueryIT.java
@@ -39,7 +39,8 @@ public class SlingQueryIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-query")
+ addSlingFeatures("sling-query"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakIT.java
index cb61e44..27ead2f 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakIT.java
@@ -39,7 +39,8 @@ public class SlingQuickstartOakIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-quickstart-oak")
+ addSlingFeatures("sling-quickstart-oak"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
index 8ab92dd..6b729f0 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakMongoIT.java
@@ -68,6 +68,7 @@ public class SlingQuickstartOakMongoIT extends AbstractSlingQuickstartOakTestSup
editConfigurationFilePut("etc/org.apache.karaf.features.cfg", "featuresBoot", "(wrap)"),
editConfigurationFilePut("etc/org.apache.jackrabbit.oak.plugins.document.DocumentNodeStoreService.config", "mongouri", mongoUri),
addSlingFeatures("sling-quickstart-oak-mongo"),
+ addFelixHttpFeature(),
wrappedBundle(mavenBundle().groupId("org.rnorth.duct-tape").artifactId("duct-tape").versionAsInProject()),
wrappedBundle(mavenBundle().groupId("org.testcontainers").artifactId("testcontainers").versionAsInProject()).imports("org.junit.rules").overwriteManifest(WrappedUrlProvisionOption.OverwriteMode.MERGE)
);
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java
index c96bd6d..2e5ebc0 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingQuickstartOakTarIT.java
@@ -38,7 +38,8 @@ public class SlingQuickstartOakTarIT extends AbstractSlingQuickstartOakTestSuppo
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-quickstart-oak-tar")
+ addSlingFeatures("sling-quickstart-oak-tar"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java
index a77602b..5256dfb 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourceInventoryIT.java
@@ -39,7 +39,8 @@ public class SlingResourceInventoryIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-resource-inventory")
+ addSlingFeatures("sling-resource-inventory"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java
index c2fdeb4..2f8ea2b 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcePresenceIT.java
@@ -39,7 +39,8 @@ public class SlingResourcePresenceIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-resource-presence")
+ addSlingFeatures("sling-resource-presence"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcemergerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcemergerIT.java
index 8111add..6ad3511 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcemergerIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingResourcemergerIT.java
@@ -39,7 +39,8 @@ public class SlingResourcemergerIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-resourcemerger")
+ addSlingFeatures("sling-resourcemerger"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java
index 12e26df..1eae8fa 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingRewriterIT.java
@@ -39,7 +39,8 @@ public class SlingRewriterIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-rewriter")
+ addSlingFeatures("sling-rewriter"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingFreemarkerIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingFreemarkerIT.java
index cf9a699..77c7d2e 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingFreemarkerIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingFreemarkerIT.java
@@ -39,7 +39,8 @@ public class SlingScriptingFreemarkerIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-scripting-freemarker")
+ addSlingFeatures("sling-scripting-freemarker"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingGroovyIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingGroovyIT.java
index 806a655..bb44e20 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingGroovyIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingGroovyIT.java
@@ -39,7 +39,8 @@ public class SlingScriptingGroovyIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-scripting-groovy")
+ addSlingFeatures("sling-scripting-groovy"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingHtlIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingHtlIT.java
index 5d716da..ec37111 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingHtlIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingHtlIT.java
@@ -39,9 +39,8 @@ public class SlingScriptingHtlIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures(
- "sling-scripting-htl"
- )
+ addSlingFeatures("sling-scripting-htl"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingIT.java
index a0f2aeb..79e5a72 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingIT.java
@@ -39,7 +39,8 @@ public class SlingScriptingIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-scripting")
+ addSlingFeatures("sling-scripting"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java
index cff5f08..5c34799 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavaIT.java
@@ -42,7 +42,8 @@ public class SlingScriptingJavaIT extends KarafTestSupport {
addSlingFeatures(
"sling-commons-fsclassloader",
"sling-scripting-java"
- )
+ ),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java
index 2768509..04e85d4 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJavascriptIT.java
@@ -39,7 +39,8 @@ public class SlingScriptingJavascriptIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-scripting-javascript")
+ addSlingFeatures("sling-scripting-javascript"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java
index 8593f88..149a81c 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingJspIT.java
@@ -42,7 +42,8 @@ public class SlingScriptingJspIT extends KarafTestSupport {
addSlingFeatures(
"sling-commons-fsclassloader",
"sling-scripting-jsp"
- )
+ ),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
index 878cb7e..21d2335 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingScriptingThymeleafIT.java
@@ -39,7 +39,8 @@ public class SlingScriptingThymeleafIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-scripting-thymeleaf")
+ addSlingFeatures("sling-scripting-thymeleaf"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java
index b1f0da7..bd64055 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingSecurityIT.java
@@ -39,7 +39,8 @@ public class SlingSecurityIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-security")
+ addSlingFeatures("sling-security"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingServletsIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingServletsIT.java
index a52bfa4..2e4c50c 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingServletsIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingServletsIT.java
@@ -39,7 +39,8 @@ public class SlingServletsIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-servlets")
+ addSlingFeatures("sling-servlets"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingStarterContentIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingStarterContentIT.java
index a69239f..e9a3c5a 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingStarterContentIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingStarterContentIT.java
@@ -39,7 +39,8 @@ public class SlingStarterContentIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-starter-content")
+ addSlingFeatures("sling-starter-content"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java
index 2eea6af..132d3ad 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingUrlrewriterIT.java
@@ -39,7 +39,8 @@ public class SlingUrlrewriterIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-urlrewriter")
+ addSlingFeatures("sling-urlrewriter"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingValidationIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingValidationIT.java
index 5f98639..e96331c 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingValidationIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingValidationIT.java
@@ -39,7 +39,8 @@ public class SlingValidationIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-validation")
+ addSlingFeatures("sling-validation"),
+ addFelixHttpFeature()
);
}
diff --git a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java
index cb207f0..218176e 100644
--- a/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java
+++ b/src/test/java/org/apache/sling/karaf/tests/bootstrap/SlingXssIT.java
@@ -39,7 +39,8 @@ public class SlingXssIT extends KarafTestSupport {
@Configuration
public Option[] configuration() {
return OptionUtils.combine(baseConfiguration(),
- addSlingFeatures("sling-xss")
+ addSlingFeatures("sling-xss"),
+ addFelixHttpFeature()
);
}