Security updates to apache.tika, commons.beanutils, commons.guava and…

… junit in common-bom

CHANGELOG.md

@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file, which follo
 on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
+## [7.1.3] - 2020-10-14
+### Changed
+- Security updates to apache.tika, commons.beanutils, commons.guava and junit in common-bom
+- Updated common-bom to 7.1.1
+
 ## [Unreleased]
 ## [7.1.2] - 2020-10-09
 ### Changed

common-rest/src/test/java/uk/gov/justice/services/common/rest/BadRequestExceptionMapperTest.java

@@ -4,8 +4,8 @@
 import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
 import uk.gov.justice.services.adapter.rest.exception.BadRequestException;
 import uk.gov.justice.services.core.json.DefaultJsonValidationLoggerHelper;

common-rest/src/test/java/uk/gov/justice/services/common/rest/ForbiddenRequestExceptionMapperTest.java

@@ -4,8 +4,8 @@
 import static javax.ws.rs.core.Response.Status.FORBIDDEN;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
 import uk.gov.justice.services.common.exception.ForbiddenRequestException;
 

common/src/test/java/uk/gov/justice/services/common/annotation/ComponentNameExtractorTest.java

@@ -3,7 +3,7 @@
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static uk.gov.justice.services.test.utils.common.MemberInjectionPoint.injectionPointWith;
 
 import uk.gov.justice.services.core.annotation.Adapter;

common/src/test/java/uk/gov/justice/services/common/annotation/exception/MissingAnnotationExceptionTest.java

@@ -1,8 +1,8 @@
 package uk.gov.justice.services.common.annotation.exception;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
 import uk.gov.justice.services.core.annotation.exception.MissingAnnotationException;
 

common/src/test/java/uk/gov/justice/services/common/http/DefaultServerPortProviderTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static uk.gov.justice.services.common.http.DefaultServerPortProvider.DEFAULT_PORT;
 
 import org.junit.After;

core/src/test/java/uk/gov/justice/services/core/accesscontrol/AccessControlFailureMessageGeneratorTest.java

@@ -2,7 +2,7 @@
 
 import static java.util.UUID.fromString;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;

core/src/test/java/uk/gov/justice/services/core/accesscontrol/AllowAllPolicyEvaluatorTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.accesscontrol;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
 import uk.gov.justice.services.messaging.JsonEnvelope;

core/src/test/java/uk/gov/justice/services/core/accesscontrol/DefaultAccessControlServiceTest.java

@@ -4,7 +4,7 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.CoreMatchers.sameInstance;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;

core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherCacheTest.java

@@ -2,9 +2,9 @@
 
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNot.not;
-import static org.junit.Assert.assertThat;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.core.annotation.Component.QUERY_API;
 import static uk.gov.justice.services.core.annotation.ServiceComponentLocation.LOCAL;

core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherConfigurationTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.dispatcher;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.setField;
 
 import org.junit.Test;

core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherFactoryTest.java

@@ -5,8 +5,8 @@
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertThat;
 
 import uk.gov.justice.services.core.handler.registry.HandlerRegistry;
 

core/src/test/java/uk/gov/justice/services/core/dispatcher/DispatcherTest.java

@@ -4,9 +4,9 @@
 import static java.util.UUID.randomUUID;
 import static javax.json.Json.createObjectBuilder;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isA;
-import static org.junit.Assert.assertThat;
 import static uk.gov.justice.services.core.annotation.Component.COMMAND_API;
 import static uk.gov.justice.services.core.annotation.Component.QUERY_API;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;

core/src/test/java/uk/gov/justice/services/core/dispatcher/EmptySystemUserProviderTest.java

@@ -1,8 +1,8 @@
 package uk.gov.justice.services.core.dispatcher;
 
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.verify;
 
 import java.util.Optional;

core/src/test/java/uk/gov/justice/services/core/dispatcher/EnvelopePayloadTypeConverterTest.java

@@ -3,11 +3,11 @@
 import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
 import static javax.json.Json.createObjectBuilder;
 import static javax.json.JsonValue.ValueType.OBJECT;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isA;
 import static org.hamcrest.Matchers.nullValue;
-import static org.junit.Assert.assertThat;
 import static uk.gov.justice.services.messaging.Envelope.envelopeFrom;
 
 import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer;

core/src/test/java/uk/gov/justice/services/core/dispatcher/JsonEnvelopeRepackerTest.java

@@ -1,9 +1,9 @@
 package uk.gov.justice.services.core.dispatcher;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isA;
 import static org.hamcrest.Matchers.sameInstance;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 import uk.gov.justice.services.messaging.Envelope;

core/src/test/java/uk/gov/justice/services/core/dispatcher/SystemUserUtilTest.java

@@ -3,8 +3,8 @@
 import static co.unruly.matchers.OptionalMatchers.contains;
 import static java.util.UUID.randomUUID;
 import static javax.json.Json.createObjectBuilder;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.services.messaging.JsonEnvelope.envelopeFrom;
 import static uk.gov.justice.services.messaging.JsonEnvelope.metadataBuilder;

core/src/test/java/uk/gov/justice/services/core/envelope/EnvelopeInspectorTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.envelope;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;

core/src/test/java/uk/gov/justice/services/core/envelope/EnvelopeValidationExceptionHandlerProducerTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.envelope;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
-import static org.junit.Assert.assertThat;
 
 import org.junit.Rule;
 import org.junit.Test;

core/src/test/java/uk/gov/justice/services/core/envelope/EnvelopeValidatorTest.java

@@ -3,7 +3,7 @@
 import static java.util.Optional.of;
 import static javax.json.JsonValue.NULL;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

core/src/test/java/uk/gov/justice/services/core/envelope/MediaTypeProviderTest.java

@@ -3,7 +3,7 @@
 import static java.util.Optional.empty;
 import static java.util.Optional.of;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

core/src/test/java/uk/gov/justice/services/core/enveloper/exception/InvalidEventExceptionTest.java

@@ -1,8 +1,8 @@
 package uk.gov.justice.services.core.enveloper.exception;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 

core/src/test/java/uk/gov/justice/services/core/enveloper/spi/DefaultEnveloperProviderIT.java

@@ -1,8 +1,8 @@
 package uk.gov.justice.services.core.enveloper.spi;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static uk.gov.justice.services.messaging.Envelope.envelopeFrom;
 
 import uk.gov.justice.domain.annotation.Event;

core/src/test/java/uk/gov/justice/services/core/extension/BeanInstantiaterTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.extension;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

core/src/test/java/uk/gov/justice/services/core/extension/EventFoundEventTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.extension;
 
 import static org.hamcrest.CoreMatchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import org.junit.Before;
 import org.junit.Test;

core/src/test/java/uk/gov/justice/services/core/extension/ServiceComponentScannerTest.java

@@ -4,7 +4,7 @@
 import static java.util.Arrays.asList;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;

core/src/test/java/uk/gov/justice/services/core/handler/HandlerMethodTest.java

@@ -4,9 +4,9 @@
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.CoreMatchers.sameInstance;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.isA;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.verify;

core/src/test/java/uk/gov/justice/services/core/handler/HandlersTest.java

@@ -2,7 +2,7 @@
 
 import static net.trajano.commons.testing.UtilityClassTestUtil.assertUtilityClassWellDefined;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.handler.registry.exception.InvalidHandlerException;

core/src/test/java/uk/gov/justice/services/core/handler/exception/HandlerExecutionExceptionTest.java

@@ -1,8 +1,8 @@
 package uk.gov.justice.services.core.handler.exception;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 import org.junit.Test;

core/src/test/java/uk/gov/justice/services/core/handler/exception/MissingHandlerExceptionTest.java

@@ -1,8 +1,8 @@
 package uk.gov.justice.services.core.handler.exception;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 

core/src/test/java/uk/gov/justice/services/core/handler/registry/exception/DuplicateHandlerExceptionTest.java

@@ -1,8 +1,8 @@
 package uk.gov.justice.services.core.handler.registry.exception;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 

core/src/test/java/uk/gov/justice/services/core/handler/registry/exception/InvalidHandlerExceptionTest.java

@@ -1,8 +1,8 @@
 package uk.gov.justice.services.core.handler.registry.exception;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 

core/src/test/java/uk/gov/justice/services/core/interceptor/DefaultContextPayloadTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.interceptor;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static uk.gov.justice.services.core.interceptor.DefaultContextPayload.contextPayloadWith;
 import static uk.gov.justice.services.core.interceptor.DefaultContextPayload.contextPayloadWithNoEnvelope;

core/src/test/java/uk/gov/justice/services/core/interceptor/DefaultInterceptorChainProcessorTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.interceptor;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.services.core.interceptor.InterceptorContext.interceptorContextWithInput;

core/src/test/java/uk/gov/justice/services/core/interceptor/DefaultInterceptorChainTest.java

@@ -1,8 +1,8 @@
 package uk.gov.justice.services.core.interceptor;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsCollectionContaining.hasItems;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 import uk.gov.justice.services.test.utils.common.stream.StreamCloseSpy;

core/src/test/java/uk/gov/justice/services/core/interceptor/DefaultInterceptorContextTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.interceptor;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static uk.gov.justice.services.core.interceptor.InterceptorContext.interceptorContextWithInput;
 

core/src/test/java/uk/gov/justice/services/core/interceptor/InterceptorCacheTest.java

@@ -3,9 +3,9 @@
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.empty;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 

core/src/test/java/uk/gov/justice/services/core/interceptor/InterceptorChainObserverTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.interceptor;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;

core/src/test/java/uk/gov/justice/services/core/interceptor/InterceptorChainProcessorProducerTest.java

@@ -2,8 +2,8 @@
 
 import static java.util.UUID.randomUUID;
 import static javax.json.Json.createObjectBuilder;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER;
 import static uk.gov.justice.services.core.annotation.Component.QUERY_API;

core/src/test/java/uk/gov/justice/services/core/interceptor/spi/DefaultInterceptorContextProviderTest.java

@@ -1,7 +1,7 @@
 package uk.gov.justice.services.core.interceptor.spi;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import uk.gov.justice.services.core.interceptor.DefaultInterceptorContext;
 import uk.gov.justice.services.core.interceptor.InterceptorContext;