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

KEYCLOAK-4933 Fixes

Browse source
This commit is contained in:
Stian Thorgersen 2017-05-16 13:52:42 +02:00
parent 56d68c17f5
commit 6d8a3f7a8b
13 changed files with 140 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
distribution/adapters/wildfly-adapter/assembly.xml
View file

@ -59,13 +59,6 @@
</includes> </includes>
<fileMode>0444</fileMode> <fileMode>0444</fileMode>
</fileSet> </fileSet>
<fileSet>
<directory>cli</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*.*</include>
</includes>
</fileSet>
<fileSet> <fileSet>
<directory>src/main/modules</directory> <directory>src/main/modules</directory>
<outputDirectory>modules</outputDirectory> <outputDirectory>modules</outputDirectory>
@ -74,5 +67,23 @@
</includes> </includes>
</fileSet> </fileSet>
</fileSets> </fileSets>
<files>
<file>
<source>../shared-cli/adapter-install.cli</source>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>cli/adapter-install-offline.cli</source>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>../shared-cli/adapter-elytron-install.cli</source>
<outputDirectory>bin</outputDirectory>
</file>
<file>
<source>cli/adapter-elytron-install-offline.cli</source>
<outputDirectory>bin</outputDirectory>
</file>
</files>
</assembly> </assembly>

4
distribution/feature-packs/adapter-feature-pack/pom.xml
View file

@ -39,6 +39,10 @@
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-adapter</artifactId> <artifactId>keycloak-wildfly-adapter</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-elytron-oidc-adapter</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-servlet-oauth-client</artifactId> <artifactId>keycloak-servlet-oauth-client</artifactId>

29
distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/bouncycastle/main/module.xml
View file

@ -1,29 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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.
-->
<module xmlns="urn:jboss:module:1.3" name="org.bouncycastle">
<resources>
<artifact name="${org.bouncycastle:bcprov-jdk15on}"/>
<artifact name="${org.bouncycastle:bcpkix-jdk15on}"/>
</resources>
<dependencies>
<module name="javax.api"/>
</dependencies>
</module>

6
distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-adapter-spi/main/module.xml
View file

@ -26,13 +26,13 @@
</resources> </resources>
<dependencies> <dependencies>
<module name="javax.api"/> <module name="javax.api"/>
<module name="org.keycloak.keycloak-common"/>
<module name="org.apache.httpcomponents"/>
<module name="javax.servlet.api"/>
<module name="org.jboss.logging"/> <module name="org.jboss.logging"/>
<module name="org.jboss.xnio"/> <module name="org.jboss.xnio"/>
<module name="io.undertow.core"/> <module name="io.undertow.core"/>
<module name="io.undertow.servlet"/> <module name="io.undertow.servlet"/>
<module name="javax.servlet.api"/>
<module name="org.bouncycastle" />
<module name="org.keycloak.keycloak-common"/>
</dependencies> </dependencies>
</module> </module>

28
distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-authz-client/main/module.xml
View file

@ -3,20 +3,20 @@
<!-- <!--
~ * Copyright 2016 Red Hat, Inc. and/or its affiliates ~ Copyright 2016 Red Hat, Inc. and/or its affiliates
~ * and other contributors as indicated by the @author tags. ~ and other contributors as indicated by the @author tags.
~ * ~
~ * Licensed under the Apache License, Version 2.0 (the "License"); ~ Licensed under the Apache License, Version 2.0 (the "License");
~ * you may not use this file except in compliance with the License. ~ you may not use this file except in compliance with the License.
~ * You may obtain a copy of the License at ~ You may obtain a copy of the License at
~ * ~
~ * http://www.apache.org/licenses/LICENSE-2.0 ~ http://www.apache.org/licenses/LICENSE-2.0
~ * ~
~ * Unless required by applicable law or agreed to in writing, software ~ Unless required by applicable law or agreed to in writing, software
~ * distributed under the License is distributed on an "AS IS" BASIS, ~ distributed under the License is distributed on an "AS IS" BASIS,
~ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ * See the License for the specific language governing permissions and ~ See the License for the specific language governing permissions and
~ * limitations under the License. ~ limitations under the License.
--> -->
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-authz-client"> <module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-authz-client">

1
distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-jboss-adapter-core/main/module.xml
View file

@ -29,6 +29,7 @@
<module name="org.picketbox"/> <module name="org.picketbox"/>
<module name="org.keycloak.keycloak-adapter-spi"/> <module name="org.keycloak.keycloak-adapter-spi"/>
<module name="org.keycloak.keycloak-common"/> <module name="org.keycloak.keycloak-common"/>
<module name="org.apache.httpcomponents"/>
</dependencies> </dependencies>
</module> </module>

50
distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-elytron-oidc-adapter/main/module.xml Executable file
View file

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ 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.
-->
<module xmlns="urn:jboss:module:1.3" name="org.keycloak.keycloak-wildfly-elytron-oidc-adapter">
<properties>
<property name="jboss.api" value="private"/>
</properties>
<resources>
<artifact name="${org.keycloak:keycloak-wildfly-elytron-oidc-adapter}"/>
</resources>
<dependencies>
<module name="javax.api"/>
<module name="org.bouncycastle" />
<module name="com.fasterxml.jackson.core.jackson-annotations"/>
<module name="com.fasterxml.jackson.core.jackson-core"/>
<module name="com.fasterxml.jackson.core.jackson-databind"/>
<module name="com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider"/>
<module name="org.apache.httpcomponents"/>
<module name="javax.servlet.api"/>
<module name="org.jboss.logging"/>
<module name="io.undertow.core"/>
<module name="io.undertow.servlet"/>
<module name="org.picketbox"/>
<module name="org.keycloak.keycloak-undertow-adapter"/>
<module name="org.keycloak.keycloak-adapter-spi"/>
<module name="org.keycloak.keycloak-adapter-core"/>
<module name="org.keycloak.keycloak-core"/>
<module name="org.keycloak.keycloak-common"/>
<module name="org.wildfly.security.elytron"/>
</dependencies>
</module>

2
distribution/feature-packs/adapter-feature-pack/src/main/resources/modules/system/add-ons/keycloak/org/keycloak/keycloak-wildfly-subsystem/main/module.xml
View file

@ -21,8 +21,8 @@
<properties> <properties>
<property name="jboss.api" value="private"/> <property name="jboss.api" value="private"/>
</properties> </properties>
<resources> <resources>
<resource-root path="."/>
<artifact name="${org.keycloak:keycloak-wildfly-subsystem}"/> <artifact name="${org.keycloak:keycloak-wildfly-subsystem}"/>
</resources> </resources>

20
distribution/server-overlay/assembly.xml
View file

@ -39,6 +39,10 @@
<outputDirectory/> <outputDirectory/>
<filtered>false</filtered> <filtered>false</filtered>
<excludes> <excludes>
<exclude>.installation</exclude>
<exclude>docs/**</exclude>
<exclude>domain/**</exclude>
<exclude>standalone/**</exclude>
<exclude>bin/*.sh</exclude> <exclude>bin/*.sh</exclude>
<exclude>module.xml</exclude> <exclude>module.xml</exclude>
<exclude>welcome-content/**</exclude> <exclude>welcome-content/**</exclude>
@ -81,6 +85,22 @@
<include>layers.conf</include> <include>layers.conf</include>
</includes> </includes>
</fileSet> </fileSet>
<fileSet>
<directory>src/main</directory>
<outputDirectory></outputDirectory>
<includes>
<include>README.txt</include>
</includes>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>target/cli</directory>
<outputDirectory>bin</outputDirectory>
<includes>
<include>*.cli</include>
</includes>
<filtered>true</filtered>
</fileSet>
</fileSets> </fileSets>
<files> <files>

25
distribution/server-overlay/pom.xml
View file

@ -44,6 +44,31 @@
<build> <build>
<plugins> <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>unpack</id>
<phase>compile</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-wildfly-server-subsystem</artifactId>
<version>${project.version}</version>
<type>jar</type>
<includes>cli/*.cli</includes>
<outputDirectory>${project.build.directory}</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<groupId>org.wildfly.build</groupId> <groupId>org.wildfly.build</groupId>
<artifactId>wildfly-server-provisioning-maven-plugin</artifactId> <artifactId>wildfly-server-provisioning-maven-plugin</artifactId>

4
pom.xml
View file

@ -46,9 +46,9 @@
<wildfly.version>10.0.0.Final</wildfly.version> <wildfly.version>10.0.0.Final</wildfly.version>
<wildfly.build-tools.version>1.2.2.Final</wildfly.build-tools.version> <wildfly.build-tools.version>1.2.2.Final</wildfly.build-tools.version>
<wildfly11.version>11.0.0.Alpha1</wildfly11.version> <!-- for testing with wf11 pre-releases --> <wildfly11.version>11.0.0.Alpha1</wildfly11.version> <!-- for testing with wf11 pre-releases -->
<wildfly11.build-tools.version>1.1.8.Final</wildfly11.build-tools.version> <wildfly11.build-tools.version>1.2.2.Final</wildfly11.build-tools.version>
<eap.version>7.1.0.Beta1-redhat-2</eap.version> <eap.version>7.1.0.Beta1-redhat-2</eap.version>
<eap.build-tools.version>1.1.8.Final</eap.build-tools.version> <eap.build-tools.version>1.2.2.Final</eap.build-tools.version>
<wildfly.core.version>2.0.10.Final</wildfly.core.version> <wildfly.core.version>2.0.10.Final</wildfly.core.version>
<version.org.wildfly.security.wildfly-elytron>1.1.0.Beta32</version.org.wildfly.security.wildfly-elytron> <version.org.wildfly.security.wildfly-elytron>1.1.0.Beta32</version.org.wildfly.security.wildfly-elytron>