From ecfa4472442aac478c9672597d4e0350d8016362 Mon Sep 17 00:00:00 2001
From: Mahesh Subramanian <mahesh.subramanian@hmcts.net>
Date: Fri, 14 Jun 2019 14:48:10 +0100
Subject: [PATCH 1/2] SCTP-324: Reverting to swarm container to workaround
 class loader issues

---
 event-tool/pom.xml                            | 44 +++++++------------
 pom.xml                                       |  6 +--
 .../stream-transformation-it/pom.xml          |  2 +-
 stream-transformation-tool-fraction/pom.xml   |  4 +-
 4 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/event-tool/pom.xml b/event-tool/pom.xml
index bf038a4..1b3a500 100644
--- a/event-tool/pom.xml
+++ b/event-tool/pom.xml
@@ -29,47 +29,39 @@
 
         <!--Wildfly Swarm-->
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>cdi</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-logging</artifactId>
                     <groupId>org.jboss.logging</groupId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.transaction</groupId>
-                    <artifactId>jboss-transaction-api_1.2_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>io.thorntail</groupId>
-            <artifactId>datasources</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>ejb</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.wildfly.swarm</groupId>
+            <artifactId>datasources</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>bean-validation</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>jaxrs</artifactId>
             <exclusions>
                 <exclusion>
@@ -80,18 +72,18 @@
         </dependency>
 
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>messaging</artifactId>
             <exclusions>
                 <exclusion>
-                    <groupId>io.thorntail</groupId>
+                    <groupId>org.wildfly.swarm</groupId>
                     <artifactId>jgroups</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>logging</artifactId>
         </dependency>
 
@@ -122,12 +114,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>test-utils-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
     </dependencies>
@@ -136,9 +122,9 @@
         <plugins>
 
             <plugin>
-                <groupId>io.thorntail</groupId>
-                <artifactId>thorntail-maven-plugin</artifactId>
-                <version>${thorntail.version}</version>
+                <groupId>org.wildfly.swarm</groupId>
+                <artifactId>wildfly-swarm-plugin</artifactId>
+                <version>${wildfly.swarm.version}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/pom.xml b/pom.xml
index dab4f1d..2c1ddc8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
         <common-bom.version>1.28.0</common-bom.version>
         <utilities.version>1.16.2</utilities.version>
         <test-utils.version>1.18.1</test-utils.version>
-        <thorntail.version>2.1.0.Final</thorntail.version>
+        <wildfly.swarm.version>2017.11.0</wildfly.swarm.version>
         <version.swarm.fraction-plugin>77</version.swarm.fraction-plugin>
         <junit-dataprovider.version>1.13.1</junit-dataprovider.version>
         
@@ -70,9 +70,9 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>io.thorntail</groupId>
+                <groupId>org.wildfly.swarm</groupId>
                 <artifactId>bom-all</artifactId>
-                <version>${thorntail.version}</version>
+                <version>${wildfly.swarm.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/stream-transformation-test/stream-transformation-it/pom.xml b/stream-transformation-test/stream-transformation-it/pom.xml
index 96a3998..9c71541 100644
--- a/stream-transformation-test/stream-transformation-it/pom.xml
+++ b/stream-transformation-test/stream-transformation-it/pom.xml
@@ -114,7 +114,7 @@
                             <groupId>uk.gov.justice</groupId>
                             <version>${project.version}</version>
                             <type>jar</type>
-                            <classifier>thorntail</classifier>
+                            <classifier>swarm</classifier>
                             <overWrite>true</overWrite>
                             <outputDirectory>${project.basedir}/target/test-classes
                             </outputDirectory>
diff --git a/stream-transformation-tool-fraction/pom.xml b/stream-transformation-tool-fraction/pom.xml
index 5352f52..0dea002 100644
--- a/stream-transformation-tool-fraction/pom.xml
+++ b/stream-transformation-tool-fraction/pom.xml
@@ -19,12 +19,12 @@
         </dependency>
 
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>spi</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>undertow</artifactId>
         </dependency>
 

From 382da5984e710b2f3292bebcbe7a52a5de49ee7c Mon Sep 17 00:00:00 2001
From: Mahesh Subramanian <mahesh.subramanian@hmcts.net>
Date: Fri, 14 Jun 2019 15:00:38 +0100
Subject: [PATCH 2/2] Amended changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72d12a7..327f3c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+- Reverting thorntail container related changes and using swarm instead
 
 ### Changed
 - Update event-store to 1.1.9