diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bf37d049533a55ccdc3bdc7626ee9b7f1fe3f0b7..97b1da4f60fd153ceeabd3b224eedee6d7d821f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,11 +13,11 @@ variables:
OSDU_GCP_SERVICE: legal
OSDU_GCP_VENDOR: gcp
- OSDU_GCP_APPLICATION_NAME: os-legal
- OSDU_GCP_ENV_VARS: ENABLE_FULL_BUCKET_NAME=$ENABLE_FULL_BUCKET_NAME,PROJECT_ID=$OSDU_GCP_PROJECT,AUTHORIZE_API=$OSDU_GCP_AUTHORIZE_API,AUDIENCES=$GOOGLE_AUDIENCE,GOOGLE_AUDIENCES=$GOOGLE_AUDIENCE,PARTITION_API=$OSDU_GCP_PARTITION_API,REDIS_GROUP_HOST=$REDIS_GROUP_HOST,REDIS_STORAGE_HOST=$REDIS_STORAGE_HOST,LEGAL_HOSTNAME=$OSDU_GCP_LEGAL_HOSTNAME --vpc-connector=$OSDU_GCP_VPC_CONNECTOR
- OSDU_GCP_TEST_SUBDIR: testing/$OSDU_GCP_SERVICE-test-$OSDU_GCP_VENDOR
- OSDU_GCP_HELM_PACKAGE_CHARTS: "devops/gcp/deploy devops/gcp/configmap"
-
+ OSDU_GCP_HELM_CONFIG_SERVICE_VARS: "--set data.project_id=$OSDU_GCP_PROJECT --set data.authorize_api=$OSDU_GCP_AUTHORIZE_API --set data.google_audiences=$GOOGLE_AUDIENCE --set data.redis_group_host=$REDIS_GROUP_HOST --set data.redis_storage_host=$REDIS_STORAGE_HOST --set data.partition_api=$OSDU_GCP_PARTITION_API --set data.log_level=INFO --set enable_full_bucket_name=$ENABLE_FULL_BUCKET_NAME"
+ OSDU_GCP_HELM_DEPLOYMENT_SERVICE_VARS: "--set data.image=$CI_REGISTRY_IMAGE/osdu-gcp:$CI_COMMIT_SHORT_SHA --set data.serviceAccountName=workload-identity-legal --set data.limits_cpu=1.5 --set data.limits_memory=512M"
+ OSDU_GCP_HELM_CONFIG_SERVICE: legal-config
+ OSDU_GCP_HELM_DEPLOYMENT_SERVICE: legal-deploy
+
IBM_BUILD_SUBDIR: provider/legal-ibm
IBM_INT_TEST_SUBDIR: testing/legal-test-ibm
@@ -30,7 +30,7 @@ include:
file: "standard-setup.yml"
- project: "osdu/platform/ci-cd-pipelines"
- file: "build/maven.yml"
+ file: "build/maven.yml"
- project: "osdu/platform/ci-cd-pipelines"
file: "scanners/fossa.yml"
@@ -47,19 +47,11 @@ include:
- project: "osdu/platform/ci-cd-pipelines"
file: "cloud-providers/azure.yml"
- - project: 'osdu/platform/ci-cd-pipelines'
- ref: "master"
- file: 'cloud-providers/osdu-gcp-cloudrun.yml'
-
- - project: 'osdu/platform/ci-cd-pipelines'
- ref: "master"
- file: 'cloud-providers/gcp.yml'
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/osdu-gcp-gke.yml"
- - project: 'osdu/platform/ci-cd-pipelines'
- ref: "master"
- file: 'publishing/pages.yml'
-
-compile-and-unit-test:
- variables:
- GOOGLE_CLOUD_PROJECT: opendes-evt
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "cloud-providers/gcp.yml"
+ - project: "osdu/platform/ci-cd-pipelines"
+ file: "publishing/pages.yml"
diff --git a/NOTICE b/NOTICE
index 3358a1a299e7603865b49267b39af9c15e2a1846..dc6a0f83a370c8970d666ba98302d0d4a85184ab 100644
--- a/NOTICE
+++ b/NOTICE
@@ -15,7 +15,7 @@ Apache-1.1
The following software have components provided under the terms of this license:
- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
-- Cobertura code coverage (from http://cobertura.sourceforge.net)
+- Cobertura (from http://cobertura.sourceforge.net)
- Plexus :: Default Container (from )
- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
- oro (from )
@@ -34,18 +34,18 @@ The following software have components provided under the terms of this license:
- ASM based accessors helper used by json-smart (from )
- AWS Event Stream (from https://github.com/awslabs/aws-eventstream-java)
- AWS Java SDK :: AWS Core (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK :: Annotations (from )
+- AWS Java SDK :: Annotations (from https://repo1.maven.org/maven2/software/amazon/awssdk/annotations)
- AWS Java SDK :: Auth (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK :: Core :: Protocols :: AWS Json Protocol (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK :: Core :: Protocols :: Protocol Core (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK :: HTTP Client Interface (from )
-- AWS Java SDK :: HTTP Clients :: Apache (from )
-- AWS Java SDK :: HTTP Clients :: Netty Non-Blocking I/O (from )
+- AWS Java SDK :: HTTP Client Interface (from https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi)
+- AWS Java SDK :: HTTP Clients :: Apache (from https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client)
+- AWS Java SDK :: HTTP Clients :: Netty Non-Blocking I/O (from https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client)
- AWS Java SDK :: Profiles (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK :: Regions (from )
+- AWS Java SDK :: Regions (from https://repo1.maven.org/maven2/software/amazon/awssdk/regions)
- AWS Java SDK :: SDK Core (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK :: Services :: AWS Simple Systems Management (SSM) (from https://aws.amazon.com/sdkforjava)
-- AWS Java SDK :: Utilities (from )
+- AWS Java SDK :: Utilities (from https://repo1.maven.org/maven2/software/amazon/awssdk/utils)
- AWS Java SDK for AWS Amplify (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS App Mesh (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS AppSync (from https://aws.amazon.com/sdkforjava)
@@ -304,18 +304,19 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for the Amazon EC2 Container Service (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - Core (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
-- Adapter: RxJava (from )
+- Adapter: RxJava (from https://repo1.maven.org/maven2/com/squareup/retrofit2/adapter-rxjava)
- Apache Ant + JUnit (from http://ant.apache.org/)
- Apache Ant Core (from http://ant.apache.org/)
- Apache Ant Launcher (from http://ant.apache.org/)
- Apache Commons BeanUtils (from http://commons.apache.org/proper/commons-beanutils/)
-- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
-- Apache Commons Codec (from http://commons.apache.org/proper/commons-codec/)
-- Apache Commons Collections (from http://commons.apache.org/proper/commons-collections/)
+- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
+- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
+- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
+- Apache Commons Collections (from https://commons.apache.org/proper/commons-collections/)
- Apache Commons Lang (from http://commons.apache.org/proper/commons-lang/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
- Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/)
-- Apache Commons Text (from http://commons.apache.org/proper/commons-text/)
+- Apache Commons Text (from http://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)
@@ -324,10 +325,10 @@ The following software have components provided under the terms of this license:
- Apache HttpClient (from http://hc.apache.org/httpcomponents-client)
- Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client)
- Apache HttpCore (from http://hc.apache.org/httpcomponents-core-ga)
-- Apache Log4j API (from )
-- Apache Log4j Core (from )
-- Apache Log4j JUL Adapter (from )
-- Apache Log4j SLF4J Binding (from )
+- 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)
+- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)
- Apache Log4j to SLF4J Adapter (from )
- Apache Maven Invoker (from )
- Apache Maven Reporting Implementation (from )
@@ -339,26 +340,26 @@ The following software have components provided under the terms of this license:
- Apache Maven Wagon :: Providers :: SSH External Provider (from )
- Apache Maven Wagon :: Providers :: SSH Provider (from )
- Apache Velocity (from http://velocity.apache.org/engine/devel/)
-- AssertJ fluent assertions (from )
-- Asynchronous Http Client (from )
-- Asynchronous Http Client Netty Utils (from )
-- AutoValue Annotations (from )
+- AssertJ fluent assertions (from https://repo1.maven.org/maven2/org/assertj/assertj-core)
+- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
+- Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils)
+- AutoValue Annotations (from https://github.com/google/auto/tree/master/value)
- Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java)
-- BSON (from http://bsonspec.org)
+- BSON (from https://bsonspec.org)
- Bean Validation API (from http://beanvalidation.org)
- Brave Instrumentation: Http Adapters (from )
- Brave instrumentation for Reactor Netty HTTP (from https://github.com/reactor/reactor-netty)
-- Byte Buddy (without dependencies) (from )
-- Byte Buddy Java agent (from )
+- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
+- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
-- Cloud Storage JSON API v1-rev58-1.21.0 (from )
+- Cloud Storage JSON API v1-rev20181109-1.28.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava)
-- Cobertura code coverage (from http://cobertura.sourceforge.net)
+- Cobertura (from http://cobertura.sourceforge.net)
+- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
- Commons Digester (from http://commons.apache.org/digester/)
-- Commons IO (from http://commons.apache.org/io/)
- Commons Lang (from http://commons.apache.org/lang/)
- Commons Lang (from http://commons.apache.org/lang/)
-- Converter: Jackson (from )
+- Converter: Jackson (from https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
- Core functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
- Doxia :: APT Module (from )
- Doxia :: Core (from )
@@ -370,38 +371,40 @@ The following software have components provided under the terms of this license:
- Doxia :: XHTML Module (from )
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
-- GSON extensions to the Google HTTP Client Library for Java. (from )
-- Google APIs Client Library for Java (from )
-- Google App Engine extensions to the Google HTTP Client Library for Java. (from )
-- Google App Engine extensions to the Google HTTP Client Library for Java. (from )
-- Google Cloud Core (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core)
-- Google Cloud Core (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core)
-- Google Cloud Core HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http)
-- Google Cloud Core HTTP (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-http)
-- Google Cloud Core gRPC (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc)
-- Google Cloud Core gRPC (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-core-grpc)
+- GSON extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson)
+- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
+- Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine)
+- Google App Engine extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine)
+- Google Cloud Common Protos for Java (from https://github.com/googleapis/common-protos-java)
+- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core)
+- Google Cloud Core (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core)
+- Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http)
+- Google Cloud Core HTTP (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-http)
+- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc)
+- Google Cloud Core gRPC (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-core-grpc)
- Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore)
- Google Cloud Datastore (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-datastore)
- Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/java-iamcredentials)
-- Google Cloud Key Management Service (KMS) API v1-rev22-1.23.0 (from )
+- Google Cloud Key Management Service (KMS) API v1-rev9-1.22.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
- Google Cloud Logging (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-logging)
-- Google Cloud Pub/Sub (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub)
-- Google Cloud Pub/Sub (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-pubsub)
-- Google Cloud Storage (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage)
-- Google Cloud Storage (from https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-storage)
-- Google HTTP Client Library for Java (from https://github.com/google/google-http-java-client.git)
-- Google OAuth Client Library for Java (from )
+- Google Cloud Pub/Sub (from https://github.com/googleapis/java-pubsub)
+- Google Cloud Pub/Sub (from https://github.com/googleapis/java-pubsub)
+- Google Cloud Storage (from https://github.com/googleapis/java-storage)
+- Google Cloud Storage (from https://github.com/googleapis/java-storage)
+- Google HTTP Client Library for Java (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client)
+- Google OAuth Client Library for Java (from https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client)
- Gson (from https://github.com/google/gson)
- Gson (from https://github.com/google/gson)
-- Guava InternalFutureFailureAccess and InternalFutures (from )
-- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
-- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
+- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
+- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
+- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
- Hibernate Validator Engine (from )
- IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java)
- IBM COS Java SDK for COS KMS (from https://github.com/ibm/ibm-cos-sdk-java)
- IBM COS SDK For Java (from https://github.com/ibm/ibm-cos-sdk-java)
- IBM COS SDK for Java - Core (from https://github.com/ibm/ibm-cos-sdk-java)
+- IO (from http://jakarta.apache.org/commons/${pom.artifactId.substring(8)}/)
- Identity and Access Management (IAM) API v1-rev247-1.23.0 (from )
- IntelliJ IDEA Annotations (from http://www.jetbrains.org)
- J2ObjC Annotations (from https://github.com/google/j2objc/)
@@ -410,25 +413,25 @@ The following software have components provided under the terms of this license:
- JCIP Annotations under Apache License (from http://stephenc.github.com/jcip-annotations)
- JDOM (from http://www.jdom.org)
- JMES Path Query library (from https://aws.amazon.com/sdkforjava)
-- JSON Small and Fast Parser (from http://www.minidev.net/)
-- JSON Small and Fast Parser (from http://www.minidev.net/)
+- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart)
+- JSON Small and Fast Parser (from https://repo1.maven.org/maven2/net/minidev/json-smart)
- JSON Web Token support for the JVM (from https://github.com/jwtk/jjwt.git)
- JSON library from Android SDK (from http://developer.android.com/sdk)
- JSONassert (from https://github.com/skyscreamer/JSONassert)
- Jackson (from http://jackson.codehaus.org)
-- Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://github.com/google/google-http-java-client.git/google-http-client-jackson2)
+- Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2)
- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary)
-- Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310)
-- Jackson extensions to the Google HTTP Client Library for Java. (from )
+- Jackson datatype: JSR310 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
+- Jackson datatype: jdk8 (from https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jdk8)
+- Jackson extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson)
+- Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base)
+- Jackson module: JAXB-annotations (from http://github.com/FasterXML/jackson-module-jaxb-annotations)
- Jackson-annotations (from http://github.com/FasterXML/jackson)
- Jackson-core (from https://github.com/FasterXML/jackson-core)
- Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding)
-- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson)
+- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text)
- Jackson-datatype-Joda (from http://wiki.fasterxml.com/JacksonModuleJoda)
-- Jackson-datatype-jdk8 (from )
-- Jackson-module-Afterburner (from http://wiki.fasterxml.com/JacksonHome)
-- Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations)
-- Jackson-module-parameter-names (from )
+- Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names)
- Jakarta Bean Validation API (from https://beanvalidation.org)
- Java Libraries for Amazon Simple WorkFlow (from https://aws.amazon.com/sdkforjava)
- Java Native Access (from https://github.com/java-native-access/jna)
@@ -437,11 +440,11 @@ The following software have components provided under the terms of this license:
- Java UUID Generator (from http://wiki.fasterxml.com/JugHome)
- Javassist (from http://www.javassist.org/)
- Javassist (from http://www.javassist.org/)
-- Jetty Server (from )
-- Jetty Utilities (from )
-- Joda-Time (from http://www.joda.org/joda-time/)
-- Joda-Time (from http://www.joda.org/joda-time/)
-- Joda-Time (from http://www.joda.org/joda-time/)
+- Jetty Server (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty)
+- Jetty Utilities (from https://repo1.maven.org/maven2/org/mortbay/jetty/jetty-util)
+- Joda-Time (from https://www.joda.org/joda-time/)
+- Joda-Time (from https://www.joda.org/joda-time/)
+- Joda-Time (from https://www.joda.org/joda-time/)
- Json Path (from https://github.com/jayway/JsonPath)
- KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2)
- KeePassJava2 :: DOM (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2-dom)
@@ -452,23 +455,23 @@ The following software have components provided under the terms of this license:
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
-- MapStruct Core (from )
-- Maven Artifact (from )
+- MapStruct Core (from http://mapstruct.org/mapstruct/)
+- Maven Artifact (from https://repo1.maven.org/maven2/org/apache/maven/maven-artifact)
- Maven Artifact Manager (from )
-- Maven Core (from https://git-wip-us.apache.org/repos/asf/maven.git/maven-core)
+- Maven Core (from https://repo1.maven.org/maven2/org/apache/maven/maven-core)
- Maven Error Diagnostics (from )
-- Maven Model (from https://git-wip-us.apache.org/repos/asf/maven.git/maven-model)
+- Maven Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-model)
- Maven Monitor (from )
-- Maven Plugin API (from https://git-wip-us.apache.org/repos/asf/maven.git/maven-plugin-api)
+- Maven Plugin API (from https://repo1.maven.org/maven2/org/apache/maven/maven-plugin-api)
- Maven Plugin Descriptor Model (from )
- Maven Plugin Parameter Documenter API (from )
- Maven Plugin Registry Model (from )
- Maven Profile Model (from )
- Maven Project (from )
- Maven Reporting API (from )
-- Maven Repository Metadata Model (from )
-- Maven Settings (from )
-- Metrics Core (from https://github.com/dropwizard/metrics)
+- Maven Repository Metadata Model (from https://repo1.maven.org/maven2/org/apache/maven/maven-repository-metadata)
+- Maven Settings (from https://repo1.maven.org/maven2/org/apache/maven/maven-settings)
+- Metrics Core (from https://repo1.maven.org/maven2/io/dropwizard/metrics/metrics-core)
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -476,38 +479,36 @@ The following software have components provided under the terms of this license:
- Microsoft Azure Java Core Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
-- Mockito (from http://mockito.org)
-- Mockito (from http://mockito.org)
- Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
- MongoDB Driver (from http://www.mongodb.org)
- MongoDB Java Driver Core (from http://www.mongodb.org)
-- Netty Reactive Streams HTTP support (from )
-- Netty Reactive Streams Implementation (from )
-- Netty/Buffer (from http://netty.io/)
-- Netty/Codec (from )
-- Netty/Codec/DNS (from )
-- Netty/Codec/HTTP (from )
-- Netty/Codec/HTTP2 (from )
-- Netty/Codec/Socks (from )
-- Netty/Common (from )
-- Netty/Handler (from )
-- Netty/Handler/Proxy (from )
-- Netty/Resolver (from )
-- Netty/Resolver/DNS (from )
-- Netty/TomcatNative [BoringSSL - Static] (from )
-- Netty/Transport (from http://netty.io/)
-- Netty/Transport/Native/Unix/Common (from )
+- Netty Reactive Streams HTTP support (from https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams-http)
+- Netty Reactive Streams Implementation (from https://repo1.maven.org/maven2/com/typesafe/netty/netty-reactive-streams)
+- Netty/Buffer (from https://repo1.maven.org/maven2/io/netty/netty-buffer)
+- Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec)
+- Netty/Codec/DNS (from https://repo1.maven.org/maven2/io/netty/netty-codec-dns)
+- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
+- Netty/Codec/HTTP2 (from https://repo1.maven.org/maven2/io/netty/netty-codec-http2)
+- Netty/Codec/Socks (from https://repo1.maven.org/maven2/io/netty/netty-codec-socks)
+- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
+- Netty/Handler (from https://repo1.maven.org/maven2/io/netty/netty-handler)
+- Netty/Handler/Proxy (from https://repo1.maven.org/maven2/io/netty/netty-handler-proxy)
+- Netty/Resolver (from https://repo1.maven.org/maven2/io/netty/netty-resolver)
+- Netty/Resolver/DNS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns)
+- Netty/TomcatNative [BoringSSL - Static] (from https://repo1.maven.org/maven2/io/netty/netty-tcnative-boringssl-static)
+- Netty/Transport (from https://repo1.maven.org/maven2/io/netty/netty-transport)
+- Netty/Transport/Native/Unix/Common (from https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common)
- Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type)
- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
- Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
-- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor)
+- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor-core)
- OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions)
- Objenesis (from http://objenesis.org)
- Objenesis (from http://objenesis.org)
-- OkHttp (from )
-- OkHttp Logging Interceptor (from )
-- OkHttp URLConnection (from )
-- Okio (from )
+- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp)
+- OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor)
+- OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection)
+- Okio (from https://github.com/square/okio/)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
- OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
@@ -516,50 +517,33 @@ The following software have components provided under the terms of this license:
- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
- Plexus Velocity Component (from )
- PowerMock (from http://www.powermock.org)
-- Protocol Buffer extensions to the Google HTTP Client Library for Java. (from )
+- Protocol Buffer extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-protobuf)
+- Proton-J (from https://repo1.maven.org/maven2/org/apache/qpid/proton-j)
- QpidJMS Client (from )
-- RabbitMQ Java Client (from http://www.rabbitmq.com)
+- RabbitMQ Java Client (from https://www.rabbitmq.com)
- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
-- Retrofit (from )
+- Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
- Servlet Specification 2.5 API (from )
-- SnakeYAML (from http://www.snakeyaml.org)
-- Spring AOP (from https://github.com/spring-projects/spring-framework)
-- Spring Beans (from https://github.com/spring-projects/spring-framework)
-- Spring Boot (from http://projects.spring.io/spring-boot/)
-- Spring Boot Actuator (from http://projects.spring.io/spring-boot/)
-- Spring Boot Actuator AutoConfigure (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-actuator-autoconfigure)
-- Spring Boot Actuator Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/)
-- Spring Boot Data MongoDB Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Dependencies (from http://projects.spring.io/spring-boot/)
-- Spring Boot Json Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-json)
-- Spring Boot Log4J2 Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Logging Starter (from http://projects.spring.io/spring-boot/)
+- SnakeYAML (from http://code.google.com/p/snakeyaml/)
- Spring Boot Reactor Netty Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-reactor-netty)
-- Spring Boot Security Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Test (from http://projects.spring.io/spring-boot/)
-- Spring Boot Test Auto-Configure (from http://projects.spring.io/spring-boot/)
-- Spring Boot Test Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Tomcat Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Validation Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Web Starter (from http://projects.spring.io/spring-boot/)
- Spring Boot WebFlux Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-webflux)
- Spring Commons Logging Bridge (from https://github.com/spring-projects/spring-framework)
-- Spring Context (from https://github.com/spring-projects/spring-framework)
-- Spring Core (from https://github.com/spring-projects/spring-framework)
-- Spring Data Core (from )
-- Spring Data MongoDB - Core (from )
+- Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons)
+- Spring Data MongoDB - Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-mongodb)
- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework)
+- Spring Framework: AOP (from http://www.springframework.org)
+- Spring Framework: Context (from http://www.springframework.org)
+- Spring Framework: WebMVC (from http://www.springframework.org)
- Spring JMS (from https://github.com/spring-projects/spring-framework)
- Spring Messaging (from https://github.com/spring-projects/spring-framework)
- Spring Plugin - Core (from )
-- Spring Plugin - Metadata Extension (from )
+- Spring Plugin - Metadata Extension (from https://repo1.maven.org/maven2/org/springframework/plugin/spring-plugin-metadata)
- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework)
- Spring Transaction (from https://github.com/spring-projects/spring-framework)
-- Spring Web (from https://github.com/spring-projects/spring-framework)
-- Spring Web MVC (from https://github.com/spring-projects/spring-framework)
- Spring WebFlux (from https://github.com/spring-projects/spring-framework)
+- Spring beans (from https://repo1.maven.org/maven2/org/springframework/spring-beans)
+- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core)
+- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web)
- Vavr (from http://vavr.io)
- Vavr Match (from http://vavr.io)
- Woodstox (from https://github.com/FasterXML/woodstox)
@@ -573,15 +557,10 @@ The following software have components provided under the terms of this license:
- com.google.api.grpc:grpc-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
- com.google.api.grpc:grpc-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
- com.google.api.grpc:proto-google-cloud-logging-v2 (from https://github.com/googleapis/googleapis)
-- com.google.api.grpc:proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
-- com.google.api.grpc:proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/googleapis)
-- com.google.api.grpc:proto-google-common-protos (from https://github.com/googleapis/googleapis)
-- com.google.api.grpc:proto-google-iam-v1 (from https://github.com/googleapis/googleapis)
-- commons-collections (from )
- datastore-v1-proto-client (from )
-- error-prone annotations (from )
-- error-prone annotations (from )
-- error-prone annotations (from )
+- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
+- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
+- error-prone annotations (from https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations)
- io.grpc:grpc-alts (from https://github.com/grpc/grpc-java)
- io.grpc:grpc-alts (from https://github.com/grpc/grpc-java)
- io.grpc:grpc-api (from https://github.com/grpc/grpc-java)
@@ -606,7 +585,6 @@ The following software have components provided under the terms of this license:
- ion-java (from https://github.com/amznlabs/ion-java/)
- jackson-databind (from http://github.com/FasterXML/jackson)
- jackson-databind (from http://github.com/FasterXML/jackson)
-- jakarta.xml.bind-api (from )
- java-cloudant (from https://cloudant.com)
- java-cloudant (from https://cloudant.com)
- javatuples (from http://www.javatuples.org)
@@ -615,6 +593,8 @@ The following software have components provided under the terms of this license:
- lettuce (from http://github.com/mp911de/lettuce/wiki)
- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
- micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer)
+- mockito-core (from https://github.com/mockito/mockito)
+- mockito-core (from https://github.com/mockito/mockito)
- org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian)
- org.conscrypt:conscrypt-openjdk-uber (from https://conscrypt.org/)
- org.opentest4j:opentest4j (from https://github.com/ota4j-team/opentest4j)
@@ -628,19 +608,39 @@ The following software have components provided under the terms of this license:
- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging)
- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/api-client-staging)
- proto-google-cloud-iamcredentials-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-iamcredentials-v1)
-- proton-j (from )
+- proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1)
+- proto-google-cloud-pubsub-v1 (from https://github.com/googleapis/java-pubsub/proto-google-cloud-pubsub-v1)
+- proto-google-iam-v1 (from https://github.com/googleapis/api-client-staging)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- rxjava (from https://github.com/ReactiveX/RxJava)
+- spring-boot (from https://spring.io/projects/spring-boot)
+- spring-boot-actuator (from https://spring.io/projects/spring-boot)
+- spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot)
+- spring-boot-autoconfigure (from https://spring.io/projects/spring-boot)
+- spring-boot-dependencies (from https://spring.io/projects/spring-boot)
+- spring-boot-starter (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-actuator (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-data-mongodb (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-json (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-log4j2 (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-logging (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-security (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-test (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-tomcat (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-validation (from https://spring.io/projects/spring-boot)
+- spring-boot-starter-web (from https://spring.io/projects/spring-boot)
+- spring-boot-test (from https://spring.io/projects/spring-boot)
+- spring-boot-test-autoconfigure (from https://spring.io/projects/spring-boot)
- spring-security-config (from http://spring.io/spring-security)
-- spring-security-core (from http://spring.io/spring-security)
+- spring-security-core (from https://spring.io/spring-security)
- spring-security-oauth2-client (from http://spring.io/spring-security)
- spring-security-oauth2-core (from http://spring.io/spring-security)
- spring-security-oauth2-jose (from http://spring.io/spring-security)
- spring-security-oauth2-resource-server (from http://spring.io/spring-security)
- spring-security-test (from http://spring.io/spring-security)
-- spring-security-web (from http://spring.io/spring-security)
+- spring-security-web (from https://spring.io/spring-security)
- springfox-core (from https://github.com/springfox/springfox)
- springfox-schema (from https://github.com/springfox/springfox)
- springfox-spi (from https://github.com/springfox/springfox)
@@ -648,11 +648,11 @@ The following software have components provided under the terms of this license:
- springfox-swagger-common (from https://github.com/springfox/springfox)
- springfox-swagger-ui (from https://github.com/springfox/springfox)
- springfox-swagger2 (from https://github.com/springfox/springfox)
-- swagger-annotations (from )
+- swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations)
- swagger-jaxrs (from )
- swagger-models (from )
- tomcat-embed-core (from http://tomcat.apache.org/)
-- tomcat-embed-websocket (from http://tomcat.apache.org/)
+- tomcat-embed-websocket (from https://tomcat.apache.org/)
- xml-apis (from )
========================================================================
@@ -660,13 +660,14 @@ BSD-2-Clause
========================================================================
The following software have components provided under the terms of this license:
-- API Common (from https://github.com/googleapis)
-- API Common (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
+- API Common (from https://github.com/googleapis/api-common-java)
+- API Common (from https://github.com/googleapis/api-common-java)
+- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from http://hamcrest.org/)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
@@ -682,8 +683,8 @@ BSD-3-Clause
========================================================================
The following software have components provided under the terms of this license:
-- API Common (from https://github.com/googleapis)
-- API Common (from https://github.com/googleapis)
+- API Common (from https://github.com/googleapis/api-common-java)
+- API Common (from https://github.com/googleapis/api-common-java)
- ASM Analysis (from )
- ASM Commons (from )
- ASM Core (from )
@@ -691,33 +692,39 @@ The following software have components provided under the terms of this license:
- ASM Core (from )
- ASM Tree (from )
- ASM Util (from )
+- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
+- Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/)
- Apache Groovy (from http://groovy-lang.org)
-- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- GAX (Google Api eXtensions) (from https://github.com/googleapis)
-- Google APIs Client Library for Java (from )
-- Google Auth Library for Java - Credentials (from )
-- Google Auth Library for Java - Credentials (from )
-- Google Auth Library for Java - OAuth2 HTTP (from )
-- Google Auth Library for Java - OAuth2 HTTP (from )
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
+- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java)
+- Google APIs Client Library for Java (from https://repo1.maven.org/maven2/com/google/api-client/google-api-client)
+- Google Auth Library for Java - Credentials (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials)
+- Google Auth Library for Java - Credentials (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials)
+- Google Auth Library for Java - OAuth2 HTTP (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http)
+- Google Auth Library for Java - OAuth2 HTTP (from https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http)
+- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
+- Hamcrest Core (from http://hamcrest.org/)
+- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- JSch (from http://www.jcraft.com/jsch/)
- JavaBeans Activation Framework API jar (from )
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
-- Netty/Codec/HTTP (from )
+- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
-- Protocol Buffer Java API (from https://developers.google.com/protocol-buffers/)
-- Protocol Buffers [Util] (from )
-- Protocol Buffers [Util] (from )
-- Spring Core (from https://github.com/spring-projects/spring-framework)
+- Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java)
+- Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util)
+- Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util)
+- Reflections (from http://github.com/ronmamo/reflections)
+- SnakeYAML (from http://code.google.com/p/snakeyaml/)
+- Spring core (from https://repo1.maven.org/maven2/org/springframework/spring-core)
- ThreeTen backport (from https://www.threeten.org/threetenbp)
- ThreeTen backport (from https://www.threeten.org/threetenbp)
-- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
+- classworlds (from http://classworlds.codehaus.org/)
- jakarta.xml.bind-api (from )
- jaxen (from http://jaxen.codehaus.org/)
@@ -745,11 +752,6 @@ CC0-1.0
========================================================================
The following software have components provided under the terms of this license:
-- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
-- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
-- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
-- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
-- Netty/Common (from )
- reactive-streams (from http://www.reactive-streams.org/)
========================================================================
@@ -757,7 +759,6 @@ CDDL-1.0
========================================================================
The following software have components provided under the terms of this license:
-- Apache Log4j Core (from )
- Servlet Specification 2.5 API (from )
========================================================================
@@ -765,7 +766,10 @@ CDDL-1.1
========================================================================
The following software have components provided under the terms of this license:
+- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
+- Servlet Specification 2.5 API (from )
+- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- tomcat-embed-core (from http://tomcat.apache.org/)
========================================================================
@@ -783,8 +787,6 @@ The following software have components provided under the terms of this license:
- JDOM (from http://www.jdom.org)
- Woodstox (from https://github.com/FasterXML/woodstox)
-- Xerces2-j (from https://xerces.apache.org/xerces2-j/)
-- aalto-xml (from )
========================================================================
EPL-1.0
@@ -793,13 +795,16 @@ The following software have components provided under the terms of this license:
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
+- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
+- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
+- SnakeYAML (from http://code.google.com/p/snakeyaml/)
- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
- org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/)
@@ -826,28 +831,37 @@ GPL-2.0-only
========================================================================
The following software have components provided under the terms of this license:
+- Cobertura (from http://cobertura.sourceforge.net)
- Cobertura Limited Runtime (from http://cobertura.sourceforge.net)
-- Cobertura code coverage (from http://cobertura.sourceforge.net)
-- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
+- Commons Lang (from http://commons.apache.org/lang/)
+- Commons Lang (from http://commons.apache.org/lang/)
- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
- Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
-- RabbitMQ Java Client (from http://www.rabbitmq.com)
-- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
+- RabbitMQ Java Client (from https://www.rabbitmq.com)
- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- tomcat-embed-core (from http://tomcat.apache.org/)
+========================================================================
+GPL-2.0-or-later
+========================================================================
+The following software have components provided under the terms of this license:
+
+- SnakeYAML (from http://code.google.com/p/snakeyaml/)
+
========================================================================
GPL-2.0-with-classpath-exception
========================================================================
The following software have components provided under the terms of this license:
- Checker Qual (from https://checkerframework.org)
-- Cobertura code coverage (from http://cobertura.sourceforge.net)
+- Cobertura (from http://cobertura.sourceforge.net)
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
+- Java Servlet API (from http://servlet-spec.java.net)
- JavaBeans Activation Framework (from )
-- RabbitMQ Java Client (from http://www.rabbitmq.com)
+- RabbitMQ Java Client (from https://www.rabbitmq.com)
- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
+- javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250)
- tomcat-embed-core (from http://tomcat.apache.org/)
========================================================================
@@ -856,6 +870,8 @@ GPL-3.0-only
The following software have components provided under the terms of this license:
- Expression Language 3.0 (from https://projects.eclipse.org/projects/ee4j.el)
+- Project Lombok (from https://projectlombok.org)
+- Project Lombok (from https://projectlombok.org)
- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
========================================================================
@@ -863,10 +879,8 @@ ImageMagick
========================================================================
The following software have components provided under the terms of this license:
-- Jackson (from http://jackson.codehaus.org)
- Stax2 API (from http://github.com/FasterXML/stax2-api)
- Woodstox (from https://github.com/FasterXML/woodstox)
-- aalto-xml (from )
========================================================================
Info-ZIP
@@ -887,25 +901,40 @@ LGPL-2.1-only
========================================================================
The following software have components provided under the terms of this license:
-- Cobertura code coverage (from http://cobertura.sourceforge.net)
+- Cobertura (from http://cobertura.sourceforge.net)
+- Commons Lang (from http://commons.apache.org/lang/)
+- Commons Lang (from http://commons.apache.org/lang/)
- Java Native Access (from https://github.com/java-native-access/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/)
- Javassist (from http://www.javassist.org/)
+- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic)
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
+- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core)
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Log4j 2 Appender (from https://github.com/Microsoft/ApplicationInsights-Java)
+========================================================================
+LGPL-2.1-or-later
+========================================================================
+The following software have components provided under the terms of this license:
+
+- Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/)
+- SnakeYAML (from http://code.google.com/p/snakeyaml/)
+
========================================================================
LGPL-3.0-only
========================================================================
The following software have components provided under the terms of this license:
-- RabbitMQ Java Client (from http://www.rabbitmq.com)
+- 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)
+- RabbitMQ Java Client (from https://www.rabbitmq.com)
========================================================================
MIT
@@ -915,10 +944,8 @@ The following software have components provided under the terms of this license:
- AWS Java SDK for AWS Lambda (from https://aws.amazon.com/sdkforjava)
- AWS Java SDK for AWS License Manager (from https://aws.amazon.com/sdkforjava)
- AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
-- Animal Sniffer Annotations (from )
-- Animal Sniffer Annotations (from )
-- Apache Log4j SLF4J Binding (from )
-- Apache Log4j to SLF4J Adapter (from )
+- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
+- Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations)
- Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for ARM (from https://github.com/Azure/autorest-clientruntime-for-java)
- Azure Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
@@ -927,10 +954,8 @@ The following software have components provided under the terms of this license:
- Checker Qual (from https://checkerframework.org)
- Checker Qual (from https://checkerframework.org)
- Extensions on Apache Proton-J library (from https://github.com/Azure/qpid-proton-j-extensions)
-- JTidy (from http://jtidy.sourceforge.net)
- JUL to SLF4J bridge (from http://www.slf4j.org)
- Java Client Runtime for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java)
-- Java JWT (from http://www.jwt.io)
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Application Insights Java SDK Web Module (from https://github.com/Microsoft/ApplicationInsights-Java)
@@ -948,11 +973,9 @@ The following software have components provided under the terms of this license:
- Microsoft Azure client library for KeyVault Secrets (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure common module for Storage (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure internal Avro module for Storage (from https://github.com/Azure/azure-sdk-for-java)
-- Mockito (from http://mockito.org)
-- Mockito (from http://mockito.org)
- MongoDB Java Driver Core (from http://www.mongodb.org)
-- Netty/Codec/HTTP (from )
-- Netty/Common (from )
+- Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http)
+- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
- Plexus :: Default Container (from )
- Plexus Default Interactivity Handler (from )
- Project Lombok (from https://projectlombok.org)
@@ -963,20 +986,24 @@ The following software have components provided under the terms of this license:
- adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java)
- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
- documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/)
-- jakarta.xml.bind-api (from )
+- java jwt (from http://www.jwt.io)
- micrometer-core (from https://github.com/micrometer-metrics/micrometer)
+- mockito-core (from https://github.com/mockito/mockito)
+- mockito-core (from https://github.com/mockito/mockito)
- mockito-junit-jupiter (from https://github.com/mockito/mockito)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- msal4j-persistence-extension (from https://github.com/AzureAD/microsoft-authentication-extensions-for-java)
-- spring-security-core (from http://spring.io/spring-security)
+- spring-security-core (from https://spring.io/spring-security)
========================================================================
MPL-1.1
========================================================================
The following software have components provided under the terms of this license:
-- Cobertura code coverage (from http://cobertura.sourceforge.net)
-- RabbitMQ Java Client (from http://www.rabbitmq.com)
+- Cobertura (from http://cobertura.sourceforge.net)
+- Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/)
+- RabbitMQ Java Client (from https://www.rabbitmq.com)
========================================================================
MPL-2.0
@@ -985,21 +1012,16 @@ The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- Javassist (from http://www.javassist.org/)
-- RabbitMQ Java Client (from http://www.rabbitmq.com)
+- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp)
+- RabbitMQ Java Client (from https://www.rabbitmq.com)
========================================================================
-NCSA
+PHP-3.01
========================================================================
The following software have components provided under the terms of this license:
-- Jetty Server (from )
-
-========================================================================
-Plexus
-========================================================================
-The following software have components provided under the terms of this license:
-
-- classworlds (from http://classworlds.codehaus.org/)
+- JavaBeans Activation Framework API jar (from )
+- jakarta.xml.bind-api (from )
========================================================================
Public-Domain
@@ -1014,26 +1036,23 @@ SAX-PD
========================================================================
The following software have components provided under the terms of this license:
-- Apache Ant + JUnit (from http://ant.apache.org/)
- Apache Ant Core (from http://ant.apache.org/)
-- Apache Ant Launcher (from http://ant.apache.org/)
-- xml-apis (from )
========================================================================
-W3C
+SPL-1.0
========================================================================
The following software have components provided under the terms of this license:
-- Apache Ant + JUnit (from http://ant.apache.org/)
-- Apache Ant Core (from http://ant.apache.org/)
-- Apache Ant Launcher (from http://ant.apache.org/)
-- xml-apis (from )
+- Checker Qual (from https://checkerframework.org)
+- Checker Qual (from https://checkerframework.org)
+- Servlet Specification 2.5 API (from )
========================================================================
-W3C-19980720
+W3C
========================================================================
The following software have components provided under the terms of this license:
+- Apache Ant Core (from http://ant.apache.org/)
- JTidy (from http://jtidy.sourceforge.net)
- Xerces2-j (from https://xerces.apache.org/xerces2-j/)
- xml-apis (from )
@@ -1045,14 +1064,6 @@ The following software have components provided under the terms of this license:
- Reflections (from http://github.com/ronmamo/reflections)
-========================================================================
-X11
-========================================================================
-The following software have components provided under the terms of this license:
-
-- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
-- Guava: Google Core Libraries for Java (from https://github.com/google/guava.git)
-
========================================================================
public-domain
========================================================================
@@ -1062,30 +1073,49 @@ The following software have components provided under the terms of this license:
- AWS SDK for Java - Models (from https://aws.amazon.com/sdkforjava)
- Apache Groovy (from http://groovy-lang.org)
- Apache Groovy (from http://groovy-lang.org)
-- Asynchronous Http Client (from )
+- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
+- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
+- Guava: Google Core Libraries for Java (from https://repo1.maven.org/maven2/com/google/guava/guava)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
+- JTidy (from http://jtidy.sourceforge.net)
+- Joda-Time (from https://www.joda.org/joda-time/)
+- Joda-Time (from https://www.joda.org/joda-time/)
+- Joda-Time (from https://www.joda.org/joda-time/)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- Microsoft Application Insights Java SDK Core (from https://github.com/Microsoft/ApplicationInsights-Java)
- Microsoft Azure SDK for EventGrid Management (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java)
- Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java)
-- RabbitMQ Java Client (from http://www.rabbitmq.com)
-- Spring Web (from https://github.com/spring-projects/spring-framework)
+- Project Lombok (from https://projectlombok.org)
+- Project Lombok (from https://projectlombok.org)
+- RabbitMQ Java Client (from https://www.rabbitmq.com)
+- Spring web (from https://repo1.maven.org/maven2/org/springframework/spring-web)
- azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
+- reactive-streams (from http://www.reactive-streams.org/)
+- xml-apis (from )
========================================================================
unknown
========================================================================
The following software have components provided under the terms of this license:
-- Byte Buddy (without dependencies) (from )
+- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
+- Checker Qual (from https://checkerframework.org)
- JSON in Java (from https://github.com/douglascrockford/JSON-java)
- JTidy (from http://jtidy.sourceforge.net)
- JUnit (from http://junit.org)
-- RabbitMQ Java Client (from http://www.rabbitmq.com)
+- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
+- JavaBeans Activation Framework API jar (from )
+- RabbitMQ Java Client (from https://www.rabbitmq.com)
- Spongy Castle (from http://rtyley.github.io/spongycastle/)
- System Rules (from http://stefanbirkner.github.io/system-rules/)
+- jakarta.xml.bind-api (from )
+- org.junit.jupiter:junit-jupiter-api (from http://junit.org/junit5/)
+- org.junit.jupiter:junit-jupiter-engine (from http://junit.org/junit5/)
+- org.junit.jupiter:junit-jupiter-params (from http://junit.org/junit5/)
+- org.junit.platform:junit-platform-commons (from http://junit.org/junit5/)
+- org.junit.platform:junit-platform-engine (from http://junit.org/junit5/)
- xml-apis (from )
diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml
index c09a0dc45dfb727fd0c2dc42d7018dd5de6ec3ff..1184869956ec4875776ceae74939bcfec5499337 100644
--- a/devops/gcp/configmap/values.yaml
+++ b/devops/gcp/configmap/values.yaml
@@ -3,9 +3,9 @@
# Declare variables to be passed into your templates.
data:
- authorize_api: "http://entitlements.default.svc.cluster.local/api/entitlements/v2"
- partition_api: "http://partition.default.svc.cluster.local/api/partition/v1"
- log_level: "INFO"
+ authorize_api: ""
+ partition_api: ""
+ log_level: ""
enable_full_bucket_name: "true"
project_id: ""
google_audiences: ""
diff --git a/devops/gcp/deploy/templates/legal-deploy.yml b/devops/gcp/deploy/templates/legal-deploy.yml
index f4402441a3b1af376a510c1bb5da152f8cc0f350..951cd97a9e691e1a717b9abd11f56a8d6f73bb2a 100644
--- a/devops/gcp/deploy/templates/legal-deploy.yml
+++ b/devops/gcp/deploy/templates/legal-deploy.yml
@@ -14,6 +14,8 @@ spec:
metadata:
labels:
app: "{{ .Values.conf.app_name }}"
+ annotations:
+ rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: "{{ .Values.conf.app_name }}"
diff --git a/legal-core/pom.xml b/legal-core/pom.xml
index 4608d72e875b6fb597440f91211495ffd9756495..3e3c150bdf67b813afd6689956c390e1665d7d0b 100644
--- a/legal-core/pom.xml
+++ b/legal-core/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-service</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>legal-core</name>
<description>Legal service core</description>
diff --git a/pom.xml b/pom.xml
index f26cf1ca4422c9bffb42f108ad2759c0a6008e8e..9b296660b0184b564d9d4a475b63dbc9180247c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<docker.image.prefix>opendes</docker.image.prefix>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <os-core-common.version>0.9.0</os-core-common.version>
+ <os-core-common.version>0.10.0</os-core-common.version>
<snakeyaml.version>1.26</snakeyaml.version>
</properties>
@@ -22,7 +22,7 @@
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-service</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>legal-service</name>
<description>Legal service</description>
diff --git a/provider/legal-aws/pom.xml b/provider/legal-aws/pom.xml
index 51c7dcd03e8878ec509dfe6ae184128855989f2d..73adc0498c0629e32342ae98349a90c7ac3721cd 100644
--- a/provider/legal-aws/pom.xml
+++ b/provider/legal-aws/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>legal-service</artifactId>
<groupId>org.opengroup.osdu.legal</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
<properties>
<aws.version>1.11.1018</aws.version>
<deployment.environment>dev</deployment.environment>
- <version.number>0.10.0-SNAPSHOT</version.number>
+ <version.number>0.11.0-SNAPSHOT</version.number>
</properties>
<dependencies>
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>0.10.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/provider/legal-azure/pom.xml b/provider/legal-azure/pom.xml
index 1f645cefc32ef0773eee3d4b0cddebd9c352c98f..7add67b4e90024014ebe7e7157f2f7c2c482b5c1 100644
--- a/provider/legal-azure/pom.xml
+++ b/provider/legal-azure/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>legal-service</artifactId>
<groupId>org.opengroup.osdu.legal</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -31,8 +31,8 @@
<azure.appservice.plan />
<azure.appservice.appname />
<azure.appservice.subscription />
- <osdu.corelibazure.version>0.9.0-rc6</osdu.corelibazure.version>
- <osdu.legal-core.version>0.10.0-SNAPSHOT</osdu.legal-core.version>
+ <osdu.corelibazure.version>0.10.0</osdu.corelibazure.version>
+ <osdu.legal-core.version>0.11.0-SNAPSHOT</osdu.legal-core.version>
<javax.inject.version>1</javax.inject.version>
<javax.servlet-api.version>4.0.1</javax.servlet-api.version>
<woodstox-core.version>5.3.0</woodstox-core.version>
diff --git a/provider/legal-azure/src/main/java/org/opengroup/osdu/legal/azure/di/EventGridConfig.java b/provider/legal-azure/src/main/java/org/opengroup/osdu/legal/azure/di/EventGridConfig.java
new file mode 100644
index 0000000000000000000000000000000000000000..f69dc263fdc5a311db664331f38d2ff9bf05cd6a
--- /dev/null
+++ b/provider/legal-azure/src/main/java/org/opengroup/osdu/legal/azure/di/EventGridConfig.java
@@ -0,0 +1,39 @@
+package org.opengroup.osdu.legal.azure.di;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class EventGridConfig {
+ private final boolean publishToEventGridEnabled;
+
+ // The Event Grid Event can be a maximum of 1MB. The batch size manipulation will impact the costing.
+ private final Integer eventGridBatchSize;
+
+ private final String topicName;
+
+ public EventGridConfig(@Value("#{new Boolean('${azure.publishToEventGrid}')}") boolean publish,
+ @Value("#{new Integer('${azure.eventGridBatchSize}')}") int batchSize,
+ @Value("${azure.eventGrid.topicName}") String topicName) {
+ if (publish) {
+ if ((topicName.isEmpty() || batchSize <= 0)) {
+ throw new RuntimeException("Missing EventGrid Configuration");
+ }
+ }
+ this.publishToEventGridEnabled = publish;
+ this.eventGridBatchSize = batchSize;
+ this.topicName = topicName;
+ }
+
+ public boolean isPublishingToEventGridEnabled() {
+ return publishToEventGridEnabled;
+ }
+
+ public String getTopicName() {
+ return topicName;
+ }
+
+ public int getEventGridBatchSize() {
+ return eventGridBatchSize;
+ }
+}
diff --git a/provider/legal-azure/src/main/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImpl.java b/provider/legal-azure/src/main/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImpl.java
index 72bb8c75770e93b6714306c4d559d35ff03554be..a1e22963a645d5d78577dddb2df13ef2d386f14c 100644
--- a/provider/legal-azure/src/main/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImpl.java
+++ b/provider/legal-azure/src/main/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImpl.java
@@ -16,22 +16,39 @@ package org.opengroup.osdu.legal.azure.jobs;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
+import com.microsoft.azure.eventgrid.models.EventGridEvent;
import com.microsoft.azure.servicebus.Message;
+import org.joda.time.DateTime;
+import org.opengroup.osdu.azure.eventgrid.EventGridTopicStore;
import org.opengroup.osdu.azure.servicebus.ITopicClientFactory;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.core.common.model.legal.StatusChangedTags;
+import org.opengroup.osdu.legal.azure.di.EventGridConfig;
import org.opengroup.osdu.legal.provider.interfaces.ILegalTagPublisher;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.inject.Inject;
import javax.inject.Named;
import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
+import java.util.UUID;
import java.util.Map;
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
@Component
public class LegalTagPublisherImpl implements ILegalTagPublisher {
+ private final static String LEGAL_TAGS_CHANGE_EVENT_SUBJECT = "legaltagschanged";
+ private final static String LEGAL_TAGS_CHANGE_EVENT_TYPE = "legaltagschanged";
+ private final static String LEGAL_TAGS_CHANGE_EVENT_DATA_VERSION = "1.0";
+
+ @Autowired
+ private EventGridConfig eventGridConfig;
+
+ @Autowired
+ private EventGridTopicStore eventGridTopicStore;
@Inject
private ITopicClientFactory topicClientFactory;
@@ -45,6 +62,52 @@ public class LegalTagPublisherImpl implements ILegalTagPublisher {
@Override
public void publish(String projectId, DpsHeaders headers, StatusChangedTags tags) throws Exception {
+ publishToServiceBus(projectId, headers, tags);
+ if (eventGridConfig.isPublishingToEventGridEnabled()) {
+ publishToEventGrid(headers, tags);
+ }
+ }
+
+ private void publishToServiceBus(String projectId, DpsHeaders headers, StatusChangedTags tags) {
+ Message message = createMessage(headers, tags);
+ try {
+ logger.info("Storage publishes message " + headers.getCorrelationId());
+ topicClientFactory.getClient(headers.getPartitionId(), serviceBusTopic).send(message);
+ } catch (Exception e) {
+ logger.error(e.getMessage(), e);
+ }
+ }
+
+ private void publishToEventGrid(DpsHeaders headers, StatusChangedTags tags) {
+ if (tags == null) {
+ return;
+ }
+ HashMap<String, Object> data = new HashMap<>();
+ List<EventGridEvent> eventsList = new ArrayList<>();
+ data.put("data", tags);
+ data.put(DpsHeaders.ACCOUNT_ID, headers.getPartitionIdWithFallbackToAccountId());
+ data.put(DpsHeaders.DATA_PARTITION_ID, headers.getPartitionIdWithFallbackToAccountId());
+ data.put(DpsHeaders.CORRELATION_ID, headers.getCorrelationId());
+ data.put(DpsHeaders.USER_EMAIL, headers.getUserEmail());
+ String messageId = UUID.randomUUID().toString();
+
+ try {
+ eventsList.add(new EventGridEvent(
+ messageId,
+ LEGAL_TAGS_CHANGE_EVENT_SUBJECT,
+ data,
+ LEGAL_TAGS_CHANGE_EVENT_TYPE,
+ DateTime.now(),
+ LEGAL_TAGS_CHANGE_EVENT_DATA_VERSION
+ ));
+ logger.info("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);
+ }
+ }
+
+ private Message createMessage(DpsHeaders headers, StatusChangedTags tags) {
Gson gson = new Gson();
Message message = new Message();
Map<String, Object> properties = new HashMap<>();
@@ -71,11 +134,6 @@ public class LegalTagPublisherImpl implements ILegalTagPublisher {
message.setBody(jomsg.toString().getBytes(StandardCharsets.UTF_8));
message.setContentType("application/json");
- try {
- logger.info("Storage publishes message " + headers.getCorrelationId());
- topicClientFactory.getClient(headers.getPartitionId(), serviceBusTopic).send(message);
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- }
+ return message;
}
}
diff --git a/provider/legal-azure/src/main/resources/application.properties b/provider/legal-azure/src/main/resources/application.properties
index c7e8e407e101563f19100e2c760bd72fed48a1a7..8ddea15dc4aa366c24b32321cac9c1ff63954dca 100644
--- a/provider/legal-azure/src/main/resources/application.properties
+++ b/provider/legal-azure/src/main/resources/application.properties
@@ -47,6 +47,11 @@ azure.blobStore.required=true
# Azure Service Bus configuration
azure.servicebus.topic-name=${servicebus_topic_name}
+# Azure Event Grid Configuration
+azure.publishToEventGrid=false
+azure.eventGridBatchSize=10
+azure.eventGrid.topicName=legaltagschangedtopic
+
# Azure KeyVault configuration
azure.keyvault.url=${KEYVAULT_URI}
diff --git a/provider/legal-azure/src/test/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImplTest.java b/provider/legal-azure/src/test/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImplTest.java
index 5f71d4104d2c2b1818f805dc84ac0ed87f19f17b..c6ee72ce0c86e96a9ab4846672b18d12dc895427 100644
--- a/provider/legal-azure/src/test/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImplTest.java
+++ b/provider/legal-azure/src/test/java/org/opengroup/osdu/legal/azure/jobs/LegalTagPublisherImplTest.java
@@ -16,6 +16,7 @@ package org.opengroup.osdu.legal.azure.jobs;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
+import com.microsoft.azure.eventgrid.models.EventGridEvent;
import com.microsoft.azure.servicebus.Message;
import com.microsoft.azure.servicebus.MessageBody;
import com.microsoft.azure.servicebus.TopicClient;
@@ -27,11 +28,14 @@ import org.mockito.ArgumentCaptor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
+import org.opengroup.osdu.azure.eventgrid.EventGridTopicStore;
import org.opengroup.osdu.azure.servicebus.ITopicClientFactory;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.DpsHeaders;
import org.opengroup.osdu.core.common.model.legal.StatusChangedTags;
+import org.opengroup.osdu.legal.azure.di.EventGridConfig;
+import java.util.List;
import java.util.Map;
import static org.junit.Assert.assertEquals;
@@ -51,6 +55,12 @@ public class LegalTagPublisherImplTest {
@Mock
private ITopicClientFactory topicClientFactory;
+ @Mock
+ private EventGridTopicStore eventGridTopicStore;
+
+ @Mock
+ private EventGridConfig eventGridConfig;
+
@Mock
private TopicClient topicClient;
@@ -69,6 +79,28 @@ public class LegalTagPublisherImplTest {
doReturn(topicClient).when(topicClientFactory).getClient(eq(PARTITION_ID), any());
}
+ @Test
+ public void should_publishToEventGrid_WhenFlagIsSet() throws Exception {
+ StatusChangedTags tags = new StatusChangedTags();
+
+ ArgumentCaptor<String> partitionNameCaptor = ArgumentCaptor.forClass(String.class);
+ ArgumentCaptor<String> topicNameArgumentCaptor = ArgumentCaptor.forClass(String.class);
+ ArgumentCaptor<List<EventGridEvent>> listEventGridEventArgumentCaptor = ArgumentCaptor.forClass(List.class);
+ doNothing().when(this.eventGridTopicStore).publishToEventGridTopic(
+ partitionNameCaptor.capture(), topicNameArgumentCaptor.capture(), listEventGridEventArgumentCaptor.capture()
+ );
+ when(this.eventGridConfig.isPublishingToEventGridEnabled()).thenReturn(true);
+ when(this.eventGridConfig.getTopicName()).thenReturn("legaltagschangedtopic");
+
+ sut.publish("project-id", headers, tags);
+
+ verify(this.eventGridTopicStore, times(1)).publishToEventGridTopic(any(), any(), anyList());
+
+ assertEquals(1, listEventGridEventArgumentCaptor.getValue().size());
+ assertEquals(topicNameArgumentCaptor.getValue(), "legaltagschangedtopic");
+ assertEquals(partitionNameCaptor.getValue(), PARTITION_ID);
+ }
+
@Test
public void testPublishLegalTag() throws Exception {
StatusChangedTags tags = new StatusChangedTags();
diff --git a/provider/legal-byoc/pom.xml b/provider/legal-byoc/pom.xml
index 148f90f964d558e129de50a546bb0f1a32138ef7..081c31d1c0e346cca17e0a71879e917ff49dce04 100644
--- a/provider/legal-byoc/pom.xml
+++ b/provider/legal-byoc/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>legal-service</artifactId>
<groupId>org.opengroup.osdu.legal</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -19,7 +19,7 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/provider/legal-gcp/pom.xml b/provider/legal-gcp/pom.xml
index 80336afbf81153644e80327a895c87379ca363a6..04a899b7a223f72a71d135dbfafc9552948e5fe1 100644
--- a/provider/legal-gcp/pom.xml
+++ b/provider/legal-gcp/pom.xml
@@ -5,13 +5,13 @@
<parent>
<artifactId>legal-service</artifactId>
<groupId>org.opengroup.osdu.legal</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-gcp</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>legal-gcp</name>
<description>Legal service Google App Engine flex</description>
@@ -25,7 +25,7 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.10.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml
index f01f3302a7a4bfdcec7b3ffc0caa908beefcfdb6..1f830e7e0517f3ec6c30f1e5a9d8c22eb7fda201 100644
--- a/provider/legal-ibm/pom.xml
+++ b/provider/legal-ibm/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>legal-service</artifactId>
<groupId>org.opengroup.osdu.legal</groupId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -18,7 +18,7 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/SecurityConfig.java b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/SecurityConfig.java
index 0c34f00ce378c3eab535d608fe9eea8e8b870abf..c850ebfd4e65be9b3d8b5538c6279bec287d8b31 100644
--- a/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/SecurityConfig.java
+++ b/provider/legal-ibm/src/main/java/org/opengroup/osdu/legal/ibm/security/SecurityConfig.java
@@ -21,6 +21,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
"/v2/api-docs",
"/configuration/ui",
"/swagger-resources/**",
+ "/actuator/**",
"/configuration/security",
"/swagger-ui.html",
"/webjars/**").permitAll()
diff --git a/provider/legal-reference/pom.xml b/provider/legal-reference/pom.xml
index 150a4e9b9c103c500fd1286c851584f31265976a..d638fd8947944568feb724f1f6d78cf621ad7a56 100644
--- a/provider/legal-reference/pom.xml
+++ b/provider/legal-reference/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-service</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>legal-reference</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>legal-reference</name>
<description>Legal service for Anthos</description>
@@ -24,7 +24,7 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml
index 96e74475408c56a834cadb13b74e7cf7c366e513..bb7c48db726b4368c1642f1ef579ac5cc4b7f5f6 100644
--- a/testing/legal-test-aws/pom.xml
+++ b/testing/legal-test-aws/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>os-legal-testing</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-aws</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -40,12 +40,12 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>0.10.0</version>
</dependency>
<!-- AWS managed packages -->
diff --git a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java
index c1e2113d51aa8f8ed29bab33d4181e58aaf0e22e..fef96a52ca439098a9034702b901fe4d81d46c36 100644
--- a/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java
+++ b/testing/legal-test-aws/src/test/java/org/opengroup/osdu/legal/util/AwsSqsHelper.java
@@ -35,7 +35,6 @@ public class AwsSqsHelper {
public static void purgeQueue(){
String amazonSqsEndpoint = System.getenv("LEGAL_QUEUE");;
AmazonSQS sqs = AmazonSQSClientBuilder.standard().withRegion("us-east-1").build();
- List<Message> messages = sqs.receiveMessage(amazonSqsEndpoint).getMessages();
PurgeQueueRequest request = new PurgeQueueRequest();
request.setQueueUrl(amazonSqsEndpoint);
sqs.purgeQueue(request);
diff --git a/testing/legal-test-azure/pom.xml b/testing/legal-test-azure/pom.xml
index 1427c98e7ef193d0a6a1f6269c60e8df45775f41..703d3c532314e58a13aa036d26cb8d0915737cd1 100644
--- a/testing/legal-test-azure/pom.xml
+++ b/testing/legal-test-azure/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>os-legal-testing</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-azure</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage-blob -->
<dependency>
diff --git a/testing/legal-test-core/pom.xml b/testing/legal-test-core/pom.xml
index 5d8659b1b5406c671bbf092b2b804aac0771905c..87060f8b39b578704c9e507ef7aa8b861ddd03ca 100644
--- a/testing/legal-test-core/pom.xml
+++ b/testing/legal-test-core/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>os-legal-testing</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
diff --git a/testing/legal-test-gcp/pom.xml b/testing/legal-test-gcp/pom.xml
index 07f2549a1aece94846dfb90447026a1d80ebc94b..d2c6310d36a8d6916013221903e8bab0cb3ad4a1 100644
--- a/testing/legal-test-gcp/pom.xml
+++ b/testing/legal-test-gcp/pom.xml
@@ -21,13 +21,13 @@
<parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>os-legal-testing</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-gcp</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
diff --git a/testing/legal-test-ibm/pom.xml b/testing/legal-test-ibm/pom.xml
index e6b348223a488da43df1a3e1ad345cbd474e459d..a20738f4ec0acd041dc6337e102fd37259c37639 100644
--- a/testing/legal-test-ibm/pom.xml
+++ b/testing/legal-test-ibm/pom.xml
@@ -13,14 +13,14 @@
<parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>os-legal-testing</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-ibm</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage-blob -->
<dependency>
diff --git a/testing/pom.xml b/testing/pom.xml
index 9c1525a4eb07f6ff0e6e9e178fa785e816335aa5..11880f78119f4b3468d2e983e3c3dfb1d2556fa0 100644
--- a/testing/pom.xml
+++ b/testing/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>os-legal-testing</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<description>Root Legal Service project</description>
<packaging>pom</packaging>