libre.sh/keycloak-scim
2
0
Fork 0
Code Issues 14 Pull requests Releases Packages Activity Actions 6

KEYCLOAK-12764 Fix shrinkwrap issue by updating arquillian bom version

Browse source
This commit is contained in:
mhajas 2020-01-22 12:57:02 +01:00 committed by Hynek Mlnařík
parent ecec20ad59
commit e5935d8069
5 changed files with 39 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/building.md
View file

@ -1,6 +1,6 @@
## Building from source
Ensure you have JDK 8 (or newer), Maven 3.1.1 (or newer) and Git installed
Ensure you have JDK 8 (or newer), Maven 3.5.4 (or newer) and Git installed
java -version
mvn -version

30
testsuite/integration-arquillian/pom.xml
View file

@ -47,15 +47,9 @@
<wildfly.deprecated.arquillian.wildfly.container>2.1.1.Final</wildfly.deprecated.arquillian.wildfly.container>
<!--component versions-->
<!--
to update arquillian-core to 1.3.0.Final or higher
- see https://issues.jboss.org/browse/ARQ-2181
- update org.keycloak.testsuite.arquillian.containers.KeycloakContainerTestExtension according to
current version of org.jboss.arquillian.container.test.impl.ContainerTestExtension
-->
<arquillian-core.version>1.2.1.Final</arquillian-core.version>
<arquillian-core.version>1.6.0.Final</arquillian-core.version>
<!--the version of shrinkwrap_resolver should align with the version in arquillian-bom-->
<shrinkwrap-resolver.version>2.2.6</shrinkwrap-resolver.version>
<shrinkwrap-resolver.version>3.1.4</shrinkwrap-resolver.version>
<selenium.version>3.14.0</selenium.version>
<arquillian-drone.version>2.5.1</arquillian-drone.version>
<arquillian-graphene.version>2.3.2</arquillian-graphene.version>
@ -297,6 +291,26 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${version.enforcer.plugin}</version>
<executions>
<execution>
<id>enforce-maven</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>3.5.4</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

16
testsuite/integration-arquillian/tests/base/pom.xml
View file

@ -122,6 +122,10 @@
<artifactId>mvel2</artifactId>
<version>${mvel.version}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>
</dependencies>
<build>
@ -718,9 +722,9 @@
</goals>
<configuration>
<rules>
<requireProperty>
<message>When running fuse tests 'additional.fuse.repos' is expected to be set.</message>
<property>additional.fuse.repos</property>
<requireProperty>
<message>When running fuse tests 'additional.fuse.repos' is expected to be set.</message>
<property>additional.fuse.repos</property>
</requireProperty>
</rules>
</configuration>
@ -793,9 +797,9 @@
</goals>
<configuration>
<rules>
<requireProperty>
<message>When running fuse tests 'additional.fuse.repos' is expected to be set.</message>
<property>additional.fuse.repos</property>
<requireProperty>
<message>When running fuse tests 'additional.fuse.repos' is expected to be set.</message>
<property>additional.fuse.repos</property>
</requireProperty>
</rules>
</configuration>

5
testsuite/integration-arquillian/util/pom.xml
View file

@ -50,6 +50,11 @@
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-karaf-managed</artifactId>
</dependency>
<dependency>
<groupId>org.apache.maven.resolver</groupId>
<artifactId>maven-resolver-api</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-osgi</artifactId>

2
testsuite/performance/README.md
View file

@ -2,7 +2,7 @@
## Requirements:
- Bash 2.05+
- Maven 3.1.1+
- Maven 3.5.4+
- Keycloak server distribution installed in the local Maven repository. To do this run `mvn install -Pdistribution` from the root of the Keycloak project.
### Docker Compose Provisioner