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

Merge pull request #2073 from stianst/master

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

19
client-registration/pom.xml
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>

3
integration/admin-client/pom.xml
View file

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

0
client-registration/cli/pom.xml → integration/client-registration-cli/pom.xml
View file

0
client-registration/cli/src/main/java/org/keycloak/client/registration/cli/ClientRegistrationCLI.java → integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/ClientRegistrationCLI.java
View file

0
client-registration/cli/src/main/java/org/keycloak/client/registration/cli/Context.java → integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/Context.java
View file

0
client-registration/cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCommand.java → integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/CreateCommand.java
View file

0
client-registration/cli/src/main/java/org/keycloak/client/registration/cli/commands/ExitCommand.java → integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/ExitCommand.java
View file

0
client-registration/cli/src/main/java/org/keycloak/client/registration/cli/commands/SetupCommand.java → integration/client-registration-cli/src/main/java/org/keycloak/client/registration/cli/commands/SetupCommand.java
View file

2
client-registration/api/pom.xml → integration/client-registration/pom.xml
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" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<artifactId>keycloak-client-registration-parent</artifactId> <artifactId>keycloak-integration-parent</artifactId>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<version>1.9.0.CR1-SNAPSHOT</version> <version>1.9.0.CR1-SNAPSHOT</version>
</parent> </parent>

0
client-registration/api/src/main/java/org/keycloak/client/registration/Auth.java → integration/client-registration/src/main/java/org/keycloak/client/registration/Auth.java
View file

0
client-registration/api/src/main/java/org/keycloak/client/registration/ClientRegistration.java → integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistration.java
View file

0
client-registration/api/src/main/java/org/keycloak/client/registration/ClientRegistrationException.java → integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRegistrationException.java
View file

0
client-registration/api/src/main/java/org/keycloak/client/registration/ClientRepresentationMixIn.java → integration/client-registration/src/main/java/org/keycloak/client/registration/ClientRepresentationMixIn.java
View file

0
client-registration/api/src/main/java/org/keycloak/client/registration/HttpErrorException.java → integration/client-registration/src/main/java/org/keycloak/client/registration/HttpErrorException.java
View file

0
client-registration/api/src/main/java/org/keycloak/client/registration/HttpUtil.java → integration/client-registration/src/main/java/org/keycloak/client/registration/HttpUtil.java
View file

0
client-registration/api/src/main/java/org/keycloak/client/registration/OIDCClientRepresentationMixIn.java → integration/client-registration/src/main/java/org/keycloak/client/registration/OIDCClientRepresentationMixIn.java
View file

3
integration/pom.xml
View file

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

1
pom.xml
View file

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