Merge remote-tracking branch 'upstream/master' into aws-eks

NOTICE

@@ -302,9 +302,9 @@ The following software have components provided under the terms of this license:
 - Apache Commons Text (from https://commons.apache.org/proper/commons-text)
 - Apache Commons Validator (from http://commons.apache.org/proper/commons-validator/)
 - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version})
+- Apache Groovy (from http://groovy-lang.org)
 - Apache Groovy (from https://groovy-lang.org)
 - Apache Groovy (from https://groovy-lang.org)
-- Apache Groovy (from http://groovy-lang.org)
 - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api)
 - Apache Log4j Core (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-core)
 - Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul)
@@ -536,6 +536,7 @@ The following software have components provided under the terms of this license:
 - asm (from http://asm.ow2.io/)
 - asm (from http://asm.ow2.io/)
 - asm (from http://asm.ow2.io/)
+- aws-ssm-java-caching-client (from https://github.com/awslabs/aws-ssm-java-caching-client)
 - com.google.api.grpc:proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis)
 - com.google.api.grpc:proto-google-cloud-datastore-v1 (from https://github.com/googleapis/googleapis)
 - datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client)

provider/legal-azure/src/main/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImpl.java

@@ -71,7 +71,7 @@ public class LegalTagPublisherImpl implements ILegalTagPublisher {
     private void publishToServiceBus(String projectId, DpsHeaders headers, StatusChangedTags tags) {
         Message message = createMessage(headers, tags);
         try {
-            logger.info("Storage publishes message " + headers.getCorrelationId());
+            logger.debug("Storage publishes message " + headers.getCorrelationId());
             topicClientFactory.getClient(headers.getPartitionId(), serviceBusTopic).send(message);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
@@ -100,7 +100,7 @@ public class LegalTagPublisherImpl implements ILegalTagPublisher {
                     DateTime.now(),
                     LEGAL_TAGS_CHANGE_EVENT_DATA_VERSION
             ));
-            logger.info("Legal publishes tag changed event: " + data.get(DpsHeaders.CORRELATION_ID));
+            logger.debug("Legal publishes tag changed event: " + data.get(DpsHeaders.CORRELATION_ID));
             eventGridTopicStore.publishToEventGridTopic(headers.getPartitionId(), eventGridConfig.getTopicName(), eventsList);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);

provider/legal-azure/src/test/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImplTest.java

@@ -109,7 +109,7 @@ public class LegalTagPublisherImplTest {
         ArgumentCaptor<String> log = ArgumentCaptor.forClass(String.class);
         ArgumentCaptor<Exception> exception = ArgumentCaptor.forClass(Exception.class);
 
-        verify(logger).info(log.capture());
+        verify(logger).debug(log.capture());
         assertEquals("Storage publishes message " + CORRELATION_ID, log.getValue());
 
         verify(topicClient).send(msg.capture());

testing/legal-test-azure/pom.xml

@@ -51,6 +51,7 @@
             <artifactId>legal-test-core</artifactId>
             <version>0.11.0-SNAPSHOT</version>
         </dependency>
+
         <!-- https://mvnrepository.com/artifact/com.microsoft.azure/azure-servicebus -->
         <dependency>
             <groupId>com.microsoft.azure</groupId>