Details
diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml
index d61256a..d11a97a 100644
--- a/testsuite/integration-arquillian/servers/eap7/pom.xml
+++ b/testsuite/integration-arquillian/servers/eap7/pom.xml
@@ -68,7 +68,7 @@
<artifactItems>
<artifactItem>
<groupId>org.keycloak</groupId>
- <artifactId>keycloak-eap6-server-dist</artifactId>
+ <artifactId>keycloak-server-dist</artifactId>
<version>${version.server.dist}</version>
<type>zip</type>
<outputDirectory>${project.build.directory}/unpacked</outputDirectory>
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java
index a667a01..c1cdf83 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/ContainersTestEnricher.java
@@ -290,11 +290,13 @@ public class ContainersTestEnricher {
log.info("Installing saml adapter to app server via cli script");
execCommand(command + " --connect --file=" + samlAdapterScript + controllerArg, bin);
}
- log.info("Restarting container");
- execCommand(command + " --connect --command=reload" + controllerArg, bin);
- log.info("Container restarted");
- pause(5000);
- checkServerLog(jbossHomePath);
+ if (new File(bin, adapterScript).exists() || new File(bin, samlAdapterScript).exists()) {
+ log.info("Restarting container");
+ execCommand(command + " --connect --command=reload" + controllerArg, bin);
+ log.info("Container restarted");
+ pause(5000);
+ checkServerLog(jbossHomePath);
+ }
if (container.getName().startsWith("app-server")) {
alreadyInstalled = true;
}
diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
index daee3a7..c5b6ad4 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
@@ -130,10 +130,7 @@
<property name="jbossHome">${keycloak.home}</property>
<property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property>
<property name="startupTimeoutInSeconds">${startup.timeout.sec}</property>
-
- <!--<property name="managementPort">${auth.server.management.port}</property>-->
- <property name="managementPort">${auth.server.management.port.jmx}</property>
- <property name="managementProtocol">remote</property>
+ <property name="managementPort">${auth.server.management.port}</property>
</configuration>
</container>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml
index 300d4b6..7a58757 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/eap6/pom.xml
@@ -17,29 +17,6 @@
<version.adapter.dist>${project.version}</version.adapter.dist>
</properties>
- <dependencies>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-arquillian-container-managed</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-dist</artifactId>
- <version>${jboss.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-eap6-adapter-dist</artifactId>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-saml-eap6-adapter-dist</artifactId>
- <type>zip</type>
- </dependency>
- </dependencies>
-
<build>
<plugins>
<plugin>
@@ -89,7 +66,7 @@
<artifactItem>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-eap6-adapter-dist</artifactId>
- <version>${project.version}</version>
+ <version>${version.adapter.dist}</version>
<type>zip</type>
<outputDirectory>${adapter.libs.eap6}</outputDirectory>
</artifactItem>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/eap7/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/eap7/pom.xml
index c935ea0..80e913e 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/eap7/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/eap7/pom.xml
@@ -38,12 +38,6 @@
<app.server.eap7.home>${containers.home}/jboss-eap-7.0</app.server.eap7.home>
<adapter.libs.eap7>${containers.home}/keycloak-eap7-adapter-dist</adapter.libs.eap7>
</properties>
-<!-- <dependencies>
- <dependency>
- <groupId>org.wildfly</groupId>
- <artifactId>wildfly-arquillian-container-managed</artifactId>
- </dependency>
- </dependencies>-->
<build>
<plugins>
<plugin>
diff --git a/testsuite/integration-arquillian/tests/other/adapters/pom.xml b/testsuite/integration-arquillian/tests/other/adapters/pom.xml
index 804c93e..2e49e65 100644
--- a/testsuite/integration-arquillian/tests/other/adapters/pom.xml
+++ b/testsuite/integration-arquillian/tests/other/adapters/pom.xml
@@ -283,6 +283,12 @@
</modules>
</profile>
<profile>
+ <id>app-server-eap7</id>
+ <modules>
+ <module>eap7</module>
+ </modules>
+ </profile>
+ <profile>
<id>app-server-wildfly</id>
<modules>
<module>wildfly</module>
