KEYCLOAK-17502 Galleon Server Pack dependencies adjust to EAP 7.4.0

distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml

@@ -281,7 +281,7 @@
             <dependencies>
                 <dependency>
                     <groupId>org.jboss.eap</groupId>
-                    <artifactId>wildfly-galleon-pack</artifactId>
+                    <artifactId>wildfly-ee-galleon-pack</artifactId>
                     <version>${eap.version}</version>
                     <type>zip</type>
                     <scope>provided</scope>

distribution/galleon-feature-packs/pom.xml

@@ -33,5 +33,6 @@
     <modules>
         <module>adapter-galleon-pack</module>
         <module>server-galleon-pack</module>
-   </modules>
+    </modules>
+
 </project>

distribution/galleon-feature-packs/server-galleon-pack/pom.xml

@@ -79,14 +79,88 @@
         </dependency>
 
         <dependency>
-            <groupId>org.wildfly</groupId>
+            <groupId>${ee.maven.groupId}</groupId>
+            <artifactId>wildfly-servlet-feature-pack-common</artifactId>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${ee.maven.groupId}</groupId>
+            <artifactId>wildfly-servlet-feature-pack-ee-8-api</artifactId>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${ee.maven.groupId}</groupId>
+            <artifactId>wildfly-servlet-feature-pack-galleon-common</artifactId>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${ee.maven.groupId}</groupId>
+            <artifactId>wildfly-servlet-feature-pack-galleon-legacy</artifactId>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${ee.maven.groupId}</groupId>
+            <artifactId>wildfly-ee-feature-pack-common</artifactId>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${ee.maven.groupId}</groupId>
+            <artifactId>wildfly-ee-feature-pack-ee-8-api</artifactId>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${ee.maven.groupId}</groupId>
+            <artifactId>wildfly-ee-feature-pack-galleon-common</artifactId>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${ee.maven.groupId}</groupId>
+            <artifactId>wildfly-ee-feature-pack-galleon-content</artifactId>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${ee.maven.groupId}</groupId>
+            <artifactId>wildfly-ee-feature-pack-pruned</artifactId>
+            <version>${ee.maven.version}</version>
+            <type>pom</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>${ee.maven.groupId}</groupId>
             <artifactId>wildfly-ee-galleon-pack</artifactId>
+            <version>${ee.maven.version}</version>
             <type>zip</type>
         </dependency>
 
         <dependency>
-            <groupId>org.wildfly</groupId>
+            <groupId>${ee.maven.groupId}</groupId>
             <artifactId>wildfly-servlet-galleon-pack</artifactId>
+            <version>${ee.maven.version}</version>
             <type>zip</type>
         </dependency>
 
@@ -277,13 +351,14 @@
                         <configuration>
                             <release-name>Keycloak</release-name>
                             <fork-embedded>${galleon.fork.embedded}</fork-embedded>
-                            <config-file>keycloak-server-galleon-pack-build.xml</config-file>
+                            <config-file>${product.slot}-server-galleon-pack-build.xml</config-file>
                             <task-properties>
                                 <product.name>${product.name}</product.name>
                                 <product.name.full>${product.name.full}</product.name.full>
                                 <product.slot>${product.slot}</product.slot>
                                 <product.wildfly.console.slot>${product.wildfly.console.slot}</product.wildfly.console.slot>
                                 <product.version>${project.version}</product.version>
+                                <product.rhsso.version>${product.rhsso.version}</product.rhsso.version>
                                 <client-cli.src.dir>${project.basedir}</client-cli.src.dir>
                             </task-properties>
                         </configuration>
@@ -330,14 +405,14 @@
             </activation>
 
             <properties>
-                <feature.parent>org.jboss.eap:wildfly-galleon-pack</feature.parent>
+                <feature.parent>${ee.maven.groupId}:wildfly-ee-galleon-pack</feature.parent>
             </properties>
 
             <dependencies>
                 <dependency>
-                    <groupId>org.jboss.eap</groupId>
+                    <groupId>${ee.maven.groupId}</groupId>
-                    <artifactId>wildfly-galleon-pack</artifactId>
+                    <artifactId>wildfly-ee-galleon-pack</artifactId>
-                    <version>${eap.version}</version>
+                    <version>${ee.maven.version}</version>
                     <type>zip</type>
                     <exclusions>
                         <exclusion>
@@ -376,9 +451,20 @@
                                                 <exclude>sun.jdk:jconsole</exclude>
                                                 <!-- Ignore the shared resource poms as those we want their
                                                      transitives. Those poms ban transitives at their level -->
-                                                <exclude>org.keycloak:keycloak-server-feature-pack-dependencies</exclude>
                                                 <exclude>org.wildfly.core:wildfly-core-feature-pack-common</exclude>
                                                 <exclude>org.wildfly.core:wildfly-core-feature-pack-ee-8-api</exclude>
+                                                <exclude>org.wildfly.core:wildfly-core-feature-pack-galleon-pruned</exclude>
+                                                <exclude>org.wildfly.core:wildfly-core-feature-pack-galleon-common</exclude>
+                                                <exclude>${ee.maven.groupId}:wildfly-servlet-feature-pack-common</exclude>
+                                                <exclude>${ee.maven.groupId}:wildfly-servlet-feature-pack-ee-8-api</exclude>
+                                                <exclude>${ee.maven.groupId}:wildfly-servlet-feature-pack-galleon-legacy</exclude>
+                                                <exclude>${ee.maven.groupId}:wildfly-ee-feature-pack-common</exclude>
+                                                <exclude>${ee.maven.groupId}:wildfly-ee-feature-pack-ee-8-api</exclude>
+                                                <exclude>${ee.maven.groupId}:wildfly-ee-feature-pack-pruned</exclude>
+                                                <exclude>${ee.maven.groupId}:wildfly-ee-feature-pack-galleon-content</exclude>
+                                                <!-- Ignore the shared resource poms as those we want their
+                                                     transitives. Those poms ban transitives at their level -->
+                                                <exclude>org.keycloak:keycloak-server-feature-pack-dependencies</exclude>
                                                 <exclude>org.keycloak:keycloak-client-registration-cli</exclude>
                                                 <exclude>org.keycloak:keycloak-admin-cli</exclude>
                                             </excludes>

distribution/galleon-feature-packs/server-galleon-pack/rh-sso-server-galleon-pack-build.xml

@@ -0,0 +1,77 @@
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2021, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<build xmlns="urn:wildfly:feature-pack-build:3.1" producer="sso@maven(org.jboss.universe:product-universe):current">
+    <transitive>
+        <dependency group-id="org.jboss.eap" artifact-id="wildfly-ee-galleon-pack">
+            <name>org.wildfly:wildfly-ee-galleon-pack</name>
+            <packages inherit="false">
+                <include name="docs.examples"/>
+                <exclude name="product.conf"/>
+            </packages>
+            <default-configs inherit="false"/>
+        </dependency>
+    </transitive>
+    <dependencies>
+        <dependency group-id="org.jboss.eap" artifact-id="wildfly-ee-galleon-pack">
+            <name>org.wildfly:wildfly-ee-galleon-pack</name>
+            <packages inherit="false">
+                <include name="docs.examples"/>
+                <exclude name="product.conf"/>
+            </packages>
+            <default-configs inherit="false"/>
+        </dependency>
+    </dependencies>
+    <default-packages>
+        <package name="modules.all"/>
+        <package name="docs.licenses"/>
+        <package name="docs-examples"/>
+        <package name="root"/>
+        <package name="welcome-content-keycloak"/>
+    </default-packages>
+    <package-schemas>
+        <group name="org.keycloak"/>
+    </package-schemas>
+
+    <config name="standalone.xml" model="standalone"/>
+    <config name="standalone-ha.xml" model="standalone"/>
+    <config name="domain.xml" model="domain"/>
+    <config name="host.xml" model="host"/>
+    <config name="host-master.xml" model="host"/>
+    <config name="host-slave.xml" model="host"/>
+
+    <plugins>
+        <plugin artifact="org.wildfly.galleon-plugins:wildfly-galleon-plugins"/>
+    </plugins>
+
+    <generate-feature-specs>
+        <extensions>
+            <standalone>
+                <extension>org.keycloak.keycloak-server-subsystem</extension>
+            </standalone>
+            <domain>
+                <extension>org.keycloak.keycloak-server-subsystem</extension>
+            </domain>
+        </extensions>
+    </generate-feature-specs>
+
+</build>

distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/packages/identity/content/modules/system/layers/keycloak/org/jboss/as/product/keycloak/module.xml

@@ -1 +0,0 @@
-// placeholder file: content copied by tasks.xml from src/main/resources/packages/identity/pm/wildfly/resources/modules/system/layers/keycloak/org/jboss/as/product/keycloak/module.xml

distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/packages/identity/pm/wildfly/resources/identity-app/keycloak/module.xml

@@ -15,7 +15,7 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.product" slot="${product.slot}">
+<module xmlns="urn:jboss:module:1.3" name="org.jboss.as.product" slot="keycloak">
     <properties>
         <property name="jboss.api" value="private"/>
     </properties>

distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/packages/identity/pm/wildfly/resources/identity-app/rh-sso/dir/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+JBoss-Product-Release-Name: ${product.name.full}
+JBoss-Product-Release-Version: ${product.rhsso.version}
+JBoss-Product-Console-Slot: ${product.wildfly.console.slot}

distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/packages/identity/pm/wildfly/resources/identity-app/rh-sso/module.xml

@@ -0,0 +1,26 @@
+<?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.jboss.as.product" slot="rh-sso">
+    <properties>
+        <property name="jboss.api" value="private"/>
+    </properties>
+
+    <resources>
+        <resource-root path="dir"/>
+    </resources>
+</module>

distribution/galleon-feature-packs/server-galleon-pack/src/main/resources/packages/identity/pm/wildfly/tasks.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" ?>
 
 <tasks xmlns="urn:wildfly:wildfly-feature-pack-tasks:2.0">
-    <copy-path src="resources" replace-props="true"/>
+    <copy-path src="resources/bin" replace-props="true" relative-to="resources" target="bin"/>
+    <!-- keycloak or rh-sso path will be deleted later after server provision -->
+    <copy-path src="resources/identity-app/keycloak" replace-props="true" relative-to="resources" target="modules/system/layers/keycloak/org/jboss/as/product/keycloak"/>
+    <copy-path src="resources/identity-app/rh-sso" replace-props="true" relative-to="resources" target="modules/system/layers/keycloak/org/jboss/as/product/rh-sso"/>
+    <delete path="modules/system/layers/keycloak/org/jboss/as/product/placeholder.txt"/>
 </tasks>

distribution/server-dist/pom.xml

@@ -41,16 +41,18 @@
     <packaging>pom</packaging>
 
     <dependencies>
-        <dependency>
+         <dependency>
-            <groupId>org.wildfly</groupId>
+             <groupId>${ee.maven.groupId}</groupId>
-            <artifactId>wildfly-galleon-pack</artifactId>
+             <artifactId>wildfly-ee-galleon-pack</artifactId>
-            <type>pom</type>
+             <version>${ee.maven.version}</version>
-            <scope>provided</scope>
+             <type>pom</type>
+             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wildfly</groupId>
+            <groupId>${ee.maven.groupId}</groupId>
-            <artifactId>wildfly-galleon-pack</artifactId>
+            <artifactId>wildfly-ee-galleon-pack</artifactId>
             <type>zip</type>
+            <version>${ee.maven.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -114,11 +116,11 @@
                                         <name>bin.appclient</name>
                                     </excluded-packages>
                                 </feature-pack>
-                                <feature-pack>
+                                <!-- feature-pack>
                                     <transitive>true</transitive>
-                                    <groupId>org.wildfly</groupId>
+                                    <groupId>${ee.maven.groupId}</groupId>
                                     <artifactId>wildfly-galleon-pack</artifactId>
-                                    <version>${wildfly.version}</version>
+                                    <version>${ee.maven.version}</version>
                                     <included-packages>
                                         <name>bin</name>
                                         <name>bin.domain</name>
@@ -129,7 +131,7 @@
                                         <name>appclient</name>
                                         <name>bin.appclient</name>
                                     </excluded-packages>
-                                </feature-pack>
+                                </feature-pack -->
                                 <feature-pack>
                                     <groupId>org.keycloak</groupId>
                                     <artifactId>keycloak-server-galleon-pack</artifactId>
@@ -207,6 +209,12 @@
                                         <exclude>index.html</exclude>
                                     </excludes>
                                 </fileset>
+                                <fileset>
+                                    <directory>${basedir}/target/${project.build.finalName}/modules/system/layers/keycloak/org/jboss/as/product</directory>
+                                    <excludes>
+                                        <exclude>${product.slot}/**/*</exclude>
+                                    </excludes>
+                                </fileset>
                             </filesets>
                         </configuration>
                     </execution>
@@ -265,4 +273,64 @@
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-galleon-pack</artifactId>
+                    <type>pom</type>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-galleon-pack</artifactId>
+                    <type>zip</type>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+        <profile>
+            <id>product</id>
+            <activation>
+                <property>
+                    <name>product</name>
+                </property>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>${ee.maven.groupId}</groupId>
+                    <artifactId>wildfly-ee-galleon-pack</artifactId>
+                    <type>pom</type>
+                    <version>${ee.maven.version}</version>
+                    <scope>provided</scope>
+                </dependency>
+                <dependency>
+                    <groupId>${ee.maven.groupId}</groupId>
+                    <artifactId>wildfly-ee-galleon-pack</artifactId>
+                    <type>zip</type>
+                    <version>${ee.maven.version}</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>*</groupId>
+                            <artifactId>*</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>

pom.xml

@@ -196,9 +196,8 @@
         <org.apache.kerby.kerby-asn1.version>2.0.0</org.apache.kerby.kerby-asn1.version>
 
         <!-- WildFly Galleon Build related properties -->
-        <ee.maven.groupId>org.wildfly</ee.maven.groupId>
-        <ee.maven.version>${wildfly.version}</ee.maven.version>
         <org.wildfly.galleon-plugins.version>5.1.3.Final</org.wildfly.galleon-plugins.version>
+        <org.jboss.galleon.version>4.2.8.Final</org.jboss.galleon.version>
 
         <!-- Galleon -->
         <galleon.fork.embedded>true</galleon.fork.embedded>
@@ -774,15 +773,15 @@
                 <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.wildfly</groupId>
+                <groupId>${ee.maven.groupId}</groupId>
                 <artifactId>wildfly-ee-galleon-pack</artifactId>
                 <version>${wildfly.version}</version>
                 <type>zip</type>
             </dependency>
             <dependency>
-                <groupId>org.wildfly</groupId>
+                <groupId>${ee.maven.groupId}</groupId>
                 <artifactId>wildfly-servlet-galleon-pack</artifactId>
-                <version>${wildfly.version}</version>
+                <version>${ee.maven.version}</version>
                 <type>zip</type>
             </dependency>
             <dependency>
@@ -1792,6 +1791,11 @@
                         <skip>true</skip>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.jboss.galleon</groupId>
+                    <artifactId>galleon-maven-plugin</artifactId>
+                    <version>${org.jboss.galleon.version}</version>
+                </plugin>
                 <plugin>
                     <groupId>com.samaxes.maven</groupId>
                     <artifactId>minify-maven-plugin</artifactId>
@@ -1889,6 +1893,8 @@
                 <product.default-profile>community</product.default-profile>
                 <apache.httpcomponents.fuse.version>4.5.2</apache.httpcomponents.fuse.version>
                 <apache.httpcomponents.httpcore.fuse.version>4.4.4</apache.httpcomponents.httpcore.fuse.version>
+                <ee.maven.groupId>org.wildfly</ee.maven.groupId>
+                <ee.maven.version>${wildfly.version}</ee.maven.version>
             </properties>
             <modules>
                 <module>quarkus</module>
@@ -1912,6 +1918,8 @@
                 <apache.httpcomponents.fuse.version>4.5.2.redhat-2</apache.httpcomponents.fuse.version>
                 <apache.httpcomponents.httpcore.fuse.version>4.4.4.redhat-2</apache.httpcomponents.httpcore.fuse.version>
                 <product.default-profile>product</product.default-profile>
+                <ee.maven.groupId>org.jboss.eap</ee.maven.groupId>
+                <ee.maven.version>${eap.version}</ee.maven.version>
             </properties>
             <build>
                 <plugins>