keycloak-aplcache
Changes
testsuite/integration-arquillian/pom.xml 16(+16 -0)
testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse63AppServerProvider.java 92(+92 -0)
testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/java/org/keycloak/testsuite/arquillian/fuse/Fuse63AppServerArquillianExtension.java 26(+20 -6)
testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension 1(+1 -0)
testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider 1(+1 -0)
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java 2(+2 -0)
testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java 7(+1 -6)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseAdminAdapterTest.java 42(+28 -14)
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/adapter/example/fuse/FuseExampleAdapterTest.java 31(+16 -15)
testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/src/test/java/org/keycloak/testsuite/adapter/example/Fuse63AdminAdapterTest.java 8(+0 -8)
testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70AdminAdapterTest.java 3(+2 -1)
testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70ExampleAdapterTest.java 3(+2 -1)
Details
testsuite/integration-arquillian/pom.xml 16(+16 -0)
diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index 471112d..22331ba 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -128,6 +128,22 @@
<artifactId>undertow-embedded</artifactId>
<version>${undertow-embedded.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-karaf-managed</artifactId>
+ <version>${arquillian-container-karaf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-osgi</artifactId>
+ <version>${arquillian-container-karaf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/pom.xml
index 9ad3fa3..5929727 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/pom.xml
@@ -26,8 +26,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>integration-arquillian-servers-app-server-fuse63</artifactId>
- <packaging>pom</packaging>
- <name>App Server - Karaf - JBoss Fuse 6.3</name>
+ <packaging>jar</packaging>
+ <name>App Server - Fuse 6.3</name>
<properties>
<app.server.karaf>fuse63</app.server.karaf>
@@ -37,7 +37,30 @@
<app.server.karaf.unpacked.folder.name>jboss-fuse-${fuse63.version}</app.server.karaf.unpacked.folder.name>
<app.server.karaf.client.auth>-u admin -p admin</app.server.karaf.client.auth>
</properties>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>org.keycloak.testsuite</groupId>
+ <artifactId>integration-arquillian-servers-app-server-spi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak.testsuite</groupId>
+ <artifactId>integration-arquillian-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-osgi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse63AppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse63AppServerProvider.java
new file mode 100644
index 0000000..afc0f20
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/java/org/keycloak/testsuite/arquillian/fuse/container/Fuse63AppServerProvider.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2018 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.keycloak.testsuite.arquillian.fuse.container;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jboss.arquillian.core.spi.Validate;
+import org.jboss.shrinkwrap.descriptor.spi.node.Node;
+import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider;
+import org.keycloak.testsuite.utils.arquillian.fuse.CustomFuseContainer;
+
+/**
+ * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
+ */
+public class Fuse63AppServerProvider implements AppServerContainerProvider {
+
+ private Node configuration;
+ private static final String containerName = "fuse63";
+
+ private final String appServerHome;
+ private final String appServerJavaHome;
+ private final String managementUser;
+ private final String managementPassword;
+
+ public Fuse63AppServerProvider() {
+ appServerHome = System.getProperty("app.server.home");
+ appServerJavaHome = System.getProperty("app.server.java.home");
+ managementUser = System.getProperty("app.server.management.user");
+ managementPassword = System.getProperty("app.server.management.password");
+
+ Validate.notNullOrEmpty(appServerHome, "app.server.home is not set.");
+ Validate.notNullOrEmpty(appServerJavaHome, "app.server.java.home is not set.");
+ Validate.notNullOrEmpty(managementUser, "app.server.management.user is not set.");
+ Validate.notNullOrEmpty(managementPassword, "app.server.management.password is not set.");
+ }
+
+ @Override
+ public String getName() {
+ return containerName;
+ }
+
+ @Override
+ public List<Node> getContainers() {
+ List<Node> containers = new ArrayList<>();
+
+ containers.add(standaloneContainer());
+
+ return containers;
+ }
+
+ private void createChild(String name, String text) {
+ configuration.createChild("property").attribute("name", name).text(text);
+ }
+
+ private Node standaloneContainer() {
+ Node container = new Node("container");
+ container.attribute("mode", "manual");
+ container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName);
+
+ configuration = container.createChild("configuration");
+ createChild("enabled", "true");
+ createChild("adapterImplClass", CustomFuseContainer.class.getName());
+ createChild("autostartBundle", "false");
+ createChild("karafHome", appServerHome);
+ createChild("javaHome", appServerJavaHome);
+ createChild("javaVmArguments",
+ System.getProperty("app.server.karaf.jvm.debug.args", "") + " " +
+ System.getProperty("adapter.test.props", " ")
+ );
+
+ createChild("jmxServiceURL", "service:jmx:rmi://127.0.0.1:44444/jndi/rmi://127.0.0.1:1099/karaf-root");
+ createChild("jmxUsername", managementUser);
+ createChild("jmxPassword", managementPassword);
+
+ return container;
+ }
+}
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
new file mode 100644
index 0000000..acdc5ff
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension
@@ -0,0 +1 @@
+org.keycloak.testsuite.arquillian.fuse.Fuse63AppServerArquillianExtension
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider
new file mode 100644
index 0000000..fc1bdd7
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/src/main/resources/META-INF/services/org.keycloak.testsuite.arquillian.container.AppServerContainerProvider
@@ -0,0 +1 @@
+org.keycloak.testsuite.arquillian.fuse.container.Fuse63AppServerProvider
diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
index be2b3f7..df29f1e 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
@@ -68,7 +68,7 @@
</requireProperty>
<requireOS>
<family>!windows</family>
- <message>Automated Kara/Fuse adapter configuration currently doesn't work on Windows.</message>
+ <message>Automated Karaf/Fuse adapter configuration currently doesn't work on Windows.</message>
</requireOS>
</rules>
</configuration>
diff --git a/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml b/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml
index 5b4946b..fe71634 100644
--- a/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/undertow/pom.xml
@@ -46,6 +46,10 @@
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-undertow</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>undertow-embedded</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index e76af7f..169b48f 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -136,6 +136,11 @@
<groupId>org.wildfly.arquillian</groupId>
<artifactId>wildfly-arquillian-container-managed</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -505,6 +510,60 @@
</build>
</profile>
<profile>
+ <id>app-server-fuse63</id>
+ <activation>
+ <property>
+ <name>app.server</name>
+ <value>fuse63</value>
+ </property>
+ </activation>
+ <properties>
+ <app.server>fuse63</app.server> <!--in case the profile is called directly-->
+ <app.server.skip.unpack>false</app.server.skip.unpack>
+
+ <!--fuse examples expect auth server on 8080-->
+ <auth.server.port.offset>0</auth.server.port.offset>
+ <auth.server.http.port>8080</auth.server.http.port>
+ <auth.server.management.port>9990</auth.server.management.port>
+ <!--fuse examples expect default karaf http port 8181-->
+ <app.server.http.port>8181</app.server.http.port>
+
+ <app.server.management.user>admin</app.server.management.user>
+ <app.server.management.password>admin</app.server.management.password>
+ <app.server.karaf.jvm.debug.args>-agentlib:jdwp=transport=dt_socket,server=y,suspend=${app.server.debug.suspend},address=localhost:${app.server.debug.port}</app.server.karaf.jvm.debug.args>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.keycloak.testsuite</groupId>
+ <artifactId>integration-arquillian-servers-app-server-fuse63</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-karaf-managed</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.commonjava.maven.plugins</groupId>
+ <artifactId>directory-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <app.server.management.user>${app.server.management.user}</app.server.management.user>
+ <app.server.management.password>${app.server.management.password}</app.server.management.password>
+ <app.server.karaf.jvm.debug.args>${app.server.karaf.jvm.debug.args}</app.server.karaf.jvm.debug.args>
+ </systemPropertyVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>auth-servers-crossdc-undertow</id>
<properties>
<skip.clean.second.cache>false</skip.clean.second.cache>
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java
index 6f4faa1..f67fa0b 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/containers/ContainerConstants.java
@@ -34,4 +34,6 @@ public interface ContainerConstants {
public static final String APP_SERVER_EAP6 = APP_SERVER_PREFIX + "eap6";
public static final String APP_SERVER_EAP6_CLUSTER = APP_SERVER_EAP6 + "-ha-node-1;" + APP_SERVER_EAP6 + "-ha-node-2";
+
+ public static final String APP_SERVER_FUSE63 = APP_SERVER_PREFIX + "fuse63";
}
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java
index 8872c37..e4401b5 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/KeycloakArquillianExtension.java
@@ -17,8 +17,6 @@
package org.keycloak.testsuite.arquillian;
-import org.jboss.arquillian.container.osgi.OSGiApplicationArchiveProcessor;
-import org.jboss.arquillian.container.spi.client.container.DeployableContainer;
import org.jboss.arquillian.container.test.impl.enricher.resource.URLResourceProvider;
import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
import org.jboss.arquillian.container.test.spi.client.deployment.DeploymentScenarioGenerator;
@@ -32,7 +30,6 @@ import org.jboss.arquillian.test.spi.enricher.resource.ResourceProvider;
import org.jboss.arquillian.test.spi.execution.TestExecutionDecider;
import org.keycloak.testsuite.arquillian.h2.H2TestEnricher;
import org.keycloak.testsuite.arquillian.jmx.JmxConnectorRegistryCreator;
-import org.keycloak.testsuite.arquillian.karaf.CustomKarafContainer;
import org.keycloak.testsuite.arquillian.migration.MigrationTestExecutionDecider;
import org.keycloak.testsuite.arquillian.provider.AdminClientProvider;
import org.keycloak.testsuite.arquillian.provider.LoadBalancerControllerProvider;
@@ -63,7 +60,6 @@ public class KeycloakArquillianExtension implements LoadableExtension {
builder
.service(DeploymentScenarioGenerator.class, DeploymentTargetModifier.class)
.service(ApplicationArchiveProcessor.class, DeploymentArchiveProcessor.class)
- .service(DeployableContainer.class, CustomKarafContainer.class)
.service(TestEnricher.class, CacheStatisticsControllerEnricher.class)
.observer(JmxConnectorRegistryCreator.class)
.observer(AuthServerTestEnricher.class)
@@ -76,8 +72,7 @@ public class KeycloakArquillianExtension implements LoadableExtension {
builder
.override(ResourceProvider.class, URLResourceProvider.class, URLProvider.class)
.override(ResourceProvider.class, CustomizableURLResourceProvider.class, URLProvider.class)
- .override(ResourceProvider.class, ContainerCustomizableURLResourceProvider.class, URLProvider.class)
- .override(ApplicationArchiveProcessor.class, OSGiApplicationArchiveProcessor.class, KeycloakOSGiApplicationArchiveProcessor.class);
+ .override(ResourceProvider.class, ContainerCustomizableURLResourceProvider.class, URLProvider.class);
builder
.override(Configurator.class, WebDriverFactory.class, KeycloakWebDriverConfigurator.class)
diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70AdminAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70AdminAdapterTest.java
index 65cd262..9da6110 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70AdminAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70AdminAdapterTest.java
@@ -27,11 +27,12 @@ import org.jboss.arquillian.graphene.page.Page;
import org.junit.Test;
import org.openqa.selenium.By;
import static org.junit.Assert.assertThat;
+import org.keycloak.testsuite.adapter.example.fuse.FuseAdminAdapterTest;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlDoesntStartWith;
import static org.keycloak.testsuite.util.URLAssert.assertCurrentUrlStartsWith;
@AppServerContainer("app-server-fuse70")
-public class Fuse70AdminAdapterTest extends AbstractFuseAdminAdapterTest {
+public class Fuse70AdminAdapterTest extends FuseAdminAdapterTest {
@Page
protected Hawtio2Page hawtioPage;
diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70ExampleAdapterTest.java b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70ExampleAdapterTest.java
index 1d37add..b4144de 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70ExampleAdapterTest.java
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70ExampleAdapterTest.java
@@ -17,9 +17,10 @@
package org.keycloak.testsuite.adapter.example;
+import org.keycloak.testsuite.adapter.example.fuse.FuseExampleAdapterTest;
import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
@AppServerContainer("app-server-fuse70")
-public class Fuse70ExampleAdapterTest extends AbstractFuseExampleAdapterTest {
+public class Fuse70ExampleAdapterTest extends FuseExampleAdapterTest {
}
diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
index 544487b..7c9d9d4 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
@@ -48,41 +48,6 @@
<profiles>
<profile>
- <id>adapter-test-karaf-submodules</id>
- <activation>
- <file>
- <exists>src</exists>
- </file>
- </activation>
- <!--
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>auth.server</property>
- <regex>(wildfly)|(eap)</regex>
- <regexMessage>Karaf/Fuse adapter tests require activation of profile "auth-server-wildfly" or "auth-server-eap".</regexMessage>
- </requireProperty>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- -->
- </profile>
-
-
- <profile>
<id>app-server-karaf3</id>
<modules>
<module>karaf3</module>
@@ -101,12 +66,6 @@
</modules>
</profile>
<profile>
- <id>app-server-fuse63</id>
- <modules>
- <module>fuse63</module>
- </modules>
- </profile>
- <profile>
<id>app-server-fuse70</id>
<modules>
<module>fuse70</module>
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 1657c1e..c573874 100755
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -573,35 +573,6 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-karaf-managed</artifactId>
- <version>${arquillian-container-karaf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-container-osgi</artifactId>
- <version>${arquillian-container-karaf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
<profiles>
<profile>
diff --git a/testsuite/integration-arquillian/util/pom.xml b/testsuite/integration-arquillian/util/pom.xml
index 3f53425..2eca6a7 100644
--- a/testsuite/integration-arquillian/util/pom.xml
+++ b/testsuite/integration-arquillian/util/pom.xml
@@ -46,5 +46,24 @@
<groupId>org.jboss.shrinkwrap.resolver</groupId>
<artifactId>shrinkwrap-resolver-api-maven</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-karaf-managed</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-container-osgi</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>