diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java index 75a20aa3bb782..199b9c3ff0ecf 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintExplicitPropertiesRouteTest.java @@ -78,29 +78,16 @@ public void testBlueprintProperties() throws Exception { public static Option[] configure() throws Exception { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("INFO")), - - // install blueprint requirements - mavenBundle("org.apache.felix", "org.apache.felix.configadmin"), - + getDefaultCamelKarafOptions(), + bundle(newBundle() .add("OSGI-INF/blueprint/test.xml", BlueprintExplicitPropertiesRouteTest.class.getResource("blueprint-16.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintExplicitPropertiesRouteTest.class.getName()) .build()).noStart(), - - // install the spring, http features first - scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"), - // using the features to install the camel components - scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-blueprint", "camel-test"), - - workingDirectory("target/paxrunner/"), - - felix()); + // using the features to install the camel components + scanFeatures(getCamelKarafFeatureUrl(), + "camel-blueprint")); return options; } diff --git a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java index 378875caa6467..f696b88534c03 100644 --- a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java +++ b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/blueprint/BlueprintPropertiesRouteTest.java @@ -74,31 +74,16 @@ public void testBlueprintProperties() throws Exception { public static Option[] configure() throws Exception { Option[] options = combine( - // Default karaf environment - Helper.getDefaultOptions( - // this is how you set the default log level when using pax logging (logProfile) - Helper.setLogLevel("INFO")), + getDefaultCamelKarafOptions(), + bundle(newBundle() .add("OSGI-INF/blueprint/test.xml", BlueprintPropertiesRouteTest.class.getResource("blueprint-17.xml")) .set(Constants.BUNDLE_SYMBOLICNAME, BlueprintPropertiesRouteTest.class.getName()) .build()).noStart(), - // install the spring dm profile - profile("spring.dm").version("1.2.0"), - mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint", "0.2-incubating"), - - // install blueprint requirements - mavenBundle("org.apache.felix", "org.apache.felix.configadmin"), - - // install the spring, http features first - scanFeatures(getKarafFeatureUrl(), "spring", "spring-dm", "jetty"), // using the features to install the camel components scanFeatures(getCamelKarafFeatureUrl(), - "camel-core", "camel-blueprint", "camel-test"), - - workingDirectory("target/paxrunner/"), - - felix()/*, equinox()*/); + "camel-blueprint")); return options; }