From bca5fe8051d5ddc7b78d1177ef2d154bce982210 Mon Sep 17 00:00:00 2001
From: Peter Skopek <pskopek@redhat.com>
Date: Wed, 30 Aug 2023 15:24:09 +0200
Subject: [PATCH] Tidy up SAML Adapter Galleon Feature Pack build

Signed-off-by: Peter Skopek <pskopek@redhat.com>
---
 adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml     | 5 -----
 adapters/saml/wildfly/wildfly-subsystem/pom.xml             | 5 -----
 .../galleon-feature-packs/saml-adapter-galleon-pack/pom.xml | 6 ++----
 .../wildfly-feature-pack-build-eap.xml                      | 1 -
 pom.xml                                                     | 3 ++-
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml b/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
index 6b5e54ce98..1a14b2bdcb 100755
--- a/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
+++ b/adapters/saml/wildfly/wildfly-jakarta-subsystem/pom.xml
@@ -140,11 +140,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.wildfly.common</groupId>
-            <artifactId>wildfly-common</artifactId>
-            <scope>test</scope>
-        </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
index 6db425157b..20115d145d 100755
--- a/adapters/saml/wildfly/wildfly-subsystem/pom.xml
+++ b/adapters/saml/wildfly/wildfly-subsystem/pom.xml
@@ -86,11 +86,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.wildfly.common</groupId>
-            <artifactId>wildfly-common</artifactId>
-            <scope>test</scope>
-        </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
index 781e426c73..04337b1b3e 100644
--- a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml
+++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/pom.xml
@@ -32,8 +32,6 @@
 
     <properties>
         <feature-pack.resources.directory>${basedir}/../../saml-adapters/wildfly-adapter/wildfly-jakarta-modules/src/main/resources</feature-pack.resources.directory>
-        <version.org.wildfly.galleon-plugins>6.4.0.Final</version.org.wildfly.galleon-plugins>
-        <version.org.wildfly.maven.plugins.licenses-plugin>2.3.1.Final</version.org.wildfly.maven.plugins.licenses-plugin>
         <license.directory>${project.build.directory}/resources/packages/docs.licenses/content/docs/licenses</license.directory>
     </properties>
     <dependencies>
@@ -217,7 +215,7 @@
             <plugin>
                 <groupId>org.wildfly.galleon-plugins</groupId>
                 <artifactId>wildfly-galleon-maven-plugin</artifactId>
-                <version>${version.org.wildfly.galleon-plugins}</version>
+                <version>${org.wildfly.galleon-plugins.version}</version>
                 <dependencies>
                     <!--
                         feature-spec-gen uses wildfly-embedded to generate the feature specs, hence the designated
@@ -254,7 +252,7 @@
             <plugin>
                 <groupId>org.wildfly.maven.plugins</groupId>
                 <artifactId>licenses-plugin</artifactId>
-                <version>${version.org.wildfly.maven.plugins.licenses-plugin}</version>
+                <version>${org.wildfly.maven.plugins.licenses-plugin.version}</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>
diff --git a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/wildfly-feature-pack-build-eap.xml b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/wildfly-feature-pack-build-eap.xml
index e1f236d552..c791196c68 100644
--- a/distribution/galleon-feature-packs/saml-adapter-galleon-pack/wildfly-feature-pack-build-eap.xml
+++ b/distribution/galleon-feature-packs/saml-adapter-galleon-pack/wildfly-feature-pack-build-eap.xml
@@ -26,7 +26,6 @@
     </dependencies>
     <default-packages>
         <package name="modules.all"/>
-        <package name="licenses"/>
     </default-packages>
     <generate-feature-specs>
         <extensions>
diff --git a/pom.xml b/pom.xml
index 1d9dc787db..5d74243f90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,7 @@
         <project.build-time>${timestamp}</project.build-time>
 
         <!-- Upstream WildFly Versions -->
-        <upstream.wildfly.version>27.0.1.Final</upstream.wildfly.version>
+        <upstream.wildfly.version>29.0.0.Final</upstream.wildfly.version>
         <upstream.wildfly.build-tools.version>1.2.13.Final</upstream.wildfly.build-tools.version>
         <upstream.wildfly.core.version>21.1.0.Final</upstream.wildfly.core.version>
 
@@ -206,6 +206,7 @@
         <!-- WildFly Galleon Build related properties -->
         <org.wildfly.galleon-plugins.version>6.4.2.Final</org.wildfly.galleon-plugins.version>
         <org.jboss.galleon.version>5.1.0.Final</org.jboss.galleon.version>
+        <org.wildfly.maven.plugins.licenses-plugin.version>2.3.1.Final</org.wildfly.maven.plugins.licenses-plugin.version>
 
         <!-- Galleon -->
         <galleon.fork.embedded>true</galleon.fork.embedded>