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

task: combine the kcreg and kcadmin modules (#28918)

Browse source 
closes #28904

Signed-off-by: Steve Hawkins <shawkins@redhat.com>
This commit is contained in:
Steven Hawkins 2024-04-25 14:08:45 -04:00 committed by GitHub
parent d34e700fef
commit f42185b319
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 12 additions and 171 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
integration/client-cli/admin-cli/pom.xml
View file

@ -93,13 +93,20 @@
<include>org/keycloak/representations/idm/IdentityProviderRepresentation.class</include> <include>org/keycloak/representations/idm/IdentityProviderRepresentation.class</include>
<include>org/keycloak/representations/idm/authorization/**</include> <include>org/keycloak/representations/idm/authorization/**</include>
--> -->
<include>org/keycloak/representations/oidc/OIDCClientRepresentation.class</include>
<include>org/keycloak/representations/idm/**</include> <include>org/keycloak/representations/idm/**</include>
<include>org/keycloak/representations/JsonWebToken.class</include> <include>org/keycloak/representations/JsonWebToken.class</include>
<include>org/keycloak/Token.class</include> <include>org/keycloak/Token.class</include>
<include>org/keycloak/TokenCategory.class</include> <include>org/keycloak/TokenCategory.class</include>
</includes> </includes>
</filter> </filter>
<filter>
<artifact>org.keycloak:keycloak-common</artifact>
<includes>
<include>org/keycloak/common/util/**</include>
<include>org/keycloak/common/crypto/**</include>
</includes>
</filter>
<filter> <filter>
<artifact>com.fasterxml.jackson.core:jackson-core</artifact> <artifact>com.fasterxml.jackson.core:jackson-core</artifact>
<includes> <includes>
@ -118,24 +125,6 @@
<include>com/fasterxml/jackson/annotation/**</include> <include>com/fasterxml/jackson/annotation/**</include>
</includes> </includes>
</filter> </filter>
<filter>
<artifact>org.jboss.resteasy:resteasy-client</artifact>
<includes>
<include>**/**</include>
</includes>
</filter>
<filter>
<artifact>org.jboss.resteasy:resteasy-core</artifact>
<includes>
<include>**/**</include>
</includes>
</filter>
<filter>
<artifact>org.jboss.resteasy:resteasy-jackson2-provider</artifact>
<includes>
<include>**/**</include>
</includes>
</filter>
<filter> <filter>
<artifact>jakarta.ws.rs:jakarta.ws.rs-api</artifact> <artifact>jakarta.ws.rs:jakarta.ws.rs-api</artifact>
<includes> <includes>

2
integration/client-cli/client-registration-cli/src/main/bin/kcreg.bat → integration/client-cli/admin-cli/src/main/bin/kcreg.bat
View file

@ -25,6 +25,6 @@ if "x%JAVA%" == "x" (
) )
) )
"%JAVA%" %KC_OPTS% -cp "%DIRNAME%\client\keycloak-client-registration-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.registration.cli.KcRegMain %* "%JAVA%" %KC_OPTS% -cp "%DIRNAME%\client\keycloak-admin-cli-${project.version}.jar" --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir="%DIRNAME%\client\lib" org.keycloak.client.registration.cli.KcRegMain %*
:END :END

2
integration/client-cli/client-registration-cli/src/main/bin/kcreg.sh → integration/client-cli/admin-cli/src/main/bin/kcreg.sh
View file

@ -27,4 +27,4 @@ if [ -z "$JAVA" ]; then
fi fi
DIRNAME="$(dirname "$RESOLVED_NAME")" DIRNAME="$(dirname "$RESOLVED_NAME")"
exec "$JAVA" $KC_OPTS -cp $DIRNAME/client/keycloak-client-registration-cli-${project.version}.jar --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir=$DIRNAME/client/lib org.keycloak.client.registration.cli.KcRegMain "$@" exec "$JAVA" $KC_OPTS -cp $DIRNAME/client/keycloak-admin-cli-${project.version}.jar --add-opens=java.base/java.security=ALL-UNNAMED -Dkc.lib.dir=$DIRNAME/client/lib org.keycloak.client.registration.cli.KcRegMain "$@"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

0
integration/client-cli/client-registration-cli/src/test/java/org/keycloak/client/registration/cli/ReflectionUtilTest.java → integration/client-cli/admin-cli/src/test/java/org/keycloak/client/registration/cli/ReflectionUtilTest.java
View file

5
integration/client-cli/client-cli-dist/assembly.xml
View file

@ -26,13 +26,13 @@
<files> <files>
<file> <file>
<source>../client-registration-cli/src/main/bin/kcreg.sh</source> <source>../admin-cli/src/main/bin/kcreg.sh</source>
<outputDirectory>keycloak-client-tools/bin</outputDirectory> <outputDirectory>keycloak-client-tools/bin</outputDirectory>
<fileMode>0755</fileMode> <fileMode>0755</fileMode>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>
<file> <file>
<source>../client-registration-cli/src/main/bin/kcreg.bat</source> <source>../admin-cli/src/main/bin/kcreg.bat</source>
<outputDirectory>keycloak-client-tools/bin</outputDirectory> <outputDirectory>keycloak-client-tools/bin</outputDirectory>
<filtered>true</filtered> <filtered>true</filtered>
</file> </file>
@ -51,7 +51,6 @@
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<includes> <includes>
<include>org.keycloak:keycloak-client-registration-cli</include>
<include>org.keycloak:keycloak-admin-cli</include> <include>org.keycloak:keycloak-admin-cli</include>
</includes> </includes>
<outputDirectory>keycloak-client-tools/bin/client</outputDirectory> <outputDirectory>keycloak-client-tools/bin/client</outputDirectory>

4
integration/client-cli/client-cli-dist/pom.xml
View file

@ -30,10 +30,6 @@
<description/> <description/>
<dependencies> <dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-client-registration-cli</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-cli</artifactId> <artifactId>keycloak-admin-cli</artifactId>

137
integration/client-cli/client-registration-cli/pom.xml
View file

@ -1,137 +0,0 @@
<?xml version="1.0"?>
<!--
~ Copyright 2016 Red Hat, Inc. and/or its affiliates
~ and other contributors as indicated by the @author tags.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<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-cli-parent</artifactId>
<groupId>org.keycloak</groupId>
<version>999.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>keycloak-client-registration-cli</artifactId>
<name>Keycloak Client Registration CLI</name>
<description/>
<dependencies>
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-cli</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-core</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>commons-logging-jboss-logging</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<filters>
<filter>
<artifact>org.keycloak:keycloak-core</artifact>
<includes>
<include>org/keycloak/util/**</include>
<include>org/keycloak/crypto/**</include>
<include>org/keycloak/json/**</include>
<include>org/keycloak/jose/**</include>
<include>org/keycloak/representations/adapters/config/**</include>
<include>org/keycloak/representations/AccessTokenResponse.class</include>
<include>org/keycloak/representations/idm/ClientRepresentation.class</include>
<include>org/keycloak/representations/idm/ProtocolMapperRepresentation.class</include>
<include>org/keycloak/representations/oidc/OIDCClientRepresentation.class</include>
<include>org/keycloak/representations/idm/authorization/**</include>
<include>org/keycloak/representations/JsonWebToken.class</include>
<include>org/keycloak/Token.class</include>
<include>org/keycloak/TokenCategory.class</include>
</includes>
</filter>
<filter>
<artifact>org.keycloak:keycloak-common</artifact>
<includes>
<include>org/keycloak/common/util/**</include>
<include>org/keycloak/common/crypto/**</include>
</includes>
</filter>
<filter>
<artifact>com.fasterxml.jackson.core:jackson-core</artifact>
<includes>
<include>**/**</include>
</includes>
</filter>
<filter>
<artifact>com.fasterxml.jackson.core:jackson-databind</artifact>
<includes>
<include>**/**</include>
</includes>
</filter>
<filter>
<artifact>com.fasterxml.jackson.core:jackson-annotations</artifact>
<includes>
<include>com/fasterxml/jackson/annotation/**</include>
</includes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

1
integration/client-cli/pom.xml
View file

@ -31,7 +31,6 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>client-registration-cli</module>
<module>admin-cli</module> <module>admin-cli</module>
<module>client-cli-dist</module> <module>client-cli-dist</module>
</modules> </modules>

5
pom.xml
View file

@ -1529,11 +1529,6 @@
<version>${project.version}</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-client-registration-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-crypto-default</artifactId> <artifactId>keycloak-crypto-default</artifactId>