libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

Merge pull request #2055 from vramik/prod

Browse source 
KEYCLOAK-2340: Update arquillian testsuite for dr3 build
This commit is contained in:
Stian Thorgersen 2016-01-20 09:09:35 +01:00
commit ddfeae39d0
5 changed files with 30 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
testsuite/integration-arquillian/servers/eap7/pom.xml
View file

@ -21,24 +21,6 @@
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>create-zip</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
@ -46,16 +28,8 @@
<profile>
<id>auth-server-eap7</id>
<properties>
<keycloak.server.home>${project.build.directory}/unpacked/jboss-iam-1.0</keycloak.server.home>
<keycloak.server.home>${project.build.directory}/unpacked/${unpacked.container.folder.name}</keycloak.server.home>
</properties>
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-eap6-server-dist</artifactId>
<version>${version.server.dist}</version>
<type>zip</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
@ -72,6 +46,9 @@
<requireProperty>
<property>version.server.dist</property>
</requireProperty>
<requireProperty>
<property>unpacked.container.folder.name</property>
</requireProperty>
</rules>
</configuration>
</execution>
@ -101,6 +78,24 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>create-zip</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>

19
testsuite/integration-arquillian/servers/wildfly/pom.xml
View file

@ -120,13 +120,6 @@
<properties>
<keycloak.server.home>${project.build.directory}/unpacked/keycloak-${project.version}</keycloak.server.home>
</properties>
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-server-dist</artifactId>
<type>zip</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
@ -164,18 +157,6 @@
<name>!adapter.libs.bundled</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-adapter-dist</artifactId>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-saml-wildfly-adapter-dist</artifactId>
<type>zip</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>

2
testsuite/integration-arquillian/tests/adapters/eap6/pom.xml
View file

@ -89,7 +89,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>

5
testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
View file

@ -129,8 +129,11 @@
<property name="adapterImplClass">org.jboss.as.arquillian.container.managed.ManagedDeployableContainer</property>
<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="managementPort">${auth.server.management.port}</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>
</configuration>
</container>

52
testsuite/integration-arquillian/tests/pom.xml
View file

@ -20,6 +20,7 @@
<properties>
<containers.home>${project.build.directory}/containers</containers.home>
<examples.home>${project.build.directory}/examples</examples.home>
<jboss.server.config.dir>${project.build.directory}/undertow-configuration</jboss.server.config.dir>
<auth.server.container>auth-server-undertow</auth.server.container>
<auth.server.port.offset>100</auth.server.port.offset>
@ -39,6 +40,7 @@
<arquillian-graphene.version>2.1.0.Alpha2</arquillian-graphene.version>
<arquillian-wildfly-container.version>8.2.0.Final</arquillian-wildfly-container.version>
<version.shrinkwrap.resolvers>2.1.1</version.shrinkwrap.resolvers>
<skip.unpack.server>true</skip.unpack.server>
<skip.unpack.previous>true</skip.unpack.previous>
<skip.install.adapters>true</skip.install.adapters>
@ -166,7 +168,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/undertow-configuration</outputDirectory>
<outputDirectory>${jboss.server.config.dir}</outputDirectory>
<resources>
<resource>
<directory>src/test/resources</directory>
@ -444,30 +446,6 @@
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-admin-user-json-file</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${jboss.server.config.dir}</outputDirectory>
<resources>
<resource>
<directory>src/test/resources</directory>
<includes>
<include>keycloak-add-user.json</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>
@ -524,30 +502,6 @@
</systemPropertyVariables>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-admin-user-json-file</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${jboss.server.config.dir}</outputDirectory>
<resources>
<resource>
<directory>src/test/resources</directory>
<includes>
<include>keycloak-add-user.json</include>
</includes>
<filtering>true</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</pluginManagement>
</build>