keycloak-memoizeit

diff --git a/testsuite/integration-arquillian/pom.xml b/testsuite/integration-arquillian/pom.xml
index b2cd0f2..674a92f 100644
--- a/testsuite/integration-arquillian/pom.xml
+++ b/testsuite/integration-arquillian/pom.xml
@@ -47,6 +47,7 @@
         <arquillian-graphene.version>2.3.1</arquillian-graphene.version>
         <arquillian-wildfly-container.version>2.1.0.Final</arquillian-wildfly-container.version>
         <arquillian-wls-container.version>1.0.1.Final</arquillian-wls-container.version>
+        <arquillian-container-karaf.version>2.2.0.Final</arquillian-container-karaf.version>
         <arquillian-infinispan-container.version>1.2.0.Beta2</arquillian-infinispan-container.version>
         <version.shrinkwrap.resolvers>2.2.6</version.shrinkwrap.resolvers>
         <undertow-embedded.version>1.0.0.Alpha2</undertow-embedded.version>

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 89eefba..31352de 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse63/pom.xml
@@ -58,6 +58,6 @@
                 </executions>
             </plugin>
         </plugins>
-    </build>    
+    </build>
 
 </project>

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/pom.xml
new file mode 100644
index 0000000..8e054a8
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/pom.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+~ Copyright 2016 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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <parent>
+        <groupId>org.keycloak.testsuite</groupId>
+        <artifactId>integration-arquillian-servers-app-server-karaf</artifactId>
+        <version>4.0.0.Beta2-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>integration-arquillian-servers-app-server-fuse70</artifactId>
+    <packaging>pom</packaging>
+    <name>App Server - Karaf - JBoss Fuse 7.0</name>
+
+    <properties>
+        <app.server.karaf>fuse70</app.server.karaf>
+        <app.server.karaf.groupId>org.jboss.fuse</app.server.karaf.groupId>
+        <app.server.karaf.artifactId>jboss-fuse-karaf</app.server.karaf.artifactId>
+        <app.server.karaf.version>${fuse70.version}</app.server.karaf.version>
+        <app.server.karaf.unpacked.folder.name>jboss-fuse-karaf-${fuse70.version}</app.server.karaf.unpacked.folder.name>
+        <app.server.karaf.client.auth>-u admin -p admin</app.server.karaf.client.auth>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireProperty>
+                                    <property>fuse70.version</property>
+                                </requireProperty>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/install-features.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/install-features.cli
new file mode 100644
index 0000000..e71a92b
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/install-features.cli
@@ -0,0 +1,3 @@
+feature:repo-add mvn:org.keycloak/keycloak-osgi-features/${project.version}/xml/features
+feature:repo-add mvn:org.keycloak.example.demo/keycloak-fuse-example-features/${project.version}/xml/features
+feature:install keycloak-fuse-7.0-example

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-direct-access.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-direct-access.json
new file mode 100644
index 0000000..1b3ce63
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-direct-access.json
@@ -0,0 +1,9 @@
+{
+    "realm": "demo",
+    "resource": "ssh-jmx-admin-client",
+    "ssl-required" : "external",
+    "auth-server-url" : "http://localhost:8080/auth",
+    "credentials": {
+        "secret": "password"
+    }
+}

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio.json
new file mode 100644
index 0000000..b7f6b9e
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio.json
@@ -0,0 +1,9 @@
+{
+  "realm" : "demo",
+  "resource" : "jaas",
+  "bearer-only" : true,
+  "auth-server-url" : "http://localhost:8080/auth",
+  "ssl-required" : "external",
+  "use-resource-role-mappings": false,
+  "principal-attribute": "preferred_username"
+}

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio-client.json b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio-client.json
new file mode 100644
index 0000000..c28051d
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/keycloak-hawtio-client.json
@@ -0,0 +1,7 @@
+{
+  "realm" : "demo",
+  "resource" : "hawtio-client",
+  "auth-server-url" : "http://localhost:8080/auth",
+  "ssl-required" : "external",
+  "public-client" : true
+}

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config.cli
new file mode 100644
index 0000000..6c272c6
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config.cli
@@ -0,0 +1,10 @@
+config:edit org.ops4j.pax.url.mvn
+config:property-set org.ops4j.pax.url.mvn.localRepository ${maven.repo.local}
+config:property-set org.ops4j.pax.url.mvn.settings ${maven.local.settings}
+config:property-append org.ops4j.pax.url.mvn.repositories ${repositories}
+config:update
+config:edit jmx.acl.org.apache.karaf.security.jmx
+config:property-append list* viewer
+config:property-append set* jmxAdmin
+config:property-append * jmxAdmin,admin
+config:update

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config-auth.cli b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config-auth.cli
new file mode 100644
index 0000000..b3f63c2
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/update-config-auth.cli
@@ -0,0 +1,8 @@
+config:edit org.apache.karaf.shell
+config:property-set sshRealm keycloak
+config:update
+system:property -p hawtio.roles admin,user
+system:property -p hawtio.keycloakEnabled true
+system:property -p hawtio.realm keycloak
+system:property -p hawtio.keycloakClientConfig file://\$\{karaf.base\}/etc/keycloak-hawtio-client.json
+system:property -p hawtio.rolePrincipalClasses org.keycloak.adapters.jaas.RolePrincipal,org.apache.karaf.jaas.boot.principal.RolePrincipal

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/users.properties b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/users.properties
new file mode 100644
index 0000000..97e935c
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/main/resources/users.properties
@@ -0,0 +1 @@
+admin=admin,admin,manager,viewer,ssh,systembundles

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/saml-adapter-not-supported b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/saml-adapter-not-supported
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/fuse70/src/saml-adapter-not-supported
@@ -0,0 +1 @@
+

diff --git a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
index 7ddfdd9..2dfc7bb 100644
--- a/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
+++ b/testsuite/integration-arquillian/servers/app-server/karaf/pom.xml
@@ -192,32 +192,78 @@
                 </plugins>
             </build>
         </profile>
-        
+
+        <profile>
+            <id>enforce-props-when-update-config</id>
+            <activation>
+                <property>
+                    <name>app.server.karaf.update.config</name>
+                    <value>true</value>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>enforce-props-when-update-config</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <requireProperty>
+                                            <message>When updating config maven.local.settings is expected to be explicitly set.</message>
+                                            <property>maven.local.settings</property>
+                                        </requireProperty>
+                                        <requireProperty>
+                                            <message>When updating config maven.repo.local is expected to be explicitly set.</message>
+                                            <property>maven.repo.local</property>
+                                        </requireProperty>
+                                        <requireProperty>
+                                            <message>When updating config repositories is expected to be set.</message>
+                                            <property>repositories</property>
+                                        </requireProperty>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <profile>
             <id>app-server-karaf3</id>
             <modules>
                 <module>karaf3</module>
             </modules>
-        </profile>        
+        </profile>
         <profile>
             <id>app-server-fuse61</id>
             <modules>
                 <module>fuse61</module>
             </modules>
-        </profile>        
+        </profile>
         <profile>
             <id>app-server-fuse62</id>
             <modules>
                 <module>fuse62</module>
             </modules>
-        </profile>        
+        </profile>
         <profile>
             <id>app-server-fuse63</id>
             <modules>
                 <module>fuse63</module>
             </modules>
-        </profile>        
-        
+        </profile>
+        <profile>
+            <id>app-server-fuse70</id>
+            <modules>
+                <module>fuse70</module>
+            </modules>
+        </profile>
     </profiles>
 
 </project>

diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/karaf/CustomKarafContainer.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/karaf/CustomKarafContainer.java
index 46f43a3..0b612d0 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/karaf/CustomKarafContainer.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/karaf/CustomKarafContainer.java
@@ -1,7 +1,6 @@
 package org.keycloak.testsuite.arquillian.karaf;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -25,7 +24,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * KarafManagedDeployableContainer
- *
+ * 
  * @author thomas.diesler@jboss.com
  */
 public class CustomKarafContainer<T extends KarafManagedContainerConfiguration> extends JMXDeployableContainer<T> {
@@ -79,7 +78,7 @@ public class CustomKarafContainer<T extends KarafManagedContainerConfiguration> 
             String java = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
             _logger.info(String.format("Using java: %s", java));
 
-            List<String> cmd = new ArrayList<String>();
+            List<String> cmd = new ArrayList<>();
             cmd.add(java);
 
             // JavaVM args
@@ -95,6 +94,7 @@ public class CustomKarafContainer<T extends KarafManagedContainerConfiguration> 
             cmd.add("-Dkaraf.etc=" + karafHomeDir + "/etc");
             cmd.add("-Dkaraf.data=" + karafHomeDir + "/data");
             cmd.add("-Dkaraf.instances=" + karafHomeDir + "/instances");
+            cmd.add("-Dkaraf.restart.jvm.supported=true");
             cmd.add("-Dkaraf.startLocalConsole=false");
             cmd.add("-Dkaraf.startRemoteShell=true");
 
@@ -105,16 +105,23 @@ public class CustomKarafContainer<T extends KarafManagedContainerConfiguration> 
 
             // Classpath
             StringBuilder classPath = new StringBuilder();
-            File karafLibDir = new File(karafHomeDir, "lib");
-            String[] libs = karafLibDir.list(new FilenameFilter() {
-                @Override
-                public boolean accept(File dir, String name) {
-                    return name.startsWith("karaf");
+            boolean fuse7 = new File(karafHomeDir, "lib/boot/").exists();
+            if (fuse7) {
+                _logger.info("Adding karaf4 libraries to classpath.");
+                File karafLibBootDir = new File(karafHomeDir, "lib/boot/");
+                String[] libs = karafLibBootDir.list((File dir, String name) -> name.endsWith(".jar"));
+                for (String lib : libs) {
+                    String separator = classPath.length() > 0 ? File.pathSeparator : "";
+                    classPath.append(separator).append(new File(karafLibBootDir, lib));
+                }
+            } else { //fuse6
+                _logger.info("Adding karaf3 libraries to classpath.");
+                File karafLibDir = new File(karafHomeDir, "lib");
+                String[] libs = karafLibDir.list((File dir, String name) -> name.startsWith("karaf"));
+                for (String lib : libs) {
+                    String separator = classPath.length() > 0 ? File.pathSeparator : "";
+                    classPath.append(separator).append(new File(karafHomeDir, "lib/" + lib));
                 }
-            });
-            for (String lib : libs) {
-                String separator = classPath.length() > 0 ? File.pathSeparator : "";
-                classPath.append(separator).append(new File(karafHomeDir, "lib/" + lib));
             }
             cmd.add("-classpath");
             cmd.add(classPath.toString());
@@ -194,7 +201,7 @@ public class CustomKarafContainer<T extends KarafManagedContainerConfiguration> 
 
     private void destroyKarafProcess() throws LifecycleException {
         if (process != null) {
-            process.destroy();            
+            process.destroy();
             try {
                 process.waitFor();
             } catch (InterruptedException e) {

diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/pom.xml
index a383fc6..116e39b 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse63/pom.xml
@@ -42,7 +42,6 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>${apache.httpcomponents.version}</version>
         </dependency>
     </dependencies>
     

diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/pom.xml
new file mode 100644
index 0000000..f48c938
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!--
+~ Copyright 2016 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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.keycloak.testsuite</groupId>
+        <artifactId>integration-arquillian-tests-adapters-karaf</artifactId>
+        <version>4.0.0.Beta2-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>integration-arquillian-tests-adapters-fuse70</artifactId>
+
+    <name>Adapter Tests - Karaf - JBoss Fuse 7.0</name>
+
+    <properties>
+        <app.server>fuse70</app.server>
+
+        <app.server.management.user>admin</app.server.management.user>
+        <app.server.management.password>admin</app.server.management.password>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

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
new file mode 100644
index 0000000..07e66b2
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70AdminAdapterTest.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016 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.adapter.example;
+
+import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
+
+@AppServerContainer("app-server-fuse70")
+public class Fuse70AdminAdapterTest extends AbstractFuseAdminAdapterTest {
+
+}

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
new file mode 100644
index 0000000..1d37add
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/fuse70/src/test/java/org/keycloak/testsuite/adapter/example/Fuse70ExampleAdapterTest.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2016 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.adapter.example;
+
+import org.keycloak.testsuite.arquillian.annotation.AppServerContainer;
+
+@AppServerContainer("app-server-fuse70")
+public class Fuse70ExampleAdapterTest extends AbstractFuseExampleAdapterTest {
+
+}

diff --git a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
index d53a324..a8b0aca 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/karaf/pom.xml
@@ -53,41 +53,6 @@
                     <exists>src</exists>
                 </file>
             </activation>
-            <dependencies>
-
-                <dependency>
-                    <groupId>org.jboss.arquillian.container</groupId>
-                    <artifactId>arquillian-container-karaf-managed</artifactId>
-                    <version>2.1.0.CR18</version>
-                </dependency>
-        
-                <dependency>
-                    <groupId>org.apache.aries.jmx</groupId>
-                    <artifactId>org.apache.aries.jmx</artifactId>
-                    <version>1.1.1</version>
-                </dependency>
-        
-                <dependency>
-                    <groupId>jline</groupId>
-                    <artifactId>jline</artifactId>
-                    <version>2.12</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.karaf.shell</groupId>
-                    <artifactId>org.apache.karaf.shell.console</artifactId>
-                    <version>3.0.3</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.karaf</groupId>
-                    <artifactId>org.apache.karaf.client</artifactId>
-                    <version>3.0.3</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.sshd</groupId>
-                    <artifactId>sshd-core</artifactId>
-                    <version>1.2.0</version>
-                </dependency>
-            </dependencies>
             <build>
                 <plugins>
                     <plugin>
@@ -113,33 +78,37 @@
             </build>
         </profile>
         
-        
+
         <profile>
             <id>app-server-karaf3</id>
             <modules>
                 <module>karaf3</module>
             </modules>
-        </profile>        
+        </profile>
         <profile>
             <id>app-server-fuse61</id>
             <modules>
                 <module>fuse61</module>
             </modules>
-        </profile>        
+        </profile>
         <profile>
             <id>app-server-fuse62</id>
             <modules>
                 <module>fuse62</module>
             </modules>
-        </profile>                
+        </profile>
         <profile>
             <id>app-server-fuse63</id>
             <modules>
                 <module>fuse63</module>
             </modules>
-        </profile>                
-        
+        </profile>
+        <profile>
+            <id>app-server-fuse70</id>
+            <modules>
+                <module>fuse70</module>
+            </modules>
+        </profile>
     </profiles>
 
-
 </project>

diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 8339d54..5bf0e37 100755
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -347,12 +347,12 @@
         <dependency>
             <groupId>org.jboss.arquillian.container</groupId>
             <artifactId>arquillian-container-karaf-managed</artifactId>
-            <version>2.1.0.CR18</version>
+            <version>${arquillian-container-karaf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.container</groupId>
             <artifactId>arquillian-container-osgi</artifactId>
-            <version>2.1.0.CR18</version>
+            <version>${arquillian-container-karaf.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.google.guava</groupId>