Merge e23d135 into 4e00df0

CJSCommonPlatform · May 15, 2020 · c075513 · c075513
2 parents 4e00df0 + e23d135
commit c075513
Show file tree

Hide file tree

Showing 71 changed files with 245 additions and 1,061 deletions.
diff --git a/aggregate/pom.xml b/aggregate/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/common-rest/pom.xml b/common-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/custom/pom.xml b/components/custom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>components</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>uk.gov.justice.schema</groupId>
             <artifactId>schema-service</artifactId>
-            <version>${json-schema-catalog.version}</version>
+            <version>${framework-libraries.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/components/pom.xml b/components/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>uk.gov.justice.schema</groupId>
             <artifactId>schema-service</artifactId>
-            <version>${json-schema-catalog.version}</version>
+            <version>${framework-libraries.version}</version>
         </dependency>
         <dependency>
             <groupId>javax.enterprise</groupId>
@@ -80,7 +80,7 @@
             <groupId>uk.gov.justice.utils</groupId>
             <artifactId>test-utils-core</artifactId>
             <scope>test</scope>
-            <version>${test-utils.version}</version>
+            <version>${framework-utilities.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.services</groupId>

diff --git a/event-subscription-test-utils/pom.xml b/event-subscription-test-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-subscription/pom.xml b/event-subscription/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-bom/pom.xml b/framework-bom/pom.xml
@@ -5,17 +5,13 @@
     <parent>
         <artifactId>microservice-framework</artifactId>
         <groupId>uk.gov.justice.services</groupId>
-        <version>6.4.3-SNAPSHOT</version>
+        <version>7.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>framework-bom</artifactId>
     <packaging>pom</packaging>
 
-    <properties>
-        <cpp.framework.version>${project.version}</cpp.framework.version>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -66,77 +62,77 @@
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>framework-utilities</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>common</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>core</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>messaging-core</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>persistence-deltaspike</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>persistence-jdbc</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-core</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-persistence</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>custom</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>jmx-command-handling</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>aggregate</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-enveloper-provider</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-framework-persistence</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-messaging</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>framework-management</artifactId>
-                <version>${cpp.framework.version}</version>
+                <version>${project.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/framework-generators-old/pom.xml b/framework-generators-old/pom.xml