diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 037625213453cc711d69e42647cd15f3597ef013..9cf990f172e3e2d17e8373e505ab7edc4cf877b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ variables:
OSDU_GCP_SERVICE: legal
OSDU_GCP_VENDOR: gcp
- 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_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.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
diff --git a/NOTICE b/NOTICE
index 27df102c216b2e724ca81bbb4187fa77a7970549..1ee4310b1eb5377572683f3b8514d05c4f2f474d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -17,7 +17,7 @@ The following software have components provided under the terms of this license:
- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
- Cobertura (from http://cobertura.sourceforge.net)
- Default Plexus Container (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-container-default)
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- oro (from )
========================================================================
@@ -288,7 +288,7 @@ The following software have components provided under the terms of this license:
- 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 https://repo1.maven.org/maven2/com/squareup/retrofit2/adapter-rxjava)
-- Apache Ant + JUnit (from http://ant.apache.org/)
+- Apache Ant + JUnit (from https://ant.apache.org/)
- Apache Ant Core (from https://ant.apache.org/)
- Apache Ant Launcher (from https://ant.apache.org/)
- Apache Commons CLI (from http://commons.apache.org/proper/commons-cli/)
@@ -303,8 +303,6 @@ The following software have components provided under the terms of this license:
- 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 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)
@@ -327,7 +325,7 @@ The following software have components provided under the terms of this license:
- Byte Buddy (without dependencies) (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy)
- Byte Buddy 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-rev20210127-1.31.5 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
+- Cloud Storage JSON API v1-rev20210914-1.32.1 (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 (from http://cobertura.sourceforge.net)
- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
@@ -344,20 +342,20 @@ The following software have components provided under the terms of this license:
- Doxia :: XDoc Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xdoc/)
- Doxia :: XHTML Module (from http://maven.apache.org/doxia/doxia/doxia-modules/doxia-module-xhtml/)
- Doxia Sitetools :: Decoration Model (from http://maven.apache.org/doxia/doxia-sitetools/doxia-decoration-model/)
-- Doxia Sitetools :: Site Renderer Component (from http://maven.apache.org/doxia/doxia-sitetools/doxia-site-renderer/)
+- Doxia Sitetools :: Site Renderer (from https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-site-renderer)
- FindBugs-jsr305 (from http://findbugs.sourceforge.net/)
- 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 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 (from https://github.com/googleapis/java-core)
+- Google Cloud Core (from https://github.com/googleapis/java-core)
- Google Cloud Core HTTP (from https://github.com/googleapis/java-core)
- Google Cloud Core HTTP (from https://github.com/googleapis/java-core)
- 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/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore)
-- Google Cloud Datastore (from https://github.com/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-datastore)
+- Google Cloud Datastore (from https://github.com/googleapis/java-datastore)
+- Google Cloud Datastore (from https://github.com/googleapis/java-datastore)
- Google Cloud IAM Service Account Credentials (from https://github.com/googleapis/java-iamcredentials)
- 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/googleapis/google-cloud-java/tree/master/google-cloud-clients/google-cloud-logging)
@@ -367,6 +365,8 @@ The following software have components provided under the terms of this license:
- 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)
+- Groovy (from http://groovy.codehaus.org/)
+- Groovy (from http://groovy.codehaus.org/)
- Gson (from https://repo1.maven.org/maven2/com/google/code/gson/gson)
- Gson (from https://repo1.maven.org/maven2/com/google/code/gson/gson)
- Guava InternalFutureFailureAccess and InternalFutures (from https://repo1.maven.org/maven2/com/google/guava/failureaccess)
@@ -376,12 +376,12 @@ The following software have components provided under the terms of this license:
- Hibernate Validator Engine (from https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
- HttpClient (from http://hc.apache.org/httpcomponents-client)
- HttpClient Cache (from http://hc.apache.org/httpcomponents-client)
-- HttpCore (from http://hc.apache.org/httpcomponents-core-ga/)
+- HttpCore (from http://hc.apache.org/httpcomponents-core-ga)
- 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)
-- Identity and Access Management (IAM) API v1-rev20210226-1.31.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
+- Identity and Access Management (IAM) API v1-rev284-1.25.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-iam)
- J2ObjC Annotations (from https://github.com/google/j2objc/)
- J2ObjC Annotations (from https://github.com/google/j2objc/)
- JBoss Logging 3 (from http://www.jboss.org)
@@ -393,19 +393,20 @@ The following software have components provided under the terms of this license:
- JSON Web Token support for the JVM (from https://repo1.maven.org/maven2/io/jsonwebtoken/jjwt)
- JSON library from Android SDK (from http://developer.android.com/sdk)
- JSONassert (from https://github.com/skyscreamer/JSONassert)
+- JSR107 API and SPI (from https://github.com/jsr107/jsr107spec)
- Jackson (from http://jackson.codehaus.org)
- 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 https://repo1.maven.org/maven2/com/fasterxml/jackson/datatype/jackson-datatype-jsr310)
-- Jackson datatype: Joda (from https://github.com/FasterXML/jackson-datatype-joda)
- 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: JAXB Annotations (from https://github.com/FasterXML/jackson-modules-base)
+- Jackson module: Afterburner (from https://github.com/FasterXML/jackson-modules-base)
- Jackson-annotations (from http://github.com/FasterXML/jackson)
- Jackson-core (from https://github.com/FasterXML/jackson-core)
-- Jackson-dataformat-XML (from https://github.com/FasterXML/jackson-dataformat-xml)
+- Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding)
- Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text)
-- Jackson-module-Afterburner (from http://wiki.fasterxml.com/JacksonHome)
+- Jackson-datatype-JODA (from http://wiki.fasterxml.com/JacksonModuleJoda)
+- Jackson-module-JAXB-annotations (from http://wiki.fasterxml.com/JacksonJAXBAnnotations)
- 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)
- Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el)
@@ -417,8 +418,8 @@ The following software have components provided under the terms of this license:
- Javassist (from http://www.javassist.org/)
- Javassist (from http://www.javassist.org/)
- JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)
-- 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)
+- Jetty Server (from http://jetty.mortbay.org)
+- Jetty Utilities (from http://jetty.mortbay.org)
- 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/)
@@ -486,30 +487,33 @@ The following software have components provided under the terms of this license:
- 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)
-- Okio (from https://github.com/square/okio/)
+- OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor)
- 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)
- PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database)
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- Plexus Velocity Component (from )
- PowerMock (from http://www.powermock.org)
-- PowerMock (from http://www.powermock.org)
-- PowerMock (from http://www.powermock.org)
-- PowerMock (from http://www.powermock.org)
-- PowerMock (from http://www.powermock.org)
- 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 https://www.rabbitmq.com)
-- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
-- Retrofit (from https://github.com/square/retrofit)
+- Reactor Netty with all modules (from https://github.com/reactor/reactor-netty)
+- Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
- Servlet Specification 2.5 API (from http://jetty.mortbay.org)
- 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 Log4j 2 Starter (from http://projects.spring.io/spring-boot/)
-- Spring Boot Tomcat Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-tomcat)
+- Spring Boot AOP Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot Actuator (from http://projects.spring.io/spring-boot/)
+- Spring Boot Actuator Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot Log4j 2 Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-log4j2)
+- Spring Boot Security Starter (from http://projects.spring.io/spring-boot/)
+- Spring Boot Starter (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 Web Starter (from http://projects.spring.io/spring-boot/)
- 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)
@@ -536,9 +540,6 @@ 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)
- 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)
@@ -566,56 +567,61 @@ The following software have components provided under the terms of this license:
- javatuples (from http://www.javatuples.org)
- javax.inject (from http://code.google.com/p/atinject/)
- jose4j (from https://bitbucket.org/b_c/jose4j/)
-- lettuce (from http://github.com/mp911de/lettuce/wiki)
-- logging-interceptor (from https://github.com/square/okhttp)
+- lettuce (from https://github.com/lettuce-io/lettuce-core/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)
- okhttp (from https://square.github.io/okhttp/)
- okhttp-urlconnection (from https://github.com/square/okhttp)
+- okio (from https://github.com/square/okio/)
- 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)
- org.xmlunit:xmlunit-core (from http://www.xmlunit.org/)
- perfmark:perfmark-api (from https://github.com/perfmark/perfmark)
+- powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support)
+- powermock-core (from http://www.powermock.org)
+- powermock-module-junit4 (from http://www.powermock.org)
- powermock-module-junit4-common (from https://repo1.maven.org/maven2/org/powermock/powermock-module-junit4-common)
+- powermock-reflect (from https://repo1.maven.org/maven2/org/powermock/powermock-reflect)
- project ':json-path' (from https://github.com/jayway/JsonPath)
+- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1)
+- proto-google-cloud-datastore-v1 (from https://github.com/googleapis/java-datastore/proto-google-cloud-datastore-v1)
- proto-google-cloud-iamcredentials-v1 (from https://github.com/googleapis/java-iamcredentials/proto-google-cloud-iamcredentials-v1)
- proto-google-cloud-logging-v2 (from https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-logging-v2)
- 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-common-protos (from https://github.com/googleapis/api-client-staging)
+- proto-google-common-protos (from https://github.com/googleapis/java-iam/proto-google-common-protos)
- proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://resilience4j.readme.io)
+- resilience4j (from https://resilience4j.readme.io)
+- resilience4j (from https://resilience4j.readme.io)
+- resilience4j (from https://resilience4j.readme.io)
+- resilience4j (from https://resilience4j.readme.io)
+- resilience4j (from https://resilience4j.readme.io)
- 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-logging (from https://spring.io/projects/spring-boot)
- spring-boot-starter-reactor-netty (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-validation (from https://spring.io/projects/spring-boot)
-- spring-boot-starter-web (from https://spring.io/projects/spring-boot)
- spring-boot-starter-webflux (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 https://spring.io/projects/spring-security)
+- spring-security-config (from https://spring.io/spring-security)
- spring-security-core (from https://spring.io/projects/spring-security)
-- spring-security-oauth2-client (from https://spring.io/projects/spring-security)
-- spring-security-oauth2-core (from https://spring.io/projects/spring-security)
-- spring-security-oauth2-jose (from https://spring.io/projects/spring-security)
-- spring-security-oauth2-resource-server (from https://spring.io/projects/spring-security)
-- spring-security-test (from http://spring.io/spring-security)
+- spring-security-oauth2-client (from https://spring.io/spring-security)
+- spring-security-oauth2-core (from https://spring.io/spring-security)
+- spring-security-oauth2-jose (from https://spring.io/spring-security)
+- spring-security-oauth2-resource-server (from https://spring.io/spring-security)
+- spring-security-test (from https://spring.io/projects/spring-security)
- spring-security-web (from https://spring.io/projects/spring-security)
- springfox-core (from https://github.com/springfox/springfox)
- springfox-schema (from https://github.com/springfox/springfox)
@@ -628,7 +634,7 @@ The following software have components provided under the terms of this license:
- swagger-jaxrs (from )
- swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models)
- tomcat-embed-core (from http://tomcat.apache.org/)
-- tomcat-embed-websocket (from https://tomcat.apache.org/)
+- tomcat-embed-websocket (from http://tomcat.apache.org/)
- xml-apis (from )
========================================================================
@@ -644,8 +650,8 @@ The following software have components provided under the terms of this license:
- Hamcrest (from http://hamcrest.org/JavaHamcrest/)
- Hamcrest Core (from http://hamcrest.org/)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
-- Reflections (from http://github.com/ronmamo/reflections)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
+- Reflections (from http://code.google.com/p/reflections/)
- Stax2 API (from http://github.com/FasterXML/stax2-api)
- ThreeTen backport (from https://www.threeten.org/threetenbp)
- jaxen (from http://www.cafeconleche.org/jaxen)
@@ -656,10 +662,6 @@ BSD-3-Clause
The following software have components provided under the terms of this license:
- API Common (from https://github.com/googleapis/api-common-java)
-- ASM Analysis (from )
-- ASM Commons (from https://repo1.maven.org/maven2/org/ow2/asm/asm-commons)
-- 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)
@@ -679,16 +681,20 @@ The following software have components provided under the terms of this license:
- 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 https://repo1.maven.org/maven2/io/netty/netty-codec-http)
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- 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)
-- Reflections (from http://github.com/ronmamo/reflections)
+- Reflections (from http://code.google.com/p/reflections/)
- SnakeYAML (from http://www.snakeyaml.org)
- Spring Core (from https://github.com/spring-projects/spring-framework)
- ThreeTen backport (from https://www.threeten.org/threetenbp)
- asm (from http://asm.ow2.io/)
- asm (from http://asm.ow2.io/)
- asm (from http://asm.ow2.io/)
+- asm-analysis (from http://asm.ow2.io/)
+- asm-commons (from http://asm.ow2.io/)
+- asm-tree (from http://asm.ow2.io/)
+- asm-util (from http://asm.ow2.io/)
- classworlds (from http://classworlds.codehaus.org/)
- jaxen (from http://www.cafeconleche.org/jaxen)
- jsch (from https://repo1.maven.org/maven2/com/jcraft/jsch)
@@ -758,6 +764,7 @@ EPL-1.0
========================================================================
The following software have components provided under the terms of this license:
+- AspectJ Weaver (from https://www.eclipse.org/aspectj/)
- JUnit Jupiter (Aggregator) (from https://junit.org/junit5/)
- JUnit Jupiter API (from https://junit.org/junit5/)
- JUnit Jupiter Engine (from https://junit.org/junit5/)
@@ -942,7 +949,7 @@ The following software have components provided under the terms of this license:
- MongoDB Java Driver Core (from http://www.mongodb.org)
- 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 Interactivity Handler (from )
+- Plexus Default Interactivity Handler (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-interactivity-api)
- Project Lombok (from https://projectlombok.org)
- Project Lombok (from https://projectlombok.org)
- SLF4J API Module (from http://www.slf4j.org)
@@ -993,7 +1000,7 @@ Public-Domain
========================================================================
The following software have components provided under the terms of this license:
-- Plexus Common Utilities (from http://plexus.codehaus.org/plexus-utils)
+- Plexus Common Utilities (from https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils)
- Spongy Castle (from http://rtyley.github.io/spongycastle/)
========================================================================
@@ -1027,7 +1034,7 @@ WTFPL
========================================================================
The following software have components provided under the terms of this license:
-- Reflections (from http://github.com/ronmamo/reflections)
+- Reflections (from http://code.google.com/p/reflections/)
========================================================================
public-domain
@@ -1035,9 +1042,9 @@ public-domain
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 https://groovy-lang.org)
-- Apache Groovy (from https://groovy-lang.org)
- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
+- Groovy (from http://groovy.codehaus.org/)
+- Groovy (from http://groovy.codehaus.org/)
- 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/)
diff --git a/devops/azure/chart/helm-config.yaml b/devops/azure/chart/helm-config.yaml
index d7a3ffbbcbf681342f5b21f16ba9f35ba8d6f992..2207549937fc3f60f5da4014824056b90048e880 100644
--- a/devops/azure/chart/helm-config.yaml
+++ b/devops/azure/chart/helm-config.yaml
@@ -3,6 +3,8 @@ global:
# Service(s) Replica Count
replicaCount: 2
+ maxReplicaCount: 20
+ minReplicaCount: 4
nodepool: services
isAutoscalingEnabled: false
@@ -14,3 +16,14 @@ image:
repository: #{container-registry}#.azurecr.io
branch: #{ENVIRONMENT_NAME}#
tag: #{Build.SourceVersion}#
+
+istioDnsHost: #{ISTIO_DNS_HOST}#
+
+env: #{ENVIRONMENT_NAME}#
+
+featureFlag:
+ resourceLimits:
+ enabledEnvs:
+ - demo
+ hpa:
+ enabledEnvs: []
diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml
index 5153b4406a08f8e1fd5377a2a949a42929cc33f9..ac9cc20df7a69caa4bc327d8fc094ef4311a72e2 100644
--- a/devops/azure/chart/templates/deployment.yaml
+++ b/devops/azure/chart/templates/deployment.yaml
@@ -18,7 +18,10 @@ metadata:
name: {{ .Release.Name }}
namespace: osdu
spec:
+ {{- if has .Values.env .Values.featureFlag.hpa.enabledEnvs }}
+ {{- else }}
replicas: {{ .Values.global.replicaCount }}
+ {{- end }}
selector:
matchLabels:
app: {{ .Chart.Name }}
@@ -48,8 +51,14 @@ spec:
resources:
requests:
cpu: "100m"
+ {{- if has .Values.env .Values.featureFlag.resourceLimits.enabledEnvs }}
+ memory: "1500Mi"
+ {{- end }}
limits:
- cpu: "300m"
+ cpu: "500m"
+ {{- if has .Values.env .Values.featureFlag.resourceLimits.enabledEnvs }}
+ memory: "3000Mi"
+ {{- end }}
readinessProbe:
httpGet:
path: /actuator/health
diff --git a/devops/azure/chart/templates/hpa.yaml b/devops/azure/chart/templates/hpa.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0edc548ed117b8da5a415c2328839bf207a3a376
--- /dev/null
+++ b/devops/azure/chart/templates/hpa.yaml
@@ -0,0 +1,52 @@
+# Copyright © Microsoft Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+{{- if has .Values.env .Values.featureFlag.hpa.enabledEnvs }}
+apiVersion: autoscaling/v2beta2
+kind: HorizontalPodAutoscaler
+metadata:
+ name: {{ .Chart.Name }}
+ namespace: osdu
+spec:
+ scaleTargetRef:
+ apiVersion: apps/v1
+ kind: Deployment
+ name: {{ .Chart.Name }}
+ minReplicas: {{ .Values.global.minReplicaCount }}
+ maxReplicas: {{ .Values.global.maxReplicaCount }}
+ metrics:
+ - type: Resource
+ resource:
+ name: cpu
+ target:
+ type: Utilization
+ averageUtilization: 50
+ behavior:
+ scaleDown:
+ stabilizationWindowSeconds: 150
+ policies:
+ - type: Pods
+ value: 2
+ periodSeconds: 30
+ scaleUp:
+ stabilizationWindowSeconds: 10
+ selectPolicy: Max
+ policies:
+ - type: Pods
+ value: 6
+ periodSeconds: 10
+ - type: Percent
+ value: 50
+ periodSeconds: 10
+{{- end }}
\ No newline at end of file
diff --git a/devops/azure/chart/templates/service.yaml b/devops/azure/chart/templates/service.yaml
index eb5d124b64e3fdc13f20c0c0480aa1fd13a7a173..a1587090bdf893b2b9ce504bc027bd162f6249f3 100644
--- a/devops/azure/chart/templates/service.yaml
+++ b/devops/azure/chart/templates/service.yaml
@@ -23,5 +23,6 @@ spec:
- protocol: TCP
port: 80
targetPort: 80
+ name: http
selector:
app: {{ .Chart.Name }}
diff --git a/devops/azure/chart/templates/virtual-service.yaml b/devops/azure/chart/templates/virtual-service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..112b972a4ab1ff292273bcb760d3a87d37815c8c
--- /dev/null
+++ b/devops/azure/chart/templates/virtual-service.yaml
@@ -0,0 +1,36 @@
+---
+# Source: /devops/azure/chart/templates/virtual-service.yaml
+apiVersion: networking.istio.io/v1alpha3
+kind: VirtualService
+metadata:
+ name: {{ .Chart.Name }}
+ namespace: osdu
+spec:
+ hosts:
+ - "{{ .Values.istioDnsHost }}"
+ gateways:
+ - istio-gateway
+ http:
+ - match:
+ - uri:
+ prefix: "/api/{{ .Chart.Name }}/v1"
+ route:
+ - destination:
+ host: {{ .Chart.Name }}
+ port:
+ number: 80
+ corsPolicy:
+ maxAge: "60m"
+ allowCredentials: true
+ allowHeaders:
+ - Authorization
+ - Data-Partition-Id
+ - Correlation-Id
+ - Content-Type
+ allowMethods:
+ - POST
+ - GET
+ - PUT
+ - DELETE
+ allowOrigins:
+ - prefix: "*"
\ No newline at end of file
diff --git a/devops/azure/chart/values.yaml b/devops/azure/chart/values.yaml
index a3bc4e7f94a545d459f49ac475a5bc6e09236745..25722240f74b97f70e3e322e2df473390c15511e 100644
--- a/devops/azure/chart/values.yaml
+++ b/devops/azure/chart/values.yaml
@@ -14,6 +14,8 @@
global:
replicaCount: 1
+ maxReplicaCount: 1
+ minReplicaCount: 1
nodepool: services
isAutoscalingEnabled: false
@@ -21,3 +23,14 @@ image:
repository: community.opengroup.org:5555/osdu/platform/security-and-compliance/legal
branch: master
tag: latest
+
+istioDnsHost: ""
+
+env: demo
+
+featureFlag:
+ resourceLimits:
+ enabledEnvs:
+ - demo
+ hpa:
+ enabledEnvs: []
diff --git a/devops/gcp/configmap/templates/legal-variables.yml b/devops/gcp/configmap/templates/legal-variables.yml
index 3e604ef70620816e143bfc141f8a64d03dcd5ad5..574776ef32be3294807ebc04d1f346b4299556f2 100644
--- a/devops/gcp/configmap/templates/legal-variables.yml
+++ b/devops/gcp/configmap/templates/legal-variables.yml
@@ -12,6 +12,4 @@ data:
ENABLE_FULL_BUCKET_NAME: "{{ .Values.data.enable_full_bucket_name }}"
PROJECT_ID: "{{ .Values.data.project_id }}"
GOOGLE_AUDIENCES: "{{ .Values.data.google_audiences }}"
- REDIS_GROUP_HOST: "{{ .Values.data.redis_group_host }}"
- REDIS_STORAGE_HOST: "{{ .Values.data.redis_storage_host }}"
ACCEPT_HTTP: "{{ .Values.data.accept_http }}"
diff --git a/devops/gcp/configmap/values.yaml b/devops/gcp/configmap/values.yaml
index 1184869956ec4875776ceae74939bcfec5499337..afd5ff237a80eefc042ea3ce3f556f573b326f2b 100644
--- a/devops/gcp/configmap/values.yaml
+++ b/devops/gcp/configmap/values.yaml
@@ -9,8 +9,6 @@ data:
enable_full_bucket_name: "true"
project_id: ""
google_audiences: ""
- redis_group_host: ""
- redis_storage_host: ""
accept_http: "true"
conf:
diff --git a/legal-core/pom.xml b/legal-core/pom.xml
index bd5dd792e2601578176c351e900fdfacb66060a4..7f7347f8c0d25432e6d52d5b1f30ddacaa74a038 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-core</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>legal-core</name>
<description>Legal service core</description>
diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapper.java b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapper.java
index ca18568fcfc31acb919cfba0fc29b339b6e87acf..1b27d7759715afbbc0fdbc8f012573982a373de1 100644
--- a/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapper.java
+++ b/legal-core/src/main/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapper.java
@@ -20,6 +20,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.gson.Gson;
+
+import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javassist.NotFoundException;
@@ -27,6 +29,9 @@ import javax.inject.Inject;
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;
import javax.validation.ValidationException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.opengroup.osdu.core.common.logging.JaxRsDpsLog;
import org.opengroup.osdu.core.common.model.http.AppException;
import org.springframework.core.Ordered;
@@ -106,6 +111,17 @@ public class GlobalExceptionMapper extends ResponseEntityExceptionHandler {
return this.getErrorResponse(new AppException(HttpStatus.BAD_REQUEST.value(), "Validation error.", result.toString()));
}
+ @ExceptionHandler(IOException.class)
+ public ResponseEntity<Object> handleIOException(IOException e) {
+ if (StringUtils.containsIgnoreCase(ExceptionUtils.getRootCauseMessage(e), "Broken pipe")) {
+ this.logger.warning("Client closed the connection while request still being processed");
+ return null;
+ } else {
+ return this.getErrorResponse(
+ new AppException(HttpStatus.SERVICE_UNAVAILABLE.value(), "Unknown error", e.getMessage(), e));
+ }
+ }
+
@ExceptionHandler(Exception.class)
protected ResponseEntity<Object> handleGeneralException(Exception e) {
return this.getErrorResponse(
diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapperTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapperTests.java
index a53c8009d56a9dfd608aad2354aa1765a6808caf..5e79afda261ae31bc495f14143ecebb41c23d854 100644
--- a/legal-core/src/test/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapperTests.java
+++ b/legal-core/src/test/java/org/opengroup/osdu/legal/middleware/GlobalExceptionMapperTests.java
@@ -1,6 +1,7 @@
package org.opengroup.osdu.legal.middleware;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.powermock.api.mockito.PowerMockito.mock;
import javassist.NotFoundException;
@@ -19,6 +20,8 @@ import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.context.request.WebRequest;
+import java.io.IOException;
+
@RunWith(MockitoJUnitRunner.class)
public class GlobalExceptionMapperTests {
@Mock
@@ -88,5 +91,22 @@ public class GlobalExceptionMapperTests {
//assertEquals("An unknown error has occurred.", response.getBody().getMessage());
}
+ @Test
+ public void should_returnNullResponse_when_BrokenPipeIOExceptionIsCaptured() {
+ IOException ioException = new IOException("Broken pipe");
+
+ ResponseEntity response = sut.handleIOException(ioException);
+
+ assertNull(response);
+ }
+
+ @Test
+ public void should_returnServiceUnavailable_when_IOExceptionIsCaptured() {
+ IOException ioException = new IOException("Not broken yet");
+
+ ResponseEntity response = sut.handleIOException(ioException);
+
+ assertEquals(org.apache.http.HttpStatus.SC_SERVICE_UNAVAILABLE, response.getStatusCodeValue());
+ }
}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0903767d9de29fade9bdd1ec274209bb764bd635..e253f7c2e9cee6e7cd15d1516a3ff704b74b4f35 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.11.0-SNAPSHOT</os-core-common.version>
+ <os-core-common.version>0.11.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.11.0-SNAPSHOT</version>
+ <version>0.12.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 3851645dacb08293834cfc567303e2c7fa7ed44c..3d4196dc9b4f078906ec5b7631184a5a2291dd3d 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.11.0-SNAPSHOT</version>
+ <version>0.12.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.11.0-SNAPSHOT</version.number>
+ <version.number>0.12.0-SNAPSHOT</version.number>
</properties>
<dependencies>
diff --git a/provider/legal-azure/pom.xml b/provider/legal-azure/pom.xml
index 7add67b4e90024014ebe7e7157f2f7c2c482b5c1..4ec96a3b0de4ea4a3e6c4d4b62aae653b3daa23b 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.11.0-SNAPSHOT</version>
+ <version>0.12.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.10.0</osdu.corelibazure.version>
- <osdu.legal-core.version>0.11.0-SNAPSHOT</osdu.legal-core.version>
+ <osdu.corelibazure.version>0.11.0</osdu.corelibazure.version>
+ <osdu.legal-core.version>0.12.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-byoc/pom.xml b/provider/legal-byoc/pom.xml
index 081c31d1c0e346cca17e0a71879e917ff49dce04..182090c79cf2e3cf528bf5cbb96a007fd78e0a4a 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.11.0-SNAPSHOT</version>
+ <version>0.12.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.11.0-SNAPSHOT</version>
+ <version>0.12.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 04a899b7a223f72a71d135dbfafc9552948e5fe1..fdfbfd60b53336fbcf89c690d1add3cbf93c7827 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-gcp</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.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.11.0-SNAPSHOT</version>
+ <version>0.12.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</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
diff --git a/provider/legal-gcp/src/main/resources/application-dev.properties b/provider/legal-gcp/src/main/resources/application-dev.properties
index 8d6920ca6181642a932cf2d3a3f97d2cf6c1bb15..60bf6915262d3392f04da98ad7c855b64dcabbc5 100644
--- a/provider/legal-gcp/src/main/resources/application-dev.properties
+++ b/provider/legal-gcp/src/main/resources/application-dev.properties
@@ -11,4 +11,4 @@ REDIS_STORAGE_HOST=10.0.16.12
REDIS_GROUP_PORT=6379
REDIS_STORAGE_PORT=6379
-DEFAULT_DATA_COUNTRY=US
\ No newline at end of file
+DEFAULT_DATA_COUNTRY=US
diff --git a/provider/legal-gcp/src/main/resources/application.properties b/provider/legal-gcp/src/main/resources/application.properties
index c87dc4deef80528b7fc55802001cc67ad0f0389a..2c08afe21a3a5c6c3fa61ac2540424ecfe522c71 100644
--- a/provider/legal-gcp/src/main/resources/application.properties
+++ b/provider/legal-gcp/src/main/resources/application.properties
@@ -11,4 +11,11 @@ JAVA_GC_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupanc
enable.full.bucket.name=false
google.audiences=123.apps.googleusercontent.com
-partition.api=http://localhost:8081/api/partition/v1
+
+ENTITLEMENTS_HOST=http://entitlements
+ENTITLEMENTS_PATH=/api/entitlements/v2
+AUTHORIZE_API=${ENTITLEMENTS_HOST}${ENTITLEMENTS_PATH}
+
+PARTITION_HOST=http://partition
+PARTITION_PATH=/api/partition/v1
+PARTITION_API=${PARTITION_HOST}${PARTITION_PATH}
diff --git a/provider/legal-ibm/pom.xml b/provider/legal-ibm/pom.xml
index ff59892bf46d2924a7ec18a5629dcf71706e56c7..ebf601a8891da30859dff2a88be01f64c691ae45 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -11,14 +11,14 @@
<artifactId>legal-ibm</artifactId>
<packaging>jar</packaging>
<properties>
- <os-core-lib-ibm.version>0.11.0-SNAPSHOT</os-core-lib-ibm.version>
+ <os-core-lib-ibm.version>0.11.0</os-core-lib-ibm.version>
</properties>
<dependencies>
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-core</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
diff --git a/provider/legal-reference/pom.xml b/provider/legal-reference/pom.xml
index 5c2244c39759d41f4e18c0b84e8657f7a909ad48..4ec5a84f13847e8432905db22ce11aae90f68949 100644
--- a/provider/legal-reference/pom.xml
+++ b/provider/legal-reference/pom.xml
@@ -1,18 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-service</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<artifactId>legal-reference</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>legal-reference</name>
<description>Legal service for Anthos</description>
@@ -26,7 +24,7 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-core</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
@@ -35,7 +33,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
- <version>0.10.0</version>
+ <version>0.11.0</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -171,7 +169,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
- <version>0.10.0</version>
+ <version>0.11.0</version>
<scope>compile</scope>
</dependency>
diff --git a/testing/legal-test-aws/pom.xml b/testing/legal-test-aws/pom.xml
index bb7c48db726b4368c1642f1ef579ac5cc4b7f5f6..03d942528a8ca24ff699955dfd4ff9230d2976ab 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-aws</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu.core.aws</groupId>
<artifactId>os-core-lib-aws</artifactId>
- <version>0.10.0</version>
+ <version>0.11.0</version>
</dependency>
<!-- AWS managed packages -->
diff --git a/testing/legal-test-azure/pom.xml b/testing/legal-test-azure/pom.xml
index b377687756557ec30871511c1787fc25ea2d77e4..36f203e07647ae5e1e37825f292ebd04261fc0c3 100644
--- a/testing/legal-test-azure/pom.xml
+++ b/testing/legal-test-azure/pom.xml
@@ -15,20 +15,19 @@
limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>os-legal-testing</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-azure</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
@@ -49,7 +48,7 @@
<dependency>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-core</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.microsoft.azure/azure-servicebus -->
diff --git a/testing/legal-test-core/pom.xml b/testing/legal-test-core/pom.xml
index 87060f8b39b578704c9e507ef7aa8b861ddd03ca..2a057603aa80404045b65637b10ae6b1863967a3 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-core</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.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 d2c6310d36a8d6916013221903e8bab0cb3ad4a1..88b5082fbdeac579e200fc4ac1cb21f2aa48d3c0 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-gcp</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.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.11.0-SNAPSHOT</version>
+ <version>0.12.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 a20738f4ec0acd041dc6337e102fd37259c37639..fff4fbe483488d272d6bb0831e5aa1111eb1052c 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.opengroup.osdu.legal</groupId>
<artifactId>legal-test-ibm</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.12.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.11.0-SNAPSHOT</version>
+ <version>0.12.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 11880f78119f4b3468d2e983e3c3dfb1d2556fa0..3a99d370e378116067be14f1ce095fad16477f78 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.11.0-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<description>Root Legal Service project</description>
<packaging>pom</packaging>