Combine repos and update framework to version 7.0.0

CJSCommonPlatform · May 18, 2020 · 6d10c86 · 6d10c86
1 parent 42289bd
commit 6d10c86
Show file tree

Hide file tree

Showing 19 changed files with 100 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,25 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [7.0.0] - 2020-05-18
+
+### Changed
+- Update maven common bom version to 2.5.0
+- Update framework-api version to 7.0.0
+- Update framework-utilities version to 7.0.1
+- Update framework-libraries version to 7.0.1
+- Combined the following repos into microservice-framework
+    microservice_framework_version_6
+    framework-generators
+    framework-jmx-command-client
+    mertrics
+
+### Added
+- microservice_framework_version_6 6.4.2: now set to version 7.0.0
+- framework-generators 2.4.4: now set to version 7.0.0
+- framework-jmx-command-client 2.4.2: now set to version 7.0.0
+- metrics 3.3.2: now set to version 7.0.0
+
 ## [6.4.2] - 2020-04-23
 ### Changed
 - Update framework-api to 4.3.0

diff --git a/core/pom.xml b/core/pom.xml
@@ -47,15 +47,13 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
             <groupId>com.github.everit-org.json-schema</groupId>
             <artifactId>org.everit.json.schema</artifactId>
-
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

diff --git a/event-subscription/pom.xml b/event-subscription/pom.xml
@@ -40,7 +40,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>persistence-jdbc</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->

diff --git a/framework-bom/pom.xml b/framework-bom/pom.xml
@@ -12,6 +12,10 @@
     <artifactId>framework-bom</artifactId>
     <packaging>pom</packaging>
 
+    <properties>
+        <framework.version>${project.version}</framework.version>
+    </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -59,80 +63,117 @@
                 <artifactId>framework-api-rest-client</artifactId>
                 <version>${framework-api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.framework-api</groupId>
+                <artifactId>framework-api-event-buffer</artifactId>
+                <version>${framework-api.version}</version>
+            </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>framework-utilities</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>common</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>core</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>messaging-core</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>persistence-deltaspike</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>persistence-jdbc</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-core</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-persistence</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>custom</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>jmx-command-handling</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>aggregate</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-enveloper-provider</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-framework-persistence</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>test-utils-messaging</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
             </dependency>
             <dependency>
                 <groupId>uk.gov.justice.services</groupId>
                 <artifactId>framework-management</artifactId>
-                <version>${project.version}</version>
+                <version>${framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.services</groupId>
+                <artifactId>test-utils-common</artifactId>
+                <version>${framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.services</groupId>
+                <artifactId>common-rest</artifactId>
+                <version>${framework.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.utils</groupId>
+                <artifactId>utilities-core</artifactId>
+                <version>${framework-utilities.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.utils</groupId>
+                <artifactId>test-utils-logging-simple</artifactId>
+                <version>${framework-utilities.version}</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.utils</groupId>
+                <artifactId>test-utils-logging-log4j</artifactId>
+                <version>${framework-utilities.version}</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.utils</groupId>
+                <artifactId>test-utils-core</artifactId>
+                <version>${framework-utilities.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/framework-generators/direct-adapter-core/pom.xml b/framework-generators/direct-adapter-core/pom.xml
@@ -65,7 +65,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/framework-generators/direct-client-generator/pom.xml b/framework-generators/direct-client-generator/pom.xml
@@ -24,7 +24,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>direct-adapter-core</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.raml</groupId>
@@ -70,7 +69,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/framework-generators/generators-commons/pom.xml b/framework-generators/generators-commons/pom.xml
@@ -88,7 +88,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/framework-generators/messaging-adapter-core/pom.xml b/framework-generators/messaging-adapter-core/pom.xml
@@ -24,7 +24,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>
             <artifactId>framework-api-event-buffer</artifactId>
-            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>

diff --git a/framework-generators/messaging-adapter-generator/pom.xml b/framework-generators/messaging-adapter-generator/pom.xml
@@ -92,7 +92,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/framework-generators/messaging-client-generator/pom.xml b/framework-generators/messaging-client-generator/pom.xml
@@ -54,7 +54,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/framework-generators/rest-adapter-core/pom.xml b/framework-generators/rest-adapter-core/pom.xml
@@ -107,7 +107,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/framework-generators/rest-adapter-generator/pom.xml b/framework-generators/rest-adapter-generator/pom.xml
@@ -89,7 +89,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/framework-generators/rest-client-generator/pom.xml b/framework-generators/rest-client-generator/pom.xml
@@ -37,7 +37,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/framework-generators/unifiedsearch-client-generator/pom.xml b/framework-generators/unifiedsearch-client-generator/pom.xml
@@ -56,7 +56,6 @@
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>
-            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/framework-system/shuttering-persistence/pom.xml b/framework-system/shuttering-persistence/pom.xml
@@ -20,7 +20,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>persistence-jdbc</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>

diff --git a/jmx/jmx-command-handling/pom.xml b/jmx/jmx-command-handling/pom.xml
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>persistence-jdbc</artifactId>
-            <version>${project.version}</version>
         </dependency>
 
         <!-- Test Dependencies -->

diff --git a/pom.xml b/pom.xml
@@ -48,10 +48,10 @@
     <properties>
         <cpp.repo.name>microservice_framework</cpp.repo.name>
 
-        <common-bom.version>2.4.0</common-bom.version>
-        <framework-api.version>4.3.0</framework-api.version>
-        <framework-utilities.version>7.0.0-M2</framework-utilities.version>
-        <framework-libraries.version>7.0.0-M2</framework-libraries.version>
+        <common-bom.version>2.5.0</common-bom.version>
+        <framework-api.version>7.0.0</framework-api.version>
+        <framework-utilities.version>7.0.1</framework-utilities.version>
+        <framework-libraries.version>7.0.1</framework-libraries.version>
         <embedded-artemis.version>1.2.0</embedded-artemis.version>
         <jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>
     </properties>
@@ -166,6 +166,26 @@
                 <artifactId>framework-utilities</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.framework-generators</groupId>
+                <artifactId>direct-adapter-core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.framework-generators</groupId>
+                <artifactId>generators-test-utils</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.framework-api</groupId>
+                <artifactId>framework-api-event-buffer</artifactId>
+                <version>${framework-api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>uk.gov.justice.services</groupId>
+                <artifactId>persistence-jdbc</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/raml-lint-check/lint-check-rules/pom.xml b/raml-lint-check/lint-check-rules/pom.xml
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>uk.gov.justice.maven</groupId>
             <artifactId>maven-test-utils</artifactId>
-            <version>${framework-libraries.version}</version>
+            <version>${framework-utilities.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/test-utils/test-utils-framework-persistence/pom.xml b/test-utils/test-utils-framework-persistence/pom.xml
@@ -19,7 +19,6 @@
         <dependency>
             <groupId>uk.gov.justice.services</groupId>
             <artifactId>persistence-jdbc</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>