From 19b62ffc4c4321533044151c0a5127f32819d4ea Mon Sep 17 00:00:00 2001
From: Bartosz Spyrko-Smietanko <bspyrkos@redhat.com>
Date: Wed, 31 Jul 2024 14:12:43 +0200
Subject: [PATCH] [#704] Use jackson-dataformat-yaml WildFly module in the
 feature pack

---
 .../layers/base/org/jboss/prospero/main/module.xml    |  1 -
 .../base/org/jboss/prospero-dep/main/module.xml       |  1 +
 dist/wildfly-galleon-pack/pom.xml                     | 11 -----------
 .../base/org/jboss/prospero-dep/main/module.xml       |  1 +
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/dist/common/src/main/resources/modules/system/layers/base/org/jboss/prospero/main/module.xml b/dist/common/src/main/resources/modules/system/layers/base/org/jboss/prospero/main/module.xml
index e5f3569e3..5fc921d2a 100644
--- a/dist/common/src/main/resources/modules/system/layers/base/org/jboss/prospero/main/module.xml
+++ b/dist/common/src/main/resources/modules/system/layers/base/org/jboss/prospero/main/module.xml
@@ -39,7 +39,6 @@
     <artifact name="${org.jboss.galleon:galleon-common-api}"/>
     <artifact name="${org.jboss.galleon:galleon-maven-universe}"/>
     <artifact name="${info.picocli:picocli}"/>
-    <artifact name="${com.fasterxml.jackson.dataformat:jackson-dataformat-yaml}"/>
     <artifact name="${com.networknt:json-schema-validator}"/>
     <artifact name="${org.apache.commons:commons-text}"/>
     <artifact name="${org.apache.maven:maven-artifact}"/>
diff --git a/dist/standalone-galleon-pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml b/dist/standalone-galleon-pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml
index 4eb59ebed..53ec7030c 100644
--- a/dist/standalone-galleon-pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml
+++ b/dist/standalone-galleon-pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml
@@ -36,6 +36,7 @@
     <artifact name="${com.fasterxml.jackson.core:jackson-core}"/>
     <artifact name="${com.fasterxml.jackson.core:jackson-annotations}"/>
     <artifact name="${com.fasterxml.jackson.core:jackson-databind}"/>
+    <artifact name="${com.fasterxml.jackson.dataformat:jackson-dataformat-yaml}"/>
     <artifact name="${org.yaml:snakeyaml}"/>
     <artifact name="${org.jboss:staxmapper}"/>
     <artifact name="${org.slf4j:slf4j-api}"/>
diff --git a/dist/wildfly-galleon-pack/pom.xml b/dist/wildfly-galleon-pack/pom.xml
index 2f83e8cf7..40a1200de 100644
--- a/dist/wildfly-galleon-pack/pom.xml
+++ b/dist/wildfly-galleon-pack/pom.xml
@@ -130,17 +130,6 @@
       </exclusions>
     </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-yaml</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>*</groupId>
-          <artifactId>*</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>com.networknt</groupId>
       <artifactId>json-schema-validator</artifactId>
diff --git a/dist/wildfly-galleon-pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml b/dist/wildfly-galleon-pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml
index 813b6f972..284a5a528 100644
--- a/dist/wildfly-galleon-pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml
+++ b/dist/wildfly-galleon-pack/src/main/resources/modules/system/layers/base/org/jboss/prospero-dep/main/module.xml
@@ -34,6 +34,7 @@
       <module name="com.fasterxml.jackson.core.jackson-core" export="true"/>
       <module name="com.fasterxml.jackson.core.jackson-annotations" export="true"/>
       <module name="com.fasterxml.jackson.core.jackson-databind" export="true"/>
+      <module name="com.fasterxml.jackson.dataformat.jackson-dataformat-yaml" export="true"/>
       <module name="javax.inject.api" export="true"/>
       <module name="org.jboss.logging" export="true"/>
       <module name="org.jboss.logmanager" export="true" services="export"/>