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

[KEYCLOAK-3837] fix to spring boot test application for jenkins

Browse source
This commit is contained in:
wyvie 2017-11-27 01:01:34 +01:00
parent e4a6ee19d1
commit 6035e5c831
2 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
testsuite/integration-arquillian/test-apps/spring-boot-adapter/pom.xml
View file

@ -24,6 +24,8 @@
<java.version>1.8</java.version> <java.version>1.8</java.version>
<keycloak.version>3.3.0.CR1-SNAPSHOT</keycloak.version> <keycloak.version>3.3.0.CR1-SNAPSHOT</keycloak.version>
<repo.url />
</properties> </properties>
<dependencies> <dependencies>
@ -119,8 +121,25 @@
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile>
<id>repo-url</id>
<activation>
<property>
<name>repo.url</name>
</property>
</activation>
<repositories>
<repository>
<id>custom-repo</id>
<name>custom repo</name>
<url>${repo.url}</url>
</repository>
</repositories>
</profile>
</profiles> </profiles>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

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

@ -15,6 +15,8 @@
<exclude.springboot>**/springboot/**/*Test.java</exclude.springboot> <exclude.springboot>**/springboot/**/*Test.java</exclude.springboot>
<adapter.container>tomcat</adapter.container> <adapter.container>tomcat</adapter.container>
<repo.argument />
</properties> </properties>
<dependencies> <dependencies>
@ -67,6 +69,8 @@
<argument>spring-boot:run</argument> <argument>spring-boot:run</argument>
<argument>-Dkeycloak.version=${project.version}</argument> <argument>-Dkeycloak.version=${project.version}</argument>
<argument>-Pspring-boot-adapter-${adapter.container}</argument> <argument>-Pspring-boot-adapter-${adapter.container}</argument>
<argument>-Dmaven.repo.local=${settings.localRepository}</argument>
<argument>${repo.argument}</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>
@ -83,6 +87,18 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile>
<id>turn-on-repo-url</id>
<activation>
<property>
<name>repo.url</name>
</property>
</activation>
<properties>
<repo.argument>-Drepo.url=${repo.url}</repo.argument>
</properties>
</profile>
</profiles> </profiles>