Merge pull request #2073 from stianst/master

KEYCLOAK-2312 Move client-registration libs into integration
This commit is contained in:
Stian Thorgersen 2016-01-21 09:48:06 +01:00
commit 82a260b18a
18 changed files with 4 additions and 24 deletions

View file

@ -1,19 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
</parent>
<name>Keycloak Client Registration Parent</name>
<description/>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-client-registration-parent</artifactId>
<packaging>pom</packaging>
<modules>
<module>api</module>
<!--<module>cli</module>-->
</modules>
</project>

View file

@ -3,10 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>keycloak-parent</artifactId>
<artifactId>keycloak-integration-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

View file

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>keycloak-client-registration-parent</artifactId>
<artifactId>keycloak-integration-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version>
</parent>

View file

@ -10,10 +10,11 @@
<description/>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-integration-pom</artifactId>
<artifactId>keycloak-integration-parent</artifactId>
<packaging>pom</packaging>
<modules>
<module>admin-client</module>
<module>client-registration</module>
</modules>
</project>

View file

@ -139,7 +139,6 @@
<modules>
<module>common</module>
<module>core</module>
<module>client-registration</module>
<module>dependencies</module>
<module>server-spi</module>
<module>saml</module>