Set distinct wildfly-common versions for Quarkus and WildFly based mo…

…dules Signed-off-by: Peter Skopek <pskopek@redhat.com>
keycloak · Sep 7, 2023 · 35c2d52 · 35c2d52
1 parent bca5fe8
commit 35c2d52
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/adapters/oidc/wildfly-elytron/pom.xml b/adapters/oidc/wildfly-elytron/pom.xml
@@ -35,6 +35,7 @@
         <dependency>
             <groupId>org.wildfly.common</groupId>
             <artifactId>wildfly-common</artifactId>
+            <version>${wildfly.common.wildfly.aligned.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/adapters/oidc/wildfly/wildfly-subsystem/pom.xml b/adapters/oidc/wildfly/wildfly-subsystem/pom.xml
@@ -68,6 +68,11 @@
             <artifactId>wildfly-web-common</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.wildfly.common</groupId>
+            <artifactId>wildfly-common</artifactId>
+            <version>${wildfly.common.wildfly.aligned.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.wildfly.security</groupId>
             <artifactId>wildfly-elytron</artifactId>

diff --git a/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml b/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
@@ -140,6 +140,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.wildfly.common</groupId>
+            <artifactId>wildfly-common</artifactId>
+            <version>${wildfly.common.wildfly.aligned.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.wildfly.core</groupId>
             <artifactId>wildfly-subsystem-test-framework</artifactId>

diff --git a/adapters/saml/wildfly/wildfly-subsystem/pom.xml b/adapters/saml/wildfly/wildfly-subsystem/pom.xml
@@ -86,6 +86,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.wildfly.common</groupId>
+            <artifactId>wildfly-common</artifactId>
+            <version>${wildfly.common.wildfly.aligned.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.wildfly.core</groupId>
             <artifactId>wildfly-subsystem-test-framework</artifactId>

diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml
@@ -230,7 +230,7 @@
                     <dependency>
                         <groupId>org.wildfly.common</groupId>
                         <artifactId>wildfly-common</artifactId>
-                        <version>${wildfly.common.version}</version>
+                        <version>${wildfly.common.wildfly.aligned.version}</version>
                     </dependency>
                 </dependencies>
                 <executions>

diff --git a/pom.xml b/pom.xml
@@ -116,7 +116,8 @@
         <elytron.undertow-server.version>1.9.0.Final</elytron.undertow-server.version>
         <jetty94.version>9.4.40.v20210413</jetty94.version>
         <woodstox.version>6.0.3</woodstox.version>
-        <wildfly.common.version>1.6.0.Final</wildfly.common.version>
+        <wildfly.common.quarkus.aligned.version>1.5.4.Final-format-001</wildfly.common.quarkus.aligned.version>
+        <wildfly.common.wildfly.aligned.version>1.6.0.Final</wildfly.common.wildfly.aligned.version>
         <xmlsec.version>2.2.3</xmlsec.version>
         <nashorn.version>15.4</nashorn.version>
         <ua-parser.version>1.5.4</ua-parser.version>
@@ -674,7 +675,7 @@
             <dependency>
                 <groupId>org.wildfly.common</groupId>
                 <artifactId>wildfly-common</artifactId>
-                <version>${wildfly.common.version}</version>
+                <version>${wildfly.common.quarkus.aligned.version}</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
@@ -1867,7 +1868,7 @@
                         <dependency>
                             <groupId>org.wildfly.common</groupId>
                             <artifactId>wildfly-common</artifactId>
-                            <version>${wildfly.common.version}</version>
+                            <version>${wildfly.common.wildfly.aligned.version}</version>
                         </dependency>
                     </dependencies>
                 </plugin>