From ab2a5a278340698d8fb709b1ad6825036176fb28 Mon Sep 17 00:00:00 2001
From: JF Denise <jdenise@redhat.com>
Date: Fri, 6 Mar 2020 17:13:25 +0100
Subject: [PATCH 1/2] Fix for CLOUD-3508, galleon module refactoring to handle
 WF galleon feature-packs in 19

---
 modules/eap-cd-env/19.0/module.yaml           |  4 +-
 modules/eap-cd-galleon-latest/module.yaml     |  9 ++++
 .../wildfly-user-feature-pack-build.xml       | 45 +++++++++++++++++++
 modules/eap-cd-galleon/19.0/configure.sh      | 13 ++++++
 modules/eap-cd-galleon/19.0/module.yaml       | 12 +++++
 5 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 modules/eap-cd-galleon-latest/module.yaml
 create mode 100644 modules/eap-cd-galleon/19.0/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/wildfly-user-feature-pack-build.xml
 create mode 100644 modules/eap-cd-galleon/19.0/configure.sh
 create mode 100644 modules/eap-cd-galleon/19.0/module.yaml

diff --git a/modules/eap-cd-env/19.0/module.yaml b/modules/eap-cd-env/19.0/module.yaml
index e8d5933..7dc94c8 100644
--- a/modules/eap-cd-env/19.0/module.yaml
+++ b/modules/eap-cd-env/19.0/module.yaml
@@ -31,7 +31,9 @@ envs:
     - name: "JBOSS_EAP_VERSION"
       value: "7.4.0-cd"
     - name: "PRODUCT_VERSION"
-      value: "18.0"
+      value: "19.0"
+    - name: "EAP_FULL_GROUPID"
+      value: "org.jboss.eap.cd"
     - name: "JBOSS_HOME"
       value: "/opt/eap"
     - name: "DEBUG"
diff --git a/modules/eap-cd-galleon-latest/module.yaml b/modules/eap-cd-galleon-latest/module.yaml
new file mode 100644
index 0000000..307fcdb
--- /dev/null
+++ b/modules/eap-cd-galleon-latest/module.yaml
@@ -0,0 +1,9 @@
+schema_version: 1
+
+name: eap-cd-galleon-latest
+version: "1.0"
+description: "Red Hat JBoss Enterprise Application Platform CD latest version galleon module"
+modules:
+      install:
+          - name: eap-cd-galleon
+            version: '19.0'
diff --git a/modules/eap-cd-galleon/19.0/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/wildfly-user-feature-pack-build.xml b/modules/eap-cd-galleon/19.0/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/wildfly-user-feature-pack-build.xml
new file mode 100644
index 0000000..22b300e
--- /dev/null
+++ b/modules/eap-cd-galleon/19.0/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/wildfly-user-feature-pack-build.xml
@@ -0,0 +1,45 @@
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2014, 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="org.jboss.eap.galleon.s2i:eap-s2i-galleon-pack">
+
+    <transitive>
+        <dependency group-id="org.wildfly.core" artifact-id="wildfly-core-galleon-pack">
+            <name>org.wildfly.core:wildfly-core-galleon-pack</name>
+        </dependency>
+         <dependency group-id="org.jboss.eap" artifact-id="wildfly-servlet-galleon-pack">
+            <name>org.wildfly:wildfly-servlet-galleon-pack</name>
+        </dependency>
+         <dependency group-id="org.jboss.eap" artifact-id="wildfly-ee-galleon-pack">
+            <name>org.wildfly:wildfly-ee-galleon-pack</name>
+            <default-configs inherit="true"/>
+            <packages inherit="true"/>
+        </dependency>
+    </transitive>
+    <dependencies>
+        <dependency group-id="org.jboss.eap.cd" artifact-id="wildfly-galleon-pack">
+            <name>org.wildfly:wildfly-galleon-pack</name>
+            <packages inherit="true"/>
+            <default-configs inherit="false"/>
+        </dependency>
+    </dependencies>
+</build>
\ No newline at end of file
diff --git a/modules/eap-cd-galleon/19.0/configure.sh b/modules/eap-cd-galleon/19.0/configure.sh
new file mode 100644
index 0000000..7c87398
--- /dev/null
+++ b/modules/eap-cd-galleon/19.0/configure.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Configure module
+set -e
+
+SCRIPT_DIR=$(dirname $0)
+ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
+
+chown -R jboss:root $SCRIPT_DIR
+chmod -R ug+rwX $SCRIPT_DIR
+
+pushd ${ARTIFACTS_DIR}
+cp -pr * /
+popd
diff --git a/modules/eap-cd-galleon/19.0/module.yaml b/modules/eap-cd-galleon/19.0/module.yaml
new file mode 100644
index 0000000..175e7ec
--- /dev/null
+++ b/modules/eap-cd-galleon/19.0/module.yaml
@@ -0,0 +1,12 @@
+schema_version: 1
+name: eap-cd-galleon
+version: '19.0'
+description: Install Galleon feature-pack-build file with dependency on wildfly-galleon-pack, default config being inherited from wildfly-ee-galleon-pack
+
+execute:
+- script: configure.sh
+
+modules:
+      install:
+          - name: eap-cd-env
+            version: '19.0'
\ No newline at end of file

From 56f3d724173ed66e6c0341c494e19aa85c434fbf Mon Sep 17 00:00:00 2001
From: JF Denise <jdenise@redhat.com>
Date: Thu, 2 Apr 2020 16:16:58 +0200
Subject: [PATCH 2/2] update CD19 version

---
 modules/eap-cd-env/19.0/module.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/eap-cd-env/19.0/module.yaml b/modules/eap-cd-env/19.0/module.yaml
index 7dc94c8..b1e4bc1 100644
--- a/modules/eap-cd-env/19.0/module.yaml
+++ b/modules/eap-cd-env/19.0/module.yaml
@@ -23,7 +23,7 @@ labels:
       description: "Environment variable used to specify the debug port. If not set, the default EAP debug port will be used (8787). Only applicable when development mode is enabled."
 envs:
     - name: "WILDFLY_VERSION"
-      value: "7.4.0.CD19-redhat-SNAPSHOT"
+      value: "7.4.0.CD19-redhat-00001"
     - name: "LAUNCH_JBOSS_IN_BACKGROUND"
       value: "true"
     - name: "JBOSS_PRODUCT"