Merge 54fcb8e into b3a62c2

CJSCommonPlatform · Jan 27, 2021 · 00a1b9a · 00a1b9a
2 parents b3a62c2 + 54fcb8e
commit 00a1b9a
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 40 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,11 +9,11 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 - Updated to java 11 and OpenJdk
 - Updated wildfly to 20.0.1-Final  
 - Reduced the maximum runtime for each iteration of the publishing beans in the IT tests to 450 milliseconds
-- Update to maven-framework-parent-pom 8.0.0-M2
-- Update to framework-libraries 8.0.0-M3
-- Update to framework 8.0.0-M3
-- Update to event-store 8.0.0-M1
-- Bumped the base version of the project to 8.0.0 to match the framework libraries and show java 11 change  
+- Update to maven-framework-parent-pom 11.0.0-M1
+- Update to framework-libraries 11.0.0-M1
+- Update to framework 11.0.0-M1
+- Update to event-store 11.0.0-M1
+- Bumped the base version of the project to 11.0.0 to match the framework libraries and show java 11 change  
 - Handled the move to the new Cloudsmith.io maven repository
 - Added support for feature toggling with an integration test showing it working
 

diff --git a/example-context/example-domain/pom.xml b/example-context/example-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-context</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-persistence/pom.xml b/example-context/example-persistence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-context</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -92,24 +92,19 @@
         <dependency>
             <groupId>org.apache.deltaspike.modules</groupId>
             <artifactId>deltaspike-test-control-module-api</artifactId>
-            <version>${deltaspike.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.deltaspike.modules</groupId>
             <artifactId>deltaspike-test-control-module-impl</artifactId>
-            <version>${deltaspike.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.deltaspike.cdictrl</groupId>
             <artifactId>deltaspike-cdictrl-openejb</artifactId>
-            <version>${deltaspike.version}</version>
             <scope>test</scope>
         </dependency>
-
-
     </dependencies>
     <build>
         <plugins>

diff --git a/example-context/example-service/example-command/example-command-api/pom.xml b/example-context/example-service/example-command/example-command-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-command</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-command/example-command-handler/pom.xml b/example-context/example-service/example-command/example-command-handler/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-command</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-command/pom.xml b/example-context/example-service/example-command/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-custom/example-custom-api/pom.xml b/example-context/example-service/example-custom/example-custom-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-custom</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-custom/pom.xml b/example-context/example-service/example-custom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event-source/pom.xml b/example-context/example-service/example-event-source/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event/example-event-indexer/pom.xml b/example-context/example-service/example-event/example-event-indexer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-event</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event/example-event-listener/pom.xml b/example-context/example-service/example-event/example-event-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-event</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event/example-event-processor/pom.xml b/example-context/example-service/example-event/example-event-processor/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-event</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>example-event-processor</artifactId>

diff --git a/example-context/example-service/example-event/other-event-listener/pom.xml b/example-context/example-service/example-event/other-event-listener/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-event</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-event/pom.xml b/example-context/example-service/example-event/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.services.example</groupId>
         <artifactId>example-service</artifactId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-feature-control/pom.xml b/example-context/example-service/example-feature-control/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-it/pom.xml b/example-context/example-service/example-it/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.services.example</groupId>
         <artifactId>example-service</artifactId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <artifactId>example-it</artifactId>
     <properties>

diff --git a/example-context/example-service/example-liquibase/pom.xml b/example-context/example-service/example-liquibase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.services.example</groupId>
         <artifactId>example-service</artifactId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-query/example-query-api/pom.xml b/example-context/example-service/example-query/example-query-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-query</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-query/example-query-view/pom.xml b/example-context/example-service/example-query/example-query-view/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-query</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-query/pom.xml b/example-context/example-service/example-query/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/example-single/pom.xml b/example-context/example-service/example-single/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>example-service</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/example-service/pom.xml b/example-context/example-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>example-context</artifactId>
         <groupId>uk.gov.justice.services.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/example-context/pom.xml b/example-context/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>cake-shop</artifactId>
         <groupId>uk.gov.justice.example</groupId>
-        <version>8.0.0-M1-SNAPSHOT</version>
+        <version>11.0.0-M1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -7,12 +7,12 @@
     <parent>
         <groupId>uk.gov.justice</groupId>
         <artifactId>maven-framework-parent-pom</artifactId>
-        <version>8.0.0-M2</version>
+        <version>11.0.0-M1</version>
     </parent>
 
     <groupId>uk.gov.justice.example</groupId>
     <artifactId>cake-shop</artifactId>
-    <version>8.0.0-M1-SNAPSHOT</version>
+    <version>11.0.0-M1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Cakeshop Application</name>
@@ -34,13 +34,10 @@
         <wildfly.version>20.0.1.Final</wildfly.version>
         <wildfly.maven.plugin.version>2.0.2.Final</wildfly.maven.plugin.version>
 
-        <framework-libraries.version>8.0.0-M3</framework-libraries.version>
-        <framework.version>8.0.0-M3</framework.version>
-        <event-store.version>8.0.0-M1</event-store.version>
+        <framework-libraries.version>11.0.0-M1</framework-libraries.version>
+        <framework.version>11.0.0-M1</framework.version>
+        <event-store.version>11.0.0-M1</event-store.version>
 
-
-        <!-- TODO - move dependency to common-bom -->
-        <deltaspike.version>1.9.1</deltaspike.version>
     </properties>
 
     <dependencyManagement>