Merge 5d5c585 into 1e41d31

CJSCommonPlatform · May 10, 2019 · b756816 · b756816
2 parents 1e41d31 + 5d5c585
commit b756816
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [5.3.0] - 2019-05-10
+
+### Changed
+- Reverted to Swarm from Thorntail, due to weld issues when replaying
+
 ## [5.2.2] - 2019-05-09
 ### Fixed 
 - Added subscription-manager to the list of excluded jars

diff --git a/archive-loader-fraction/pom.xml b/archive-loader-fraction/pom.xml
@@ -1,4 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
         <artifactId>framework-tools</artifactId>
@@ -12,9 +14,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>io.thorntail</groupId>
+                <groupId>org.wildfly.swarm</groupId>
                 <artifactId>bom-all</artifactId>
-                <version>${thorntail.version}</version>
+                <version>${wildfly.swarm.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -29,15 +31,15 @@
             <scope>provided</scope>
         </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>logging</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>undertow</artifactId>
         </dependency>
 
@@ -82,4 +84,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/framework-tools-replay/pom.xml b/framework-tools-replay/pom.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
@@ -16,9 +16,9 @@
     <dependencyManagement>
         <dependencies>
             <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>
@@ -48,62 +48,49 @@
 
         <!--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>
+            <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>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>datasources</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.thorntail</groupId>
+            <groupId>org.wildfly.swarm</groupId>
             <artifactId>jaxrs</artifactId>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-logging</artifactId>
                     <groupId>org.jboss.logging</groupId>
                 </exclusion>
-
-                <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm</artifactId>
-                </exclusion>
             </exclusions>
         </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>
 
@@ -185,9 +172,9 @@
     <build>
         <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>
@@ -199,4 +186,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/pom.xml b/pom.xml
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -17,7 +20,7 @@
         <framework-api.version>3.1.1</framework-api.version>
         <framework.version>5.1.2</framework.version>
         <event-store.version>1.1.8</event-store.version>
-        <thorntail.version>2.1.0.Final</thorntail.version>
+        <wildfly.swarm.version>2017.11.0</wildfly.swarm.version>
         <test.utils.version>1.19.1</test.utils.version>
         <schema-service.version>1.4.3</schema-service.version>
         <version.swarm.fraction-plugin>77</version.swarm.fraction-plugin>
@@ -40,9 +43,9 @@
     <dependencyManagement>
         <dependencies>
             <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>
@@ -116,4 +119,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
diff --git a/replay-tool-test/replay-tool-integration-test/pom.xml b/replay-tool-test/replay-tool-integration-test/pom.xml
@@ -123,11 +123,12 @@
                             </outputDirectory>
                         </artifactItem>
                         <artifactItem>
+                            <artifactId>framework-tools</artifactId>
                             <groupId>uk.gov.justice</groupId>
-                            <artifactId>framework-tools-replay</artifactId>
                             <version>${project.version}</version>
+                            <artifactId>framework-tools-replay</artifactId>
                             <type>jar</type>
-                            <classifier>thorntail</classifier>
+                            <classifier>swarm</classifier>
                             <overWrite>true</overWrite>
                             <outputDirectory>${project.basedir}/target/test-classes
                             </outputDirectory>