From 0902011e2e77b61a00cd35c9f7bfa5af3bfb272d Mon Sep 17 00:00:00 2001 From: Aliaksandr Ramanovich Date: Thu, 30 Sep 2021 07:48:43 +0300 Subject: [PATCH 1/5] GONRG-3398 - set default number of replicas for storage --- devops/gcp/deploy/templates/storage-deploy.yml | 3 +-- devops/gcp/deploy/values.yaml | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devops/gcp/deploy/templates/storage-deploy.yml b/devops/gcp/deploy/templates/storage-deploy.yml index bf1b90c8..456d49a1 100644 --- a/devops/gcp/deploy/templates/storage-deploy.yml +++ b/devops/gcp/deploy/templates/storage-deploy.yml @@ -9,7 +9,7 @@ spec: selector: matchLabels: app: "{{ .Values.conf.app_name }}" - replicas: 1 + replicas: "{{ .Values.conf.replicas }}" template: metadata: labels: @@ -36,4 +36,3 @@ spec: cpu: "{{ .Values.data.limits_cpu }}" memory: "{{ .Values.data.limits_memory }}" serviceAccountName: "{{ .Values.data.serviceAccountName }}" - diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml index 2702dc99..e79c5c77 100644 --- a/devops/gcp/deploy/values.yaml +++ b/devops/gcp/deploy/values.yaml @@ -7,9 +7,10 @@ data: requests_memory: "256M" limits_cpu: "1" limits_memory: "1G" - serviceAccountName: "" - image: "" + serviceAccountName: "workload-identity-storage" + image: "community.opengroup.org:5555/osdu/platform/system/storage/osdu-gcp:v0.11.0" conf: configmap: "storage-config" app_name: "storage" + replicas: 3 -- GitLab From a6f8eb5f1350df99446aa27cb5c9b2b17f1c72d7 Mon Sep 17 00:00:00 2001 From: Aliaksandr Ramanovich Date: Thu, 30 Sep 2021 10:36:32 +0300 Subject: [PATCH 2/5] GONRG-3398 - fix type of value --- devops/gcp/deploy/templates/storage-deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/gcp/deploy/templates/storage-deploy.yml b/devops/gcp/deploy/templates/storage-deploy.yml index 456d49a1..580cc9c2 100644 --- a/devops/gcp/deploy/templates/storage-deploy.yml +++ b/devops/gcp/deploy/templates/storage-deploy.yml @@ -9,7 +9,7 @@ spec: selector: matchLabels: app: "{{ .Values.conf.app_name }}" - replicas: "{{ .Values.conf.replicas }}" + replicas: {{ .Values.conf.replicas }} template: metadata: labels: -- GitLab From 59ea895e8d5ac470411994a401d98f39e5a5f87f Mon Sep 17 00:00:00 2001 From: "Oleksandr Kosse (EPAM)" Date: Thu, 30 Sep 2021 08:40:31 +0000 Subject: [PATCH 3/5] Update NOTICE --- NOTICE | 172 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 86 insertions(+), 86 deletions(-) diff --git a/NOTICE b/NOTICE index 5b6e0e2f..a455f023 100644 --- a/NOTICE +++ b/NOTICE @@ -691,9 +691,9 @@ The following software have components provided under the terms of this license: - 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) +- AutoValue Annotations (from https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations) - Azure Spring Boot Starter for Azure AD Spring Security Integration (from https://github.com/Azure/azure-sdk-for-java) -- BSON (from https://bsonspec.org) +- BSON (from http://bsonspec.org) - Bean Validation API (from http://beanvalidation.org) - Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave) - Brave Instrumentation: Http Adapters (from https://repo1.maven.org/maven2/io/zipkin/brave/brave-instrumentation-http) @@ -705,7 +705,8 @@ The following software have components provided under the terms of this license: - ClassMate (from http://github.com/cowtowncoder/java-classmate) - ClassMate (from http://github.com/cowtowncoder/java-classmate) - ClassMate (from http://github.com/cowtowncoder/java-classmate) -- Cloud Storage JSON API v1-rev20210914-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage) +- Cloud Key Management Service (KMS) API v1-rev20210820-1.32.1 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms) +- Cloud Storage JSON API v1-rev20200814-1.30.10 (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) - CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava) - CloudWatch Metrics for AWS Java SDK (from https://aws.amazon.com/sdkforjava) @@ -722,13 +723,12 @@ The following software have components provided under the terms of this license: - 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 Core gRPC (from https://github.com/googleapis/java-core) +- Google Cloud Core gRPC (from https://github.com/googleapis/java-core) - 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) +- Google Cloud Logging (from https://github.com/googleapis/java-logging) - 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) @@ -779,13 +779,14 @@ The following software have components provided under the terms of this license: - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) - Jackson dataformat: Smile (from http://github.com/FasterXML/jackson-dataformats-binary) - Jackson dataformat: Smile (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: 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 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: Afterburner (from https://github.com/FasterXML/jackson-modules-base) +- Jackson-Datatype-JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) +- Jackson-Datatype-JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-annotations (from http://github.com/FasterXML/jackson) @@ -795,7 +796,6 @@ The following software have components provided under the terms of this license: - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) -- 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) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) @@ -861,8 +861,11 @@ The following software have components provided under the terms of this license: - Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java) - Mockito (from http://www.mockito.org) - Mockito (from http://www.mockito.org) -- MongoDB Java Driver (from http://www.mongodb.org) +- Mockito (from http://www.mockito.org) +- Mockito (from http://www.mockito.org) +- Mockito (from http://www.mockito.org) - MongoDB Java Driver (from http://mongodb.org/) +- MongoDB Java Driver (from http://www.mongodb.org) - MongoDB Java Driver Core (from http://www.mongodb.org) - 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) @@ -908,7 +911,10 @@ 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) -- OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor) +- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) +- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) +- OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection) +- OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection) - 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) @@ -917,11 +923,20 @@ The following software have components provided under the terms of this license: - PWDB :: Database (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/database) - 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) +- 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) +- 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) -- Reactor Netty with all modules (from https://github.com/reactor/reactor-netty) +- RabbitMQ Java Client (from http://www.rabbitmq.com) +- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty) - Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit) - Simple XML (safe) (from https://github.com/dweiss/simplexml) - SnakeYAML (from http://www.snakeyaml.org) @@ -930,6 +945,17 @@ The following software have components provided under the terms of this license: - Spring AOP (from https://github.com/spring-projects/spring-framework) - Spring Beans (from https://github.com/spring-projects/spring-framework) - Spring Beans (from https://github.com/spring-projects/spring-framework) +- Spring Boot Dependencies (from https://projects.spring.io/spring-boot/#) +- Spring Boot Logging Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-logging) +- Spring Boot Logging Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-logging) +- 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 https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-security) +- Spring Boot Security Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-security) +- Spring Boot Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter) +- Spring Boot Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter) +- Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web) +- Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web) +- 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 Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Context (from https://github.com/spring-projects/spring-framework) @@ -1016,13 +1042,7 @@ The following software have components provided under the terms of this license: - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) - minio (from https://github.com/minio/minio-java) -- mockito-core (from https://github.com/mockito/mockito) -- mockito-core (from https://github.com/mockito/mockito) -- mockito-core (from https://github.com/mockito/mockito) -- okhttp (from https://square.github.io/okhttp/) -- okhttp (from https://square.github.io/okhttp/) -- okhttp-urlconnection (from https://github.com/square/okhttp) -- okhttp-urlconnection (from https://github.com/square/okhttp) +- okhttp-logging-interceptor (from https://square.github.io/okhttp/) - okio (from https://github.com/square/okio/) - okio (from https://github.com/square/okio/) - org.apiguardian:apiguardian-api (from https://github.com/apiguardian-team/apiguardian) @@ -1033,34 +1053,25 @@ The following software have components provided under the terms of this license: - parent-join (from https://github.com/elastic/elasticsearch) - parent-join (from https://github.com/elastic/elasticsearch) - perfmark:perfmark-api (from https://github.com/perfmark/perfmark) -- powermock-api-mockito (from https://repo1.maven.org/maven2/org/powermock/powermock-api-mockito) -- powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support) -- powermock-api-support (from https://repo1.maven.org/maven2/org/powermock/powermock-api-support) -- powermock-core (from http://www.powermock.org) -- 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) -- 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-logging-v2 (from https://github.com/googleapis/java-logging/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/java-iam/proto-google-common-protos) - proto-google-iam-v1 (from https://github.com/googleapis/java-iam/proto-google-iam-v1) - rank-eval (from https://github.com/elastic/elasticsearch) - rank-eval (from https://github.com/elastic/elasticsearch) +- resilience4j (from https://github.com/resilience4j/resilience4j) - 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) +- resilience4j (from https://github.com/resilience4j/resilience4j) - rest (from https://github.com/elastic/elasticsearch) - rest (from https://github.com/elastic/elasticsearch) - rest-high-level (from https://github.com/elastic/elasticsearch) @@ -1074,20 +1085,12 @@ The following software have components provided under the terms of this license: - spring-boot-actuator-autoconfigure (from https://spring.io/projects/spring-boot) - spring-boot-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 (from https://spring.io/projects/spring-boot) - spring-boot-starter-actuator (from https://spring.io/projects/spring-boot) - spring-boot-starter-aop (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-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-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-security (from https://spring.io/projects/spring-boot) - spring-boot-starter-test (from https://spring.io/projects/spring-boot) - spring-boot-starter-test (from https://spring.io/projects/spring-boot) - spring-boot-starter-test (from https://spring.io/projects/spring-boot) @@ -1095,28 +1098,25 @@ The following software have components provided under the terms of this license: - 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-validation (from https://spring.io/projects/spring-boot) -- spring-boot-starter-web (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 (from https://spring.io/projects/spring-boot) - spring-boot-test-autoconfigure (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/spring-security) -- spring-security-config (from https://spring.io/spring-security) -- spring-security-core (from https://spring.io/spring-security) -- spring-security-core (from https://spring.io/spring-security) -- spring-security-oauth2-client (from https://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-core (from https://spring.io/spring-security) -- spring-security-oauth2-jose (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/spring-security) -- spring-security-test (from https://spring.io/spring-security) -- spring-security-web (from https://spring.io/spring-security) -- spring-security-web (from https://spring.io/spring-security) +- spring-security-config (from https://spring.io/projects/spring-security) +- spring-security-config (from https://spring.io/projects/spring-security) +- spring-security-core (from http://spring.io/spring-security) +- spring-security-core (from http://spring.io/spring-security) +- spring-security-oauth2-client (from http://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-core (from http://spring.io/spring-security) +- spring-security-oauth2-jose (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-test (from http://spring.io/spring-security) +- spring-security-web (from http://spring.io/spring-security) +- spring-security-web (from http://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) @@ -1126,7 +1126,7 @@ The following software have components provided under the terms of this license: - springfox-swagger2 (from https://github.com/springfox/springfox) - swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations) - swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations) -- swagger-jaxrs (from ) +- swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs) - swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models) - tomcat-annotations-api (from https://tomcat.apache.org/) - tomcat-annotations-api (from https://tomcat.apache.org/) @@ -1142,7 +1142,7 @@ BSD-2-Clause The following software have components provided under the terms of this license: - API Common (from https://github.com/googleapis/api-common-java) -- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) +- GAX (Google Api eXtensions) (from https://github.com/googleapis) - 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/) @@ -1153,7 +1153,7 @@ The following software have components provided under the terms of this license: - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core) - Lucene Core (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-core) - Reflections (from http://github.com/ronmamo/reflections) -- Stax2 API (from http://github.com/FasterXML/stax2-api) +- Stax2 API (from http://woodstox.codehaus.org/StAX2) - ThreeTen backport (from https://www.threeten.org/threetenbp) ======================================================================== @@ -1164,7 +1164,7 @@ The following software have components provided under the terms of this license: - API Common (from https://github.com/googleapis/api-common-java) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) - Apache Commons Codec (from https://commons.apache.org/proper/commons-codec/) -- GAX (Google Api eXtensions) for Java (from https://github.com/googleapis/gax-java) +- GAX (Google Api eXtensions) (from https://github.com/googleapis) - 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) @@ -1246,7 +1246,7 @@ The following software have components provided under the terms of this license: - JavaBeans Activation Framework (from ) - JavaBeans(TM) Activation Framework (from http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp) - JavaMail API (from https://repo1.maven.org/maven2/com/sun/mail/javax.mail) -- OSGi resource locator (from ) +- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator) - ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator) - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) @@ -1278,7 +1278,7 @@ EPL-1.0 ======================================================================== The following software have components provided under the terms of this license: -- AspectJ Weaver (from https://www.eclipse.org/aspectj/) +- AspectJ weaver (from http://www.aspectj.org) - JUnit Jupiter (Aggregator) (from https://junit.org/junit5/) - JUnit Jupiter API (from https://junit.org/junit5/) - JUnit Jupiter Engine (from https://junit.org/junit5/) @@ -1287,11 +1287,11 @@ The following software have components provided under the terms of this license: - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) -- Logback Classic Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-classic) +- Logback Classic Module (from http://logback.qos.ch) - Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic) - Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core) - Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson) -- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core) +- Logback Core Module (from http://logback.qos.ch) - 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) @@ -1321,8 +1321,8 @@ The following software have components provided under the terms of this license: - HK2 Implementation Utilities (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-utils) - Java Servlet API (from http://servlet-spec.java.net) - JavaBeans Activation Framework (from ) -- OSGi resource locator (from ) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator) - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) @@ -1353,8 +1353,8 @@ The following software have components provided under the terms of this license: - Jakarta Expression Language Implementation (from https://projects.eclipse.org/projects/ee4j.el) - Java Servlet API (from http://servlet-spec.java.net) - JavaBeans Activation Framework (from ) -- OSGi resource locator (from ) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- OSGi resource locator (from https://repo1.maven.org/maven2/org/glassfish/hk2/osgi-resource-locator) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - ServiceLocator Default Implementation (from https://repo1.maven.org/maven2/org/glassfish/hk2/hk2-locator) - aopalliance-repackaged (from https://repo1.maven.org/maven2/org/glassfish/hk2/external/aopalliance-repackaged) - javax.annotation-api (from http://jcp.org/en/jsr/detail?id=250) @@ -1383,7 +1383,7 @@ ImageMagick ======================================================================== The following software have components provided under the terms of this license: -- Stax2 API (from http://github.com/FasterXML/stax2-api) +- Stax2 API (from http://woodstox.codehaus.org/StAX2) - Woodstox (from https://github.com/FasterXML/woodstox) ======================================================================== @@ -1405,11 +1405,11 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - 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 Classic Module (from http://logback.qos.ch) - Logback Contrib :: JSON :: Classic (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-classic) - Logback Contrib :: JSON :: Core (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-json-core) - Logback Contrib :: Jackson (from https://repo1.maven.org/maven2/ch/qos/logback/contrib/logback-jackson) -- Logback Core Module (from https://repo1.maven.org/maven2/ch/qos/logback/logback-core) +- Logback Core Module (from http://logback.qos.ch) - 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) @@ -1437,7 +1437,7 @@ The following software have components provided under the terms of this license: - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) - 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) +- RabbitMQ Java Client (from http://www.rabbitmq.com) ======================================================================== MIT @@ -1487,12 +1487,16 @@ The following software have components provided under the terms of this license: - Microsoft Azure internal Avro module for Storage (from https://github.com/Azure/azure-sdk-for-java) - Mockito (from http://www.mockito.org) - Mockito (from http://www.mockito.org) +- Mockito (from http://www.mockito.org) +- Mockito (from http://www.mockito.org) +- Mockito (from http://www.mockito.org) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - Netty/Codec/HTTP (from https://repo1.maven.org/maven2/io/netty/netty-codec-http) - 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) - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) - Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common) +- PowerMock (from http://www.powermock.org) - Project Lombok (from https://projectlombok.org) - Project Lombok (from https://projectlombok.org) - SLF4J API Module (from http://www.slf4j.org) @@ -1504,15 +1508,11 @@ The following software have components provided under the terms of this license: - documentdb-bulkexecutor (from http://azure.microsoft.com/en-us/services/documentdb/) - java jwt (from https://github.com/auth0/java-jwt) - 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-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) -- powermock-api-mockito (from https://repo1.maven.org/maven2/org/powermock/powermock-api-mockito) -- spring-security-core (from https://spring.io/spring-security) -- spring-security-core (from https://spring.io/spring-security) +- spring-security-core (from http://spring.io/spring-security) +- spring-security-core (from http://spring.io/spring-security) ======================================================================== MPL-1.1 @@ -1522,7 +1522,7 @@ The following software have components provided under the terms of this license: - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) ======================================================================== MPL-2.0 @@ -1532,8 +1532,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/) - Javassist (from http://www.javassist.org/) -- RabbitMQ Java Client (from https://www.rabbitmq.com) -- okhttp (from https://square.github.io/okhttp/) +- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) +- RabbitMQ Java Client (from http://www.rabbitmq.com) ======================================================================== PHP-3.01 @@ -1611,7 +1611,7 @@ The following software have components provided under the terms of this license: - Microsoft Azure client library for Blob Storage (from https://github.com/Azure/azure-sdk-for-java) - Project Lombok (from https://projectlombok.org) - Project Lombok (from https://projectlombok.org) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - Spring Web (from https://github.com/spring-projects/spring-framework) - Spring Web (from https://github.com/spring-projects/spring-framework) - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/) @@ -1640,7 +1640,7 @@ The following software have components provided under the terms of this license: - JUnit Platform Engine API (from https://junit.org/junit5/) - Jakarta Activation API jar (from https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api) - Jakarta XML Binding API (from https://repo1.maven.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api) -- RabbitMQ Java Client (from https://www.rabbitmq.com) +- RabbitMQ Java Client (from http://www.rabbitmq.com) - Spongy Castle (from http://rtyley.github.io/spongycastle/) -- GitLab From 53d9866a9bb9dddd0fadc9be9e56c5b284180a99 Mon Sep 17 00:00:00 2001 From: Aliaksandr Ramanovich Date: Fri, 1 Oct 2021 11:46:57 +0300 Subject: [PATCH 4/5] GONRG-3398 - move unnecessary values --- devops/gcp/deploy/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/gcp/deploy/values.yaml b/devops/gcp/deploy/values.yaml index e79c5c77..acd3c9b3 100644 --- a/devops/gcp/deploy/values.yaml +++ b/devops/gcp/deploy/values.yaml @@ -7,8 +7,8 @@ data: requests_memory: "256M" limits_cpu: "1" limits_memory: "1G" - serviceAccountName: "workload-identity-storage" - image: "community.opengroup.org:5555/osdu/platform/system/storage/osdu-gcp:v0.11.0" + serviceAccountName: "" + image: "" conf: configmap: "storage-config" -- GitLab From 428fe413c95b6ae9919aeb3e101ef4fa6bdf056c Mon Sep 17 00:00:00 2001 From: "Aliaksandr Ramanovich (EPAM)" Date: Fri, 1 Oct 2021 09:55:22 +0000 Subject: [PATCH 5/5] Update NOTICE --- NOTICE | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/NOTICE b/NOTICE index a455f023..c22b452e 100644 --- a/NOTICE +++ b/NOTICE @@ -676,7 +676,6 @@ The following software have components provided under the terms of this license: - Apache Commons Logging (from http://commons.apache.org/proper/commons-logging/) - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version}) - Apache HttpAsyncClient (from http://hc.apache.org/httpcomponents-asyncclient) -- Apache HttpClient Mime (from http://hc.apache.org/httpcomponents-client) - Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga) - Apache HttpCore NIO (from http://hc.apache.org/httpcomponents-core-ga) - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) @@ -753,6 +752,7 @@ The following software have components provided under the terms of this license: - HttpCore (from http://hc.apache.org/httpcomponents-core-ga) - HttpCore (from http://hc.apache.org/httpcomponents-core-ga) - HttpCore (from http://hc.apache.org/httpcomponents-core-ga) +- HttpMime (from http://hc.apache.org/httpcomponents-client) - 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) @@ -779,24 +779,24 @@ The following software have components provided under the terms of this license: - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) - Jackson dataformat: Smile (from http://github.com/FasterXML/jackson-dataformats-binary) - Jackson dataformat: Smile (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: 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 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: Afterburner (from https://github.com/FasterXML/jackson-modules-base) -- Jackson-Datatype-JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) -- Jackson-Datatype-JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) +- Jackson module: Old JAXB Annotations (javax.xml.bind) (from https://github.com/FasterXML/jackson-modules-base) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-core (from https://github.com/FasterXML/jackson-core) -- Jackson-dataformat-XML (from http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding) +- Jackson-dataformat-XML (from https://github.com/FasterXML/jackson-dataformat-xml) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) - Jackson-dataformat-YAML (from https://github.com/FasterXML/jackson-dataformats-text) -- 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) - 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) @@ -864,8 +864,8 @@ The following software have components provided under the terms of this license: - Mockito (from http://www.mockito.org) - Mockito (from http://www.mockito.org) - Mockito (from http://www.mockito.org) -- MongoDB Java Driver (from http://mongodb.org/) - MongoDB Java Driver (from http://www.mongodb.org) +- MongoDB Java Driver (from http://mongodb.org/) - MongoDB Java Driver Core (from http://www.mongodb.org) - 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) @@ -911,8 +911,6 @@ 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) -- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) -- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) - OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection) - OkHttp URLConnection (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp-urlconnection) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) @@ -1042,6 +1040,8 @@ The following software have components provided under the terms of this license: - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) - minio (from https://github.com/minio/minio-java) +- okhttp (from https://square.github.io/okhttp/) +- okhttp (from https://square.github.io/okhttp/) - okhttp-logging-interceptor (from https://square.github.io/okhttp/) - okio (from https://github.com/square/okio/) - okio (from https://github.com/square/okio/) @@ -1532,8 +1532,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/) - Javassist (from http://www.javassist.org/) -- OkHttp (from https://repo1.maven.org/maven2/com/squareup/okhttp3/okhttp) - RabbitMQ Java Client (from http://www.rabbitmq.com) +- okhttp (from https://square.github.io/okhttp/) ======================================================================== PHP-3.01 -- GitLab