Merge pull request #84 from CJSCommonPlatform/update-framework

Update framework to 11.0.0-M6
CJSCommonPlatform · Jun 15, 2021 · 6ca5b23 · 6ca5b23
2 parents ff2f58f + a985a1c
commit 6ca5b23
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 17 deletions.
diff --git a/.../test/java/uk/gov/justice/services/example/cakeshop/command/handler/EventFactoryTest.java b/.../test/java/uk/gov/justice/services/example/cakeshop/command/handler/EventFactoryTest.java
@@ -14,6 +14,7 @@
 import java.time.ZonedDateTime;
 import java.util.UUID;
 
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,10 +45,11 @@ public void shouldCreateCakeOrderedEvent() throws Exception {
 
     }
 
+    @SuppressWarnings("deprecation")
     @Test(expected = IllegalStateException.class)
     public void shouldThrowIllegalStateExceptionOnMapperIOException() throws IOException {
         final ObjectMapper mockedMapper = Mockito.mock(ObjectMapper.class);
-        when(mockedMapper.readValue(Mockito.anyString(), Mockito.eq(CakeOrdered.class))).thenThrow(new IOException("Error"));
+        when(mockedMapper.readValue(Mockito.anyString(), Mockito.eq(CakeOrdered.class))).thenThrow(new JsonMappingException("Error"));
         eventFactory.objectMapper = mockedMapper;
 
         eventFactory.cakeOrderedEventFrom(envelope().with(metadataWithDefaults()).build());

diff --git a/example-context/example-service/example-event/pom.xml b/example-context/example-service/example-event/pom.xml
@@ -222,6 +222,11 @@
                             </execution>
                         </executions>
                         <dependencies>
+                            <dependency>
+                                <groupId>javax</groupId>
+                                <artifactId>javaee-api</artifactId>
+                                <version>${jee.api.version}</version>
+                            </dependency>
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>messaging-adapter-generator</artifactId>

diff --git a/example-context/example-service/example-it/pom.xml b/example-context/example-service/example-it/pom.xml
@@ -48,7 +48,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.jayway.awaitility</groupId>
+            <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
             <scope>test</scope>
         </dependency>

diff --git a/...e-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopConcurrencyIT.java b/...e-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopConcurrencyIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.util.UUID.randomUUID;
 import static javax.json.Json.createArrayBuilder;

diff --git a/...t/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopEventBufferingIT.java b/...t/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopEventBufferingIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static java.util.UUID.fromString;
 import static java.util.UUID.randomUUID;
 import static javax.ws.rs.client.Entity.entity;

diff --git a/...mple-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFailuresIT.java b/...mple-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFailuresIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;

diff --git a/...e-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFileServiceIT.java b/...e-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFileServiceIT.java
@@ -1,7 +1,7 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
 import static com.google.common.io.Resources.getResource;
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.lang.String.format;
 import static java.util.UUID.randomUUID;

diff --git a/...ple-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFilteringIT.java b/...ple-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopFilteringIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.emptyCollection;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.util.Arrays.asList;

diff --git a/...vice/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopIT.java b/...vice/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.util.Collections.singletonList;
 import static java.util.UUID.randomUUID;

diff --git a/...ple-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopTimeStampIT.java b/...ple-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/CakeShopTimeStampIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.time.temporal.ChronoUnit.SECONDS;
 import static java.util.UUID.randomUUID;

diff --git a/...est/java/uk/gov/justice/services/example/cakeshop/it/MultipleEventListenerCakeShopIT.java b/...est/java/uk/gov/justice/services/example/cakeshop/it/MultipleEventListenerCakeShopIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.util.Collections.singletonList;
 import static java.util.UUID.randomUUID;

diff --git a/...mple-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SnapshotCakeShopIT.java b/...mple-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SnapshotCakeShopIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.util.UUID.randomUUID;
 import static org.hamcrest.core.IsCollectionContaining.hasItem;

diff --git a/...rvice/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java b/...rvice/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/SuspendIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.lang.Integer.parseInt;
 import static java.lang.String.format;
@@ -219,6 +219,8 @@ private void verifyRecipeAdded(final String recipeId,
             } else {
                 verifyResponse(recId, status);
             }
+
+            return true;
         });
     }
 

diff --git a/...-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/UnifiedSearchIndexerIT.java b/...-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/UnifiedSearchIndexerIT.java
@@ -1,6 +1,6 @@
 package uk.gov.justice.services.example.cakeshop.it;
 
-import static com.jayway.awaitility.Awaitility.await;
+import static org.awaitility.Awaitility.await;
 import static com.jayway.jsonassert.JsonAssert.with;
 import static java.util.UUID.randomUUID;
 import static javax.json.Json.createObjectBuilder;

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
@@ -117,6 +117,11 @@
                     </execution>
                 </executions>
                 <dependencies>
+                    <dependency>
+                        <groupId>javax</groupId>
+                        <artifactId>javaee-api</artifactId>
+                        <version>${javaee-api.version}</version>
+                    </dependency>
                     <dependency>
                         <groupId>uk.gov.justice.services.example</groupId>
                         <artifactId>example-query-view</artifactId>

diff --git a/example-context/example-service/pom.xml b/example-context/example-service/pom.xml
@@ -403,6 +403,11 @@
                             </execution>
                         </executions>
                         <dependencies>
+                            <dependency>
+                                <groupId>javax</groupId>
+                                <artifactId>javaee-api</artifactId>
+                                <version>${jee.api.version}</version>
+                            </dependency>
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>rest-adapter-generator</artifactId>
@@ -445,6 +450,11 @@
                             </execution>
                            </executions>
                         <dependencies>
+                            <dependency>
+                                <groupId>javax</groupId>
+                                <artifactId>javaee-api</artifactId>
+                                <version>${jee.api.version}</version>
+                            </dependency>
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>messaging-adapter-generator</artifactId>
@@ -485,6 +495,11 @@
                             </execution>
                         </executions>
                         <dependencies>
+                            <dependency>
+                                <groupId>javax</groupId>
+                                <artifactId>javaee-api</artifactId>
+                                <version>${jee.api.version}</version>
+                            </dependency>
                             <dependency>
                                 <groupId>uk.gov.justice.framework-generators</groupId>
                                 <artifactId>messaging-client-generator</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>uk.gov.justice</groupId>
         <artifactId>maven-framework-parent-pom</artifactId>
-        <version>11.0.0-M1</version>
+        <version>11.0.0-M3</version>
     </parent>
 
     <groupId>uk.gov.justice.example</groupId>
@@ -34,10 +34,11 @@
         <wildfly.version>20.0.1.Final</wildfly.version>
         <wildfly.maven.plugin.version>2.0.2.Final</wildfly.maven.plugin.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>
+        <framework-libraries.version>11.0.0-M7</framework-libraries.version>
+        <framework.version>11.0.0-M6</framework.version>
+        <event-store.version>11.0.0-M6</event-store.version>
 
+        <jee.api.version>8.0</jee.api.version>
     </properties>
 
     <dependencyManagement>