Update to Java 11

CJSCommonPlatform · Jan 4, 2021 · 0988f70 · 0988f70
1 parent ee0bff6
commit 0988f70
Show file tree

Hide file tree

Showing 69 changed files with 108 additions and 81 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ dist: trusty
 sudo: required
 language: java
 jdk:
-- oraclejdk8
+- openjdk11
 git:
   depth: 3
 cache:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,16 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
-### Added
-- New JNDI variable `feature-control.enabled` for enabling/disabling of remote fetching of Features
+
+## [7.2.2] - 2020-12-22
+### Changed
+- Update to OpenJDK 11
+    - Update framework-libraries to 8.0.0-M1
+    - Update framework-parent-pom to 8.0.0-M2
+
 ## [7.2.2] - 2020-11-18
 ### Added
+- New JNDI variable `feature-control.enabled` for enabling/disabling of remote fetching of Features
 - Moved in EmptyFeatureFetcher from framework-api
 
 ## [7.2.1] - 2020-11-18

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>7.2.3-SNAPSHOT</version>
+        <version>8.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>7.2.3-SNAPSHOT</version>
+        <version>8.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>7.2.3-SNAPSHOT</version>
+        <version>8.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>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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>7.2.3-SNAPSHOT</version>
+        <version>8.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>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -125,11 +125,13 @@
         <dependency>
             <groupId>org.apache.tomee</groupId>
             <artifactId>openejb-core</artifactId>
+            <version>7.1.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.tomee</groupId>
             <artifactId>openejb-server</artifactId>
+            <version>7.1.4</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/core/src/test/java/uk/gov/justice/services/core/extension/EventFoundEventTest.java b/core/src/test/java/uk/gov/justice/services/core/extension/EventFoundEventTest.java
@@ -7,7 +7,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.runners.MockitoJUnitRunner;
-import org.omg.CORBA.Object;
 
 /**
  * Unit tests for the {@link EventFoundEvent} class.

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>7.2.3-SNAPSHOT</version>
+        <version>8.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>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-subscription/src/main/java/uk/gov/justice/subscription/EventSourcesParser.java b/event-subscription/src/main/java/uk/gov/justice/subscription/EventSourcesParser.java
@@ -5,6 +5,7 @@
 import uk.gov.justice.subscription.domain.eventsource.EventSourceDefinition;
 
 import java.net.URL;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
@@ -18,8 +19,8 @@ public class EventSourcesParser {
 
     private static final String EVENT_SOURCES_SCHEMA_PATH = "/json/schema/event-source-schema.json";
     private static final String EVENT_SOURCES = "event_sources";
-    private static final TypeReference<Map<String, List<EventSourceDefinition>>> EVENT_SOURCES_TYPE_REF
-            = new TypeReference<Map<String, List<EventSourceDefinition>>>() {
+    private static final TypeReference<HashMap<String, List<EventSourceDefinition>>> EVENT_SOURCES_TYPE_REF
+            = new TypeReference<HashMap<String, List<EventSourceDefinition>>>() {
     };
 
     private final YamlParser yamlParser;

diff --git a/...subscription/src/main/java/uk/gov/justice/subscription/SubscriptionsDescriptorParser.java b/...subscription/src/main/java/uk/gov/justice/subscription/SubscriptionsDescriptorParser.java
@@ -8,6 +8,7 @@
 
 import java.net.URL;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -20,8 +21,8 @@ public class SubscriptionsDescriptorParser {
 
     private static final String SUBSCRIPTION_SCHEMA_PATH = "/json/schema/subscription-schema.json";
     private static final String SUBSCRIPTIONS_DESCRIPTOR = "subscriptions_descriptor";
-    private static final TypeReference<Map<String, SubscriptionsDescriptor>> SUBSCRIPTIONS_DESCRIPTOR_TYPE_REF
-            = new TypeReference<Map<String, SubscriptionsDescriptor>>() {
+    private static final TypeReference<HashMap<String, SubscriptionsDescriptor>> SUBSCRIPTIONS_DESCRIPTOR_TYPE_REF
+            = new TypeReference<>() {
     };
 
     private YamlParser yamlParser;

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

diff --git a/framework-generators/direct-adapter-core/pom.xml b/framework-generators/direct-adapter-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/direct-client-generator-plugin/pom.xml b/framework-generators/direct-client-generator-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/direct-client-generator/pom.xml b/framework-generators/direct-client-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -66,6 +66,11 @@
             <artifactId>openejb-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tomee</groupId>
+            <artifactId>openejb-server</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>uk.gov.justice.framework-generators</groupId>
             <artifactId>generators-test-utils</artifactId>

diff --git a/framework-generators/generators-commons/pom.xml b/framework-generators/generators-commons/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.justice.framework-generators</groupId>
         <artifactId>framework-generators</artifactId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/generators-subscription/pom.xml b/framework-generators/generators-subscription/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/generators-test-utils/pom.xml b/framework-generators/generators-test-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/messaging-adapter-core/pom.xml b/framework-generators/messaging-adapter-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/messaging-adapter-generator-plugin/pom.xml b/framework-generators/messaging-adapter-generator-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/messaging-adapter-generator/pom.xml b/framework-generators/messaging-adapter-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <artifactId>messaging-adapter-generator</artifactId>
     <dependencies>

diff --git a/framework-generators/messaging-client-generator-plugin/pom.xml b/framework-generators/messaging-client-generator-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/messaging-client-generator/pom.xml b/framework-generators/messaging-client-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

diff --git a/framework-generators/rest-adapter-core/pom.xml b/framework-generators/rest-adapter-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>rest-adapter-core</artifactId>

diff --git a/framework-generators/rest-adapter-file-service/pom.xml b/framework-generators/rest-adapter-file-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/rest-adapter-generator-plugin/pom.xml b/framework-generators/rest-adapter-generator-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/rest-adapter-generator/pom.xml b/framework-generators/rest-adapter-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/rest-client-core/pom.xml b/framework-generators/rest-client-core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>rest-client-core</artifactId>

diff --git a/framework-generators/rest-client-generator-plugin/pom.xml b/framework-generators/rest-client-generator-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/rest-client-generator/pom.xml b/framework-generators/rest-client-generator/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>rest-client-generator</artifactId>

diff --git a/framework-generators/unifiedsearch-client-generator-plugin/pom.xml b/framework-generators/unifiedsearch-client-generator-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/framework-generators/unifiedsearch-client-generator/pom.xml b/framework-generators/unifiedsearch-client-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...ustice/services/clients/unifiedsearch/generator/parser/UnifiedSearchDescriptorParser.java b/...ustice/services/clients/unifiedsearch/generator/parser/UnifiedSearchDescriptorParser.java
@@ -11,6 +11,7 @@
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -23,8 +24,8 @@ public class UnifiedSearchDescriptorParser implements FileParser<UnifiedSearchDe
 
     private static final String UNIFIED_SEARCH_SCHEMA_PATH = "/schema/unified-search-schema.json";
 
-    private static final TypeReference<Map<String, UnifiedSearchDescriptor>> UNIFIED_SEARCH_DESCRIPTOR_TYPE_REF
-            = new TypeReference<Map<String, UnifiedSearchDescriptor>>() {
+    private static final TypeReference<HashMap<String, UnifiedSearchDescriptor>> UNIFIED_SEARCH_DESCRIPTOR_TYPE_REF
+            = new TypeReference<HashMap<String, UnifiedSearchDescriptor>>() {
     };
 
     private static final String UNIFIED_SEARCH_DESCRIPTOR = "unified_search_descriptor";

diff --git a/framework-generators/unifiedsearch-core/pom.xml b/framework-generators/unifiedsearch-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>framework-generators</artifactId>
         <groupId>uk.gov.justice.framework-generators</groupId>
-        <version>7.2.3-SNAPSHOT</version>
+        <version>8.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>