Merge pull request #54 from CJSCommonPlatform/upgrade-framework

Upgrade to framework 7.0.0
CJSCommonPlatform · May 28, 2020 · 4078d38 · 4078d38
2 parents 46d5a1e + eab79a9
commit 4078d38
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 60 deletions.
diff --git a/event-tool/pom.xml b/event-tool/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>uk.gov.justice</groupId>
         <artifactId>stream-transformation-tool</artifactId>
-        <version>6.4.6-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <packaging>war</packaging>

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <artifactId>stream-transformation-tool</artifactId>
     <packaging>pom</packaging>
-    <version>6.4.6-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
 
     <scm>
         <connection>${cpp.scm.connection}</connection>
@@ -22,12 +22,11 @@
 
     <properties>
         <cpp.repo.name>stream-transformation-tool</cpp.repo.name>
-        <framework-api.version>4.1.0</framework-api.version>
-        <framework.version>6.4.0</framework.version>
-        <event-store.version>2.4.0</event-store.version>
-        <common-bom.version>2.4.0</common-bom.version>
-        <utilities.version>1.20.3</utilities.version>
-        <test-utils.version>1.24.3</test-utils.version>
+
+        <framework-libraries.version>7.0.5</framework-libraries.version>
+        <framework.version>7.0.4</framework.version>
+        <event-store.version>7.0.2</event-store.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>
@@ -44,16 +43,31 @@
         <module>stream-transformation-tool-service</module>
         <module>stream-transformation-tool-fraction</module>
         <module>stream-transformation-tool-anonymise</module>
-        <!-- this module needs to be built last as it copies artefacts from modules above -->
+        <!-- this module needs to be built last as it copies artifacts from modules above -->
         <module>stream-transformation-test</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>uk.gov.justice.event-store</groupId>
+                <artifactId>event-store-bom</artifactId>
+                <version>${event-store.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+
+            <!-- maybe move to boms -->
+            <dependency>
+                <groupId>uk.gov.justice.utils</groupId>
+                <artifactId>test-utils-logging-simple</artifactId>
+                <type>pom</type>
+                <version>${framework-libraries.version}</version>
+            </dependency>
             <dependency>
                 <groupId>uk.gov.justice.utils</groupId>
                 <artifactId>test-utils-core</artifactId>
-                <version>${test-utils.version}</version>
+                <version>${framework-libraries.version}</version>
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>
@@ -78,32 +92,6 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.wildfly.swarm</groupId>
-                <artifactId>bom-all</artifactId>
-                <version>${wildfly.swarm.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>uk.gov.justice</groupId>
-                <artifactId>maven-common-bom</artifactId>
-                <version>${common-bom.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>uk.gov.justice.services</groupId>
-                <artifactId>framework-bom</artifactId>
-                <version>${framework.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>uk.gov.justice.utils</groupId>
-                <artifactId>utilities-core</artifactId>
-                <version>${utilities.version}</version>
-            </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>event-repository-liquibase</artifactId>
@@ -115,10 +103,24 @@
                 <version>${event-store.version}</version>
             </dependency>
             <dependency>
-                <groupId>uk.gov.justice.utils</groupId>
-                <artifactId>test-utils-logging-simple</artifactId>
+                <groupId>uk.gov.justice.event-store</groupId>
+                <artifactId>event-source</artifactId>
+                <version>${event-store.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.framework-api</groupId>
+                <artifactId>framework-api-event-source</artifactId>
+                <version>${framework-libraries.version}</version>
+            </dependency>
+
+            <!-- end maybe move to boms -->
+
+            <dependency>
+                <groupId>org.wildfly.swarm</groupId>
+                <artifactId>bom-all</artifactId>
+                <version>${wildfly.swarm.version}</version>
+                <scope>import</scope>
                 <type>pom</type>
-                <version>${test-utils.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.tngtech.java</groupId>
@@ -127,13 +129,11 @@
                 <scope>test</scope>
             </dependency>
             <dependency>
-                <groupId>uk.gov.justice.event-store</groupId>
-                <artifactId>event-store-bom</artifactId>
-                <version>${event-store.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
+                <groupId>uk.gov.justice</groupId>
+                <artifactId>stream-transformation-tool-api</artifactId>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
-</project>
+</project>
diff --git a/stream-transformation-test/pom.xml b/stream-transformation-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>stream-transformation-tool</artifactId>
         <groupId>uk.gov.justice</groupId>
-        <version>6.4.6-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>stream-transformation-test</artifactId>

diff --git a/stream-transformation-test/sample-transformations/pom.xml b/stream-transformation-test/sample-transformations/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>stream-transformation-test</artifactId>
         <groupId>uk.gov.justice</groupId>
-        <version>6.4.6-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>stream-transformations</artifactId>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>
             <artifactId>framework-api-core</artifactId>
-            <version>${framework-api.version}</version>
+            <version>${framework-libraries.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice</groupId>

diff --git a/stream-transformation-test/stream-transformation-it/pom.xml b/stream-transformation-test/stream-transformation-it/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>stream-transformation-test</artifactId>
         <groupId>uk.gov.justice</groupId>
-        <version>6.4.6-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>stream-transformation-it</artifactId>
@@ -84,7 +84,6 @@
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>
             <artifactId>test-utils-core</artifactId>
-            <version>${test-utils.version}</version>
         </dependency>
 
     </dependencies>

diff --git a/stream-transformation-test/stream-transformation-performance-test/pom.xml b/stream-transformation-test/stream-transformation-performance-test/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>stream-transformation-test</artifactId>
         <groupId>uk.gov.justice</groupId>
-        <version>6.4.6-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>stream-transformation-performance-test</artifactId>

diff --git a/stream-transformation-tool-anonymise/pom.xml b/stream-transformation-tool-anonymise/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>stream-transformation-tool</artifactId>
         <groupId>uk.gov.justice</groupId>
-        <version>6.4.6-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -18,7 +18,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.everit.json</groupId>
+            <groupId>com.github.everit-org.json-schema</groupId>
             <artifactId>org.everit.json.schema</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -30,4 +30,4 @@
     </dependencies>
 
 
-</project>
+</project>
diff --git a/stream-transformation-tool-api/pom.xml b/stream-transformation-tool-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>uk.gov.justice</groupId>
         <artifactId>stream-transformation-tool</artifactId>
-        <version>6.4.6-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>stream-transformation-tool-api</artifactId>

diff --git a/stream-transformation-tool-fraction/pom.xml b/stream-transformation-tool-fraction/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>stream-transformation-tool</artifactId>
         <groupId>uk.gov.justice</groupId>
-        <version>6.4.6-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>stream-transformation-tool-fraction</artifactId>

diff --git a/stream-transformation-tool-service/pom.xml b/stream-transformation-tool-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice</groupId>
         <artifactId>stream-transformation-tool</artifactId>
-        <version>6.4.6-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,17 +19,14 @@
         <dependency>
             <groupId>uk.gov.justice</groupId>
             <artifactId>stream-transformation-tool-api</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.event-store</groupId>
             <artifactId>event-source</artifactId>
-            <version>${event-store.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>
             <artifactId>framework-api-event-source</artifactId>
-            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>