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

[KEYCLOAK-14953] Additional updates to the new Galleon feature pack:

Browse source 
- Adjust feature pack to depend on "wildfly-galleon-pack".
 - Declare dependency from "keycloak-client-oidc" on "undertow" and "ee" layers.
 - Update name of layer to "keycloak-client-oidc".
 - Update the producer to match the group and artifact ID of the maven artifact.
This commit is contained in:
Darran Lofthouse 2020-08-21 17:23:26 +01:00 committed by Stian Thorgersen
parent 6a5c1defe1
commit 64b8bca9d7
4 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -258,13 +258,13 @@
<properties>
<galleon-adapter-group-id>org.keycloak</galleon-adapter-group-id>
<version.org.wildfly>20.0.0.Final</version.org.wildfly>
<version.org.wildfly.core>12.0.0.Final</version.org.wildfly.core>
<version.org.wildfly.common>1.5.1.Final</version.org.wildfly.common>
<version.org.wildfly.core>12.0.1.Final</version.org.wildfly.core>
<version.org.wildfly.common>1.5.4.Final</version.org.wildfly.common>
</properties>
<dependencies>
<dependency>
<groupId>org.wildfly</groupId>
<artifactId>wildfly-ee-galleon-pack</artifactId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${version.org.wildfly}</version>
<type>zip</type>
<scope>provided</scope>
@ -287,7 +287,7 @@
<dependencies>
<dependency>
<groupId>org.jboss.eap</groupId>
<artifactId>wildfly-ee-galleon-pack</artifactId>
<artifactId>wildfly-galleon-pack</artifactId>
<version>${version.org.jboss.eap}</version>
<type>zip</type>
<scope>provided</scope>

4
distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-elytron-oidc/layer-spec.xml → distribution/galleon-feature-packs/adapter-galleon-pack/src/main/resources/layers/standalone/keycloak-client-oidc/layer-spec.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0" ?>
<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="keycloak-elytron-oidc">
<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="keycloak-client-oidc">
<dependencies>
<layer name="ee"/>
<layer name="elytron"/>
<layer name="undertow"/>
</dependencies>
<feature spec="subsystem.keycloak"/>
<feature spec="subsystem.elytron.custom-realm">

11
distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build-eap.xml
View file

@ -30,10 +30,17 @@
</packages>
<default-configs inherit="false"/>
</dependency>
</transitive>
<dependencies>
<dependency group-id="org.jboss.eap" artifact-id="wildfly-ee-galleon-pack">
<name>org.jboss.eap:wildfly-ee-galleon-pack</name>
<packages inherit="false">
<exclude name="product.conf"/>
</packages>
<default-configs inherit="false"/>
</dependency>
</transitive>
<dependencies>
<dependency group-id="org.jboss.eap" artifact-id="wildfly-galleon-pack">
<name>org.jboss.eap:wildfly-galleon-pack</name>
<packages inherit="false">
<exclude name="product.conf"/>
</packages>

13
distribution/galleon-feature-packs/adapter-galleon-pack/wildfly-feature-pack-build.xml
View file

@ -14,7 +14,7 @@
~ limitations under the License.
-->
<build xmlns="urn:wildfly:feature-pack-build:3.0" producer="org.keycloak:keycloak-galleon-pack">
<build xmlns="urn:wildfly:feature-pack-build:3.0" producer="org.keycloak:keycloak-adapter-galleon-pack">
<transitive>
<dependency group-id="org.wildfly.core" artifact-id="wildfly-core-galleon-pack">
<name>org.wildfly.core:wildfly-core-galleon-pack</name>
@ -30,8 +30,6 @@
</packages>
<default-configs inherit="false"/>
</dependency>
</transitive>
<dependencies>
<dependency group-id="org.wildfly" artifact-id="wildfly-ee-galleon-pack">
<name>org.wildfly:wildfly-ee-galleon-pack</name>
<packages inherit="false">
@ -39,6 +37,15 @@
</packages>
<default-configs inherit="false"/>
</dependency>
</transitive>
<dependencies>
<dependency group-id="org.wildfly" artifact-id="wildfly-galleon-pack">
<name>org.wildfly:wildfly-galleon-pack</name>
<packages inherit="false">
<exclude name="product.conf"/>
</packages>
<default-configs inherit="false"/>
</dependency>
</dependencies>
<default-packages>
<package name="modules.all"/>