Server-only upgrade to WildFly 25.0.1 (keycloak#9190)

* WF 25.0.1 upgrade light * Re-enable adapters with old WF versions * Put server-overlay and server-legacy-dist back to reduce size of PR changes * Remove some more changes that are not needed * Fix issues adding to provider properties * Fix user-profile updates for tests * tls fixes * Set WF to 23 for adapter tests Co-authored-by: Pedro Igor <pigor.craveiro@gmail.com>
abbra · Dec 17, 2021 · 31345c4 · 31345c4
1 parent b032694
commit 31345c4
Show file tree

Hide file tree

Showing 28 changed files with 85 additions and 127 deletions.
diff --git a/distribution/adapters/wildfly-adapter/pom.xml b/distribution/adapters/wildfly-adapter/pom.xml
@@ -24,6 +24,13 @@
         <version>16.0.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <wildfly.version>23.0.2.Final</wildfly.version>
+        <wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
+        <wildfly.core.version>15.0.1.Final</wildfly.core.version>
+        <org.wildfly.galleon-plugins.version>5.1.3.Final</org.wildfly.galleon-plugins.version>
+    </properties>
+
     <artifactId>keycloak-wildfly-adapter-dist</artifactId>
     <packaging>pom</packaging>
     <name>Keycloak Adapter Overlay Distribution</name>

diff --git a/distribution/feature-packs/adapter-feature-pack/pom.xml b/distribution/feature-packs/adapter-feature-pack/pom.xml
@@ -22,6 +22,13 @@
         <version>16.0.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <wildfly.version>23.0.2.Final</wildfly.version>
+        <wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
+        <wildfly.core.version>15.0.1.Final</wildfly.core.version>
+        <org.wildfly.galleon-plugins.version>5.1.3.Final</org.wildfly.galleon-plugins.version>
+    </properties>
+
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.keycloak</groupId>
@@ -218,6 +225,7 @@
                 <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-feature-pack</artifactId>
+                    <version>${wildfly.version}</version>
                     <type>zip</type>
                 </dependency>
             </dependencies>

diff --git a/distribution/feature-packs/server-feature-pack/feature-pack-build.xml b/distribution/feature-packs/server-feature-pack/feature-pack-build.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 
-<build xmlns="urn:wildfly:feature-pack-build:1.1">
+<build xmlns="urn:wildfly:feature-pack-build:3.1">
     <dependencies>
         <artifact name="${feature.parent}" />
     </dependencies>

diff --git a/distribution/feature-packs/server-feature-pack/pom.xml b/distribution/feature-packs/server-feature-pack/pom.xml
@@ -79,25 +79,20 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
-                <groupId>org.wildfly.build</groupId>
-                <artifactId>wildfly-feature-pack-build-maven-plugin</artifactId>
-                <version>${wildfly.build-tools.version}</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
                 <executions>
+                    <!-- Disable the standard copy-resources -->
                     <execution>
-                        <id>feature-pack-build</id>
+                        <id>copy-resources</id>
+                        <phase>none</phase>
                         <goals>
-                            <goal>build</goal>
+                            <goal>copy-resources</goal>
                         </goals>
-                        <phase>compile</phase>
-                        <configuration>
-                            <config-file>feature-pack-build.xml</config-file>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
@@ -113,77 +108,17 @@
                                 <descriptor>assembly.xml</descriptor>
                             </descriptors>
                             <recompressZippedFiles>true</recompressZippedFiles>
+                            <finalName>${project.build.finalName}</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
-                            <outputDirectory>target/</outputDirectory>
-                            <workDirectory>target/assembly/work</workDirectory>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <workDirectory>${project.build.directory}/assembly/work</workDirectory>
+                            <tarLongFileMode>${assembly.tarLongFileMode}</tarLongFileMode>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.keycloak</groupId>
-                <artifactId>keycloak-distribution-licenses-maven-plugin</artifactId>
-            </plugin>
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>community</id>
-            <activation>
-                <property>
-                    <name>!product</name>
-                </property>
-            </activation>
-
-            <properties>
-                <feature.parent>org.wildfly:wildfly-feature-pack</feature.parent>
-            </properties>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.wildfly</groupId>
-                    <artifactId>wildfly-feature-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>
-
-            <properties>
-                <feature.parent>org.jboss.eap:wildfly-feature-pack</feature.parent>
-            </properties>
-
-            <dependencies>
-                <dependency>
-                    <groupId>org.jboss.eap</groupId>
-                    <artifactId>wildfly-feature-pack</artifactId>
-                    <version>${eap.version}</version>
-                    <type>zip</type>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>*</groupId>
-                            <artifactId>*</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
 </project>
 
diff --git a/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml b/distribution/galleon-feature-packs/adapter-galleon-pack/pom.xml
@@ -31,6 +31,11 @@
     <packaging>pom</packaging>
 
     <properties>
+        <wildfly.version>23.0.2.Final</wildfly.version>
+        <wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
+        <wildfly.core.version>15.0.1.Final</wildfly.core.version>
+        <org.wildfly.galleon-plugins.version>5.1.3.Final</org.wildfly.galleon-plugins.version>
+
         <feature-pack.resources.directory>${basedir}/../../feature-packs/adapter-feature-pack/src/main/resources</feature-pack.resources.directory>
         <version.org.wildfly.galleon-plugins>5.1.3.Final</version.org.wildfly.galleon-plugins>
         <xmlFileSource>${feature-pack.resources.directory}/licenses/${product.slot}/licenses.xml</xmlFileSource>

diff --git a/distribution/galleon-feature-packs/server-galleon-pack/pom.xml b/distribution/galleon-feature-packs/server-galleon-pack/pom.xml
@@ -64,13 +64,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.wildfly.core</groupId>
-            <artifactId>wildfly-core-feature-pack-galleon-pruned</artifactId>
-            <type>pom</type>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.wildfly.core</groupId>
             <artifactId>wildfly-core-galleon-pack</artifactId>
@@ -391,10 +384,6 @@
                 </property>
             </activation>
 
-            <properties>
-                <feature.parent>org.wildfly:wildfly-galleon-pack</feature.parent>
-            </properties>
-
             <dependencies>
                 <dependency>
                     <groupId>org.wildfly</groupId>
@@ -418,10 +407,6 @@
                 </property>
             </activation>
 
-            <properties>
-                <feature.parent>${ee.maven.groupId}:wildfly-ee-galleon-pack</feature.parent>
-            </properties>
-
             <dependencies>
                 <dependency>
                     <groupId>${ee.maven.groupId}</groupId>
@@ -467,7 +452,6 @@
                                                      transitives. Those poms ban transitives at their level -->
                                                 <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>

diff --git a/...ature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-ejb.xml b/...ature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-ejb.xml
@@ -6,6 +6,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="ejb"/>
             <param name="modules" value="[org.wildfly.clustering.ejb.infinispan]"/>
+            <param name="marshaller" value="PROTOSTREAM"/>
             <param name="default-cache" value="dist"/>
             <param name="aliases" value="[sfsb]"/>
             <feature spec="subsystem.infinispan.cache-container.transport.jgroups">

diff --git a/...packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml b/...packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-hibernate.xml
@@ -5,6 +5,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="hibernate"/>
             <param name="modules" value="[org.infinispan.hibernate-cache]"/>
+            <param name="marshaller" value="JBOSS"/>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="local-query"/>
                 <feature spec="subsystem.infinispan.cache-container.local-cache.component.expiration">

diff --git a/...-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-keycloak.xml b/...-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-keycloak.xml
@@ -4,6 +4,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="keycloak"/>
             <param name="modules" value="[org.keycloak.keycloak-model-infinispan]"/>
+            <param name="marshaller" value="JBOSS"/>
             <feature spec="subsystem.infinispan.cache-container.transport.jgroups">
                 <param name="lock-timeout" value="60000"/>
             </feature>

diff --git a/...re-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-server.xml b/...re-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-server.xml
@@ -5,6 +5,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="server"/>
             <param name="modules" value="[org.wildfly.clustering.server]"/>
+            <param name="marshaller" value="PROTOSTREAM"/>
             <param name="default-cache" value="default"/>
             <param name="aliases" value="[singleton, cluster]"/>
             <feature spec="subsystem.infinispan.cache-container.transport.jgroups">

diff --git a/...ature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-web.xml b/...ature-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-dist-web.xml
@@ -5,6 +5,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="web"/>
             <param name="modules" value="[org.wildfly.clustering.web.infinispan]"/>
+            <param name="marshaller" value="PROTOSTREAM"/>
             <param name="default-cache" value="dist"/>
             <feature spec="subsystem.infinispan.cache-container.transport.jgroups">
                 <param name="transport" value="jgroups"/>

diff --git a/...ture-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-ejb.xml b/...ture-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-ejb.xml
@@ -6,6 +6,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="ejb"/>
             <param name="modules" value="[org.wildfly.clustering.ejb.infinispan]"/>
+            <param name="marshaller" value="PROTOSTREAM"/>
             <param name="aliases" value="[sfsb]"/>
             <param name="default-cache" value="passivation"/>
             <feature spec="subsystem.infinispan.cache-container.local-cache">

diff --git a/...acks/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-hibernate.xml b/...acks/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-hibernate.xml
@@ -4,6 +4,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="hibernate"/>
             <param name="modules" value="[org.infinispan.hibernate-cache]"/>
+            <param name="marshaller" value="JBOSS"/>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="entity"/>
                 <feature spec="subsystem.infinispan.cache-container.local-cache.component.expiration">

diff --git a/...packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-keycloak.xml b/...packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-keycloak.xml
@@ -4,6 +4,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="keycloak"/>
             <param name="modules" value="[org.keycloak.keycloak-model-infinispan]"/>
+            <param name="marshaller" value="JBOSS"/>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="realms"/>
                 <feature spec="subsystem.infinispan.cache-container.local-cache.memory.heap">

diff --git a/...e-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-server.xml b/...e-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-server.xml
@@ -6,6 +6,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="server"/>
             <param name="modules" value="[org.wildfly.clustering.server]"/>
+            <param name="marshaller" value="PROTOSTREAM"/>
             <param name="default-cache" value="default"/>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="default"/>

diff --git a/...ture-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-web.xml b/...ture-packs/server-galleon-pack/src/main/resources/feature_groups/infinispan-local-web.xml
@@ -5,6 +5,7 @@
         <feature spec="subsystem.infinispan.cache-container">
             <param name="cache-container" value="web"/>
             <param name="modules" value="[org.wildfly.clustering.web.infinispan]"/>
+            <param name="marshaller" value="PROTOSTREAM"/>
             <param name="default-cache" value="passivation"/>
             <feature spec="subsystem.infinispan.cache-container.local-cache">
                 <param name="local-cache" value="passivation"/>
@@ -34,4 +35,4 @@
             </feature>
         </feature>
     </feature>
-</feature-group-spec>
+</feature-group-spec>
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -43,7 +43,7 @@
         <module>licenses-common</module>
         <module>maven-plugins</module>
         <module>server-dist</module>
-        <module>server-overlay</module>
+        <!--<module>server-overlay</module>-->
     </modules>
 
     <repositories>

diff --git a/pom.xml b/pom.xml
@@ -53,10 +53,10 @@
         <product.rhsso.version>7.5.0.GA</product.rhsso.version>
 
         <product.build-time>${timestamp}</product.build-time>
-        <wildfly.version>23.0.2.Final</wildfly.version>
+        <wildfly.version>25.0.1.Final</wildfly.version>
         <wildfly.build-tools.version>1.2.13.Final</wildfly.build-tools.version>
         <eap.version>7.4.0.GA-redhat-00005</eap.version>
-        <wildfly.core.version>15.0.1.Final</wildfly.core.version>
+        <wildfly.core.version>17.0.3.Final</wildfly.core.version>
 
         <jboss.as.version>7.2.0.Final</jboss.as.version>
         <jboss.as.subsystem.test.version>7.5.22.Final-redhat-1</jboss.as.subsystem.test.version>
@@ -199,7 +199,7 @@
         <org.apache.kerby.kerby-asn1.version>2.0.0</org.apache.kerby.kerby-asn1.version>
 
         <!-- WildFly Galleon Build related properties -->
-        <org.wildfly.galleon-plugins.version>5.1.3.Final</org.wildfly.galleon-plugins.version>
+        <org.wildfly.galleon-plugins.version>5.2.2.Final</org.wildfly.galleon-plugins.version>
         <org.jboss.galleon.version>4.2.8.Final</org.jboss.galleon.version>
 
         <!-- Galleon -->
@@ -752,12 +752,6 @@
                 <artifactId>wildfly-ee</artifactId>
                 <version>${wildfly.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.wildfly</groupId>
-                <artifactId>wildfly-feature-pack</artifactId>
-                <version>${wildfly.version}</version>
-                <type>zip</type>
-            </dependency>
             <dependency>
                 <groupId>org.wildfly</groupId>
                 <artifactId>wildfly-galleon-pack</artifactId>

diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/pom.xml
@@ -30,6 +30,7 @@
     <name>App Server - Wildfly</name>
 
     <properties>
+        <wildfly.version>23.0.2.Final</wildfly.version>
         <app.server.jboss>wildfly</app.server.jboss>
 
         <app.server.jboss.groupId>org.wildfly</app.server.jboss.groupId>

diff --git a/...ation-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli b/...ation-arquillian/servers/auth-server/jboss/common/jboss-cli/keycloak-server-subsystem.cli
@@ -20,8 +20,8 @@ echo ** Adding max-detail-length to eventsStore spi **
 echo ** Adding spi=userProfile with default provider and legacy-user-profile configuration of read-only attributes **
 /subsystem=keycloak-server/spi=userProfile/:add(default-provider="declarative-user-profile")
 /subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:add(properties={},enabled=true)
-/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=read-only-attributes,value=[deniedFoo,deniedBar*,deniedSome/thing,deniedsome*thing])
-/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=admin-read-only-attributes,value=[deniedSomeAdmin])
+/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=read-only-attributes,value="[\"deniedFoo\",\"deniedBar*\",\"deniedSome/thing\",\"deniedsome*thing\"]")
+/subsystem=keycloak-server/spi=userProfile/provider=declarative-user-profile/:map-put(name=properties,key=admin-read-only-attributes,value="[\"deniedSomeAdmin\"]")
 
 echo ** Do not reuse connections for HttpClientProvider within testsuite **
 /subsystem=keycloak-server/spi=connectionsHttpClient/provider=default/:map-put(name=properties,key=reuse-connections,value=false)

diff --git a/...an/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java b/...an/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java
@@ -823,10 +823,12 @@ private static void enableTLS(OnlineManagementClient client) throws Exception {
         Administration administration = new Administration(client);
         Operations operations = new Operations(client);
 
-        if(!operations.exists(Address.coreService("management").and("security-realm", "UndertowRealm"))) {
-            client.execute("/core-service=management/security-realm=UndertowRealm:add()");
-            client.execute("/core-service=management/security-realm=UndertowRealm/server-identity=ssl:add(keystore-relative-to=jboss.server.config.dir,keystore-password=secret,keystore-path=keycloak.jks");
-            client.execute("/core-service=management/security-realm=UndertowRealm/authentication=truststore:add(keystore-relative-to=jboss.server.config.dir,keystore-password=secret,keystore-path=keycloak.truststore");
+        if(!operations.exists(Address.subsystem("elytron").and("server-ssl-context", "httpsSSC"))) {
+            client.execute("/subsystem=elytron/key-store=httpsKS:add(relative-to=jboss.server.config.dir,path=keycloak.jks,credential-reference={clear-text=secret},type=JKS)");
+            client.execute("/subsystem=elytron/key-manager=httpsKM:add(key-store=httpsKS,credential-reference={clear-text=secret})");
+            client.execute("/subsystem=elytron/key-store=twoWayTS:add(relative-to=jboss.server.config.dir,path=keycloak.truststore,credential-reference={clear-text=secret},type=JKS)");
+            client.execute("/subsystem=elytron/trust-manager=twoWayTM:add(key-store=twoWayTS)");
+            client.execute("/subsystem=elytron/server-ssl-context=httpsSSC:add(key-manager=httpsKM,protocols=[\"TLSv1.2\"],trust-manager=twoWayTM,want-client-auth=true)");
 
             removeHttpsListener(client, administration);
             addHttpsListener(client);