From 4e0c3ff38434bcdfa7bc8fa223ec9794d600e1f6 Mon Sep 17 00:00:00 2001 From: David Diederich Date: Wed, 1 Sep 2021 19:05:22 -0400 Subject: [PATCH 01/12] Create Release Branch for version 0.11 --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72909185..43f1355b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,30 +42,39 @@ variables: include: - project: "osdu/platform/ci-cd-pipelines" file: "standard-setup.yml" + ref: release/0.11 - project: "osdu/platform/ci-cd-pipelines" file: "build/maven.yml" + ref: release/0.11 - project: "osdu/platform/ci-cd-pipelines" file: "scanners/fossa-maven.yml" + ref: release/0.11 - project: "osdu/platform/ci-cd-pipelines" file: "scanners/gitlab-ultimate.yml" + ref: release/0.11 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws.yml" + ref: release/0.11 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/ibm.yml" + ref: release/0.11 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/azure.yml" + ref: release/0.11 - project: 'osdu/platform/ci-cd-pipelines' file: 'cloud-providers/osdu-gcp-gke.yml' + ref: release/0.11 - project: 'osdu/platform/ci-cd-pipelines' file: 'publishing/pages.yml' + ref: release/0.11 aws-test-java: tags: ['aws-internal-test'] -- GitLab From 4cf0ad5f79ab86b0eca1e67bd4a8e471a5bb8052 Mon Sep 17 00:00:00 2001 From: David Diederich Date: Fri, 3 Sep 2021 19:55:01 +0000 Subject: [PATCH 02/12] Updating FOSSA NOTICE --- NOTICE | 60 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/NOTICE b/NOTICE index dbbf45c9..2ed0c6a7 100644 --- a/NOTICE +++ b/NOTICE @@ -115,18 +115,18 @@ The following software have components provided under the terms of this license: - Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2) - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) - Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) -- Jackson 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: Afterburner (from https://github.com/FasterXML/jackson-modules-base) -- Jackson module: Old JAXB Annotations (javax.xml.bind) (from https://github.com/FasterXML/jackson-modules-base) -- Jackson-JAXRS: JSON (from https://repo1.maven.org/maven2/com/fasterxml/jackson/jaxrs/jackson-jaxrs-json-provider) +- Jackson module: JAXB-annotations (from http://github.com/FasterXML/jackson-module-jaxb-annotations) +- Jackson-JAXRS-JSON_Provider (from http://wiki.fasterxml.com/JacksonHome) - Jackson-JAXRS: base (from https://repo1.maven.org/maven2/com/fasterxml/jackson/jaxrs/jackson-jaxrs-base) - Jackson-annotations (from http://github.com/FasterXML/jackson) - Jackson-core (from https://github.com/FasterXML/jackson-core) - Jackson-dataformat-Smile (from http://wiki.fasterxml.com/JacksonForSmile) -- 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-datatype-JODA (from http://wiki.fasterxml.com/JacksonModuleJoda) - Jackson-module-parameter-names (from https://repo1.maven.org/maven2/com/fasterxml/jackson/module/jackson-module-parameter-names) - Jakarta Bean Validation API (from https://beanvalidation.org) - Java Native Access (from https://github.com/java-native-access/jna) @@ -157,10 +157,10 @@ The following software have components provided under the terms of this license: - Lucene Highlighter (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-highlighter) - Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join) - Lucene Join (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-join) -- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs) - Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory) - Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-memory) - Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs) +- Lucene Memory (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-backward-codecs) - Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc) - Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc) - Lucene Queries (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-queries) @@ -209,13 +209,14 @@ The following software have components provided under the terms of this license: - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt) - Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags) - Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags) -- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor-core) -- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor-core) +- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor) +- Non-Blocking Reactive Foundation for the JVM (from https://github.com/reactor/reactor) - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - OAuth 2.0 SDK with OpenID Connect extensions (from https://bitbucket.org/connect2id/oauth-2.0-sdk-with-openid-connect-extensions) - OAuth2 for Spring Security (from https://repo1.maven.org/maven2/org/springframework/security/oauth/spring-security-oauth2) - Objenesis (from http://objenesis.org) +- OkHttp Logging Interceptor (from https://repo1.maven.org/maven2/com/squareup/okhttp3/logging-interceptor) - Okio (from https://github.com/square/okio/) - Okio (from https://github.com/square/okio/) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java) @@ -241,7 +242,6 @@ The following software have components provided under the terms of this license: - Spatial4J (from http://www.locationtech.org/projects/locationtech.spatial4j) - 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 Commons Logging Bridge (from https://github.com/spring-projects/spring-framework) - Spring Context (from https://github.com/spring-projects/spring-framework) @@ -266,9 +266,9 @@ The following software have components provided under the terms of this license: - Spring WebFlux (from https://github.com/spring-projects/spring-framework) - T-Digest (from https://github.com/tdunning/t-digest) - Woodstox (from https://github.com/FasterXML/woodstox) -- Zipkin Core Library (from https://repo1.maven.org/maven2/io/zipkin/zipkin2/zipkin) - Zipkin Reporter Brave (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter-brave) - Zipkin Reporter: Core (from https://repo1.maven.org/maven2/io/zipkin/reporter2/zipkin-reporter) +- Zipkin v2 (from https://repo1.maven.org/maven2/io/zipkin/zipkin2/zipkin) - aalto-xml (from ) - aggs-matrix-stats (from https://github.com/elastic/elasticsearch) - aggs-matrix-stats (from https://github.com/elastic/elasticsearch) @@ -280,6 +280,8 @@ The following software have components provided under the terms of this license: - compiler (from http://github.com/spullara/mustache.java) - core (from https://github.com/elastic/elasticsearch) - core (from https://github.com/elastic/elasticsearch) +- core (from https://github.com/elastic/elasticsearch) +- core (from https://github.com/elastic/elasticsearch) - datastore-v1-proto-client (from https://repo1.maven.org/maven2/com/google/cloud/datastore/datastore-v1-proto-client) - elasticsearch-geo (from https://github.com/elastic/elasticsearch) - embedded-elasticsearch (from https://github.com/allegro/embedded-elasticsearch) @@ -329,7 +331,6 @@ The following software have components provided under the terms of this license: - lang-mustache (from https://github.com/elastic/elasticsearch) - lang-mustache (from https://github.com/elastic/elasticsearch) - lettuce (from http://github.com/mp911de/lettuce/wiki) -- logging-interceptor (from https://github.com/square/okhttp) - mapper-extras (from https://github.com/elastic/elasticsearch) - micrometer-core (from https://github.com/micrometer-metrics/micrometer) - micrometer-registry-azure-monitor (from https://github.com/micrometer-metrics/micrometer) @@ -337,8 +338,8 @@ The following software have components provided under the terms of this license: - mockito-core (from https://github.com/mockito/mockito) - nio-multipart-parser (from ) - nio-stream-storage (from https://github.com/synchronoss/nio-stream-storage) -- null (from https://github.com/fge/msg-simple) - null (from https://github.com/fge/jackson-coreutils) +- null (from https://github.com/fge/msg-simple) - okhttp (from https://square.github.io/okhttp/) - okhttp (from https://square.github.io/okhttp/) - okhttp-urlconnection (from https://github.com/square/okhttp) @@ -353,8 +354,8 @@ The following software have components provided under the terms of this license: - 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-common-protos (from https://github.com/googleapis/api-client-staging) -- 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-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) @@ -365,8 +366,6 @@ The following software have components provided under the terms of this license: - rxjava (from https://github.com/ReactiveX/RxJava) - secure-sm (from https://github.com/elastic/elasticsearch) - secure-sm (from https://github.com/elastic/elasticsearch) -- server (from https://github.com/elastic/elasticsearch) -- server (from https://github.com/elastic/elasticsearch) - 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) @@ -379,6 +378,7 @@ The following software have components provided under the terms of this license: - spring-boot-starter-data-redis (from https://spring.io/projects/spring-boot) - spring-boot-starter-jersey (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-reactor-netty (from https://spring.io/projects/spring-boot) - spring-boot-starter-security (from https://spring.io/projects/spring-boot) @@ -390,14 +390,14 @@ The following software have components provided under the terms of this license: - 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 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-core (from http://spring.io/spring-security) -- spring-security-oauth2-jose (from http://spring.io/spring-security) -- spring-security-oauth2-resource-server (from http://spring.io/spring-security) -- spring-security-test (from http://spring.io/spring-security) -- spring-security-web (from http://spring.io/spring-security) +- spring-security-config (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-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/spring-security) +- spring-security-web (from https://spring.io/spring-security) - springfox-core (from https://github.com/springfox/springfox) - springfox-schema (from https://github.com/springfox/springfox) - springfox-spi (from https://github.com/springfox/springfox) @@ -409,10 +409,10 @@ The following software have components provided under the terms of this license: - swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations) - swagger-jaxrs (from ) - swagger-models (from https://repo1.maven.org/maven2/io/swagger/swagger-models) -- tomcat-annotations-api (from https://tomcat.apache.org/) +- tomcat-annotations-api (from http://tomcat.apache.org/) - tomcat-embed-core (from http://tomcat.apache.org/) - tomcat-embed-el (from https://tomcat.apache.org/) -- tomcat-embed-websocket (from https://tomcat.apache.org/) +- tomcat-embed-websocket (from http://tomcat.apache.org/) - x-content (from https://github.com/elastic/elasticsearch) - x-content (from https://github.com/elastic/elasticsearch) @@ -429,7 +429,7 @@ The following software have components provided under the terms of this license: - Lucene Common Analyzers (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-analyzers-common) - 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) +- 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) - jersey-ext-bean-validation (from https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-bean-validation) @@ -466,7 +466,7 @@ The following software have components provided under the terms of this license: - Protocol Buffers [Core] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java) - 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) - Spring Data KeyValue (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-keyvalue) @@ -808,6 +808,7 @@ The following software have components provided under the terms of this license: - Spring Data for Azure Cosmos DB SQL API (from https://github.com/Azure/azure-sdk-for-java/tree/master/sdk/cosmos/azure-spring-data-cosmos) - adal4j (from https://github.com/AzureAD/azure-activedirectory-library-for-java) - azure-documentdb (from https://azure.microsoft.com/en-us/services/cosmos-db/) +- core (from https://github.com/elastic/elasticsearch) - 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) @@ -815,8 +816,7 @@ The following software have components provided under the terms of this license: - mockito-core (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) -- server (from https://github.com/elastic/elasticsearch) -- spring-security-core (from http://spring.io/spring-security) +- spring-security-core (from https://spring.io/spring-security) ======================================================================== MPL-1.1 @@ -885,7 +885,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/) ======================================================================== X11 -- GitLab From 40ce4aea1d13de807eea646317c0f38b6b601bd6 Mon Sep 17 00:00:00 2001 From: David Diederich Date: Fri, 3 Sep 2021 17:47:01 -0400 Subject: [PATCH 03/12] Creating Release Commit --- .gitlab-ci.yml | 18 +++++++++--------- pom.xml | 4 ++-- provider/search-aws/pom.xml | 10 +++++----- provider/search-azure/pom.xml | 8 ++++---- provider/search-byoc/pom.xml | 8 ++++---- provider/search-gcp/pom.xml | 8 ++++---- provider/search-ibm/pom.xml | 6 +++--- provider/search-reference/pom.xml | 8 ++++---- search-core/pom.xml | 6 +++--- testing/integration-tests/pom.xml | 2 +- .../integration-tests/search-test-aws/pom.xml | 6 +++--- .../search-test-azure/pom.xml | 6 +++--- .../integration-tests/search-test-core/pom.xml | 6 +++--- .../integration-tests/search-test-gcp/pom.xml | 6 +++--- .../integration-tests/search-test-ibm/pom.xml | 6 +++--- 15 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43f1355b..85fcbdb6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,39 +42,39 @@ variables: include: - project: "osdu/platform/ci-cd-pipelines" file: "standard-setup.yml" - ref: release/0.11 + ref: v0.11.1 - project: "osdu/platform/ci-cd-pipelines" file: "build/maven.yml" - ref: release/0.11 + ref: v0.11.1 - project: "osdu/platform/ci-cd-pipelines" file: "scanners/fossa-maven.yml" - ref: release/0.11 + ref: v0.11.1 - project: "osdu/platform/ci-cd-pipelines" file: "scanners/gitlab-ultimate.yml" - ref: release/0.11 + ref: v0.11.1 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/aws.yml" - ref: release/0.11 + ref: v0.11.1 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/ibm.yml" - ref: release/0.11 + ref: v0.11.1 - project: "osdu/platform/ci-cd-pipelines" file: "cloud-providers/azure.yml" - ref: release/0.11 + ref: v0.11.1 - project: 'osdu/platform/ci-cd-pipelines' file: 'cloud-providers/osdu-gcp-gke.yml' - ref: release/0.11 + ref: v0.11.1 - project: 'osdu/platform/ci-cd-pipelines' file: 'publishing/pages.yml' - ref: release/0.11 + ref: v0.11.1 aws-test-java: tags: ['aws-internal-test'] diff --git a/pom.xml b/pom.xml index 85bba6c7..743ac368 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 Root Search Service Project pom @@ -44,7 +44,7 @@ 2.13.2 1.31.0 1.20 - 0.11.0-SNAPSHOT + 0.11.0 9.0.45 diff --git a/provider/search-aws/pom.xml b/provider/search-aws/pom.xml index 8febdbd2..8d114c0f 100644 --- a/provider/search-aws/pom.xml +++ b/provider/search-aws/pom.xml @@ -19,7 +19,7 @@ org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml @@ -27,7 +27,7 @@ search-aws Search Service on AWS jar - 0.11.0-SNAPSHOT + 0.11.0 1.8 1.8 @@ -39,7 +39,7 @@ 1.11.1018 dev 0.0.4-SNAPSHOT - 0.11.0-SNAPSHOT + 0.11.0 @@ -47,12 +47,12 @@ org.opengroup.osdu search-core - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu.core.aws os-core-lib-aws - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index e3d6b559..f40335d5 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -20,13 +20,13 @@ org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml jar search-azure - 0.11.0-SNAPSHOT + 0.11.0 1.8 @@ -37,8 +37,8 @@ ${project.parent.basedir} 2.1.7.RELEASE 0.10.1 - 0.11.0-SNAPSHOT - 0.11.0-SNAPSHOT + 0.11.0 + 0.11.0 0.7 1.15.0 1.0.7 diff --git a/provider/search-byoc/pom.xml b/provider/search-byoc/pom.xml index 2e4298e9..769c49b5 100644 --- a/provider/search-byoc/pom.xml +++ b/provider/search-byoc/pom.xml @@ -18,14 +18,14 @@ 4.0.0 org.opengroup.osdu search-byoc - 0.11.0-SNAPSHOT + 0.11.0 In memory implementation of Search service APIs jar org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml @@ -38,7 +38,7 @@ UTF-8 false ${project.parent.basedir} - 0.11.0-SNAPSHOT + 0.11.0 @@ -46,7 +46,7 @@ org.opengroup.osdu search-core - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu diff --git a/provider/search-gcp/pom.xml b/provider/search-gcp/pom.xml index f8be2845..b5716347 100644 --- a/provider/search-gcp/pom.xml +++ b/provider/search-gcp/pom.xml @@ -18,14 +18,14 @@ 4.0.0 org.opengroup.osdu search-gcp - 0.11.0-SNAPSHOT + 0.11.0 Google cloud implementation of Search service APIs jar org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml @@ -37,7 +37,7 @@ UTF-8 false ${project.parent.basedir} - 0.11.0-SNAPSHOT + 0.11.0 @@ -45,7 +45,7 @@ org.opengroup.osdu search-core - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu diff --git a/provider/search-ibm/pom.xml b/provider/search-ibm/pom.xml index 90df0154..b8ffa057 100644 --- a/provider/search-ibm/pom.xml +++ b/provider/search-ibm/pom.xml @@ -13,7 +13,7 @@ org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml @@ -25,7 +25,7 @@ 0.10.0 org.opengroup.osdu.search.provider.ibm.app.SearchIBMApplication - 0.11.0-SNAPSHOT + 0.11.0 @@ -36,7 +36,7 @@ org.opengroup.osdu search-core - 0.11.0-SNAPSHOT + 0.11.0 com.nimbusds diff --git a/provider/search-reference/pom.xml b/provider/search-reference/pom.xml index 052c5473..fa95d14f 100644 --- a/provider/search-reference/pom.xml +++ b/provider/search-reference/pom.xml @@ -4,13 +4,13 @@ org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../../pom.xml org.opengroup.osdu search-reference - 0.11.0-SNAPSHOT + 0.11.0 MongoDB implementation of Search service APIs jar @@ -22,14 +22,14 @@ UTF-8 false ${project.parent.basedir} - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu search-core - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu diff --git a/search-core/pom.xml b/search-core/pom.xml index 985715f6..76fb362f 100644 --- a/search-core/pom.xml +++ b/search-core/pom.xml @@ -18,14 +18,14 @@ 4.0.0 org.opengroup.osdu search-core - 0.11.0-SNAPSHOT + 0.11.0 Core project for the Search service jar org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml @@ -38,7 +38,7 @@ ${project.basedir} 9.1.2 7.8.1 - 0.11.0-SNAPSHOT + 0.11.0 diff --git a/testing/integration-tests/pom.xml b/testing/integration-tests/pom.xml index 896505fa..cb87aa69 100644 --- a/testing/integration-tests/pom.xml +++ b/testing/integration-tests/pom.xml @@ -18,7 +18,7 @@ 4.0.0 org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 Search Service Integration Test Root Project pom diff --git a/testing/integration-tests/search-test-aws/pom.xml b/testing/integration-tests/search-test-aws/pom.xml index 434a6393..94148c0c 100644 --- a/testing/integration-tests/search-test-aws/pom.xml +++ b/testing/integration-tests/search-test-aws/pom.xml @@ -20,13 +20,13 @@ org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.search search-test-aws - 0.11.0-SNAPSHOT + 0.11.0 1.8 @@ -40,7 +40,7 @@ org.opengroup.osdu.search search-test-core - 0.11.0-SNAPSHOT + 0.11.0 org.opengroup.osdu.core.aws diff --git a/testing/integration-tests/search-test-azure/pom.xml b/testing/integration-tests/search-test-azure/pom.xml index 1824058b..58bd33b1 100644 --- a/testing/integration-tests/search-test-azure/pom.xml +++ b/testing/integration-tests/search-test-azure/pom.xml @@ -21,13 +21,13 @@ org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.search search-test-azure - 0.11.0-SNAPSHOT + 0.11.0 1.8 @@ -40,7 +40,7 @@ org.opengroup.osdu.search search-test-core - 0.11.0-SNAPSHOT + 0.11.0 diff --git a/testing/integration-tests/search-test-core/pom.xml b/testing/integration-tests/search-test-core/pom.xml index 4b80cc36..2041ab16 100644 --- a/testing/integration-tests/search-test-core/pom.xml +++ b/testing/integration-tests/search-test-core/pom.xml @@ -5,13 +5,13 @@ org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.search search-test-core - 0.11.0-SNAPSHOT + 0.11.0 jar @@ -19,7 +19,7 @@ 1.8 1.2.5 7.8.1 - 0.11.0-SNAPSHOT + 0.11.0 diff --git a/testing/integration-tests/search-test-gcp/pom.xml b/testing/integration-tests/search-test-gcp/pom.xml index 51ee39f4..bc2f756f 100644 --- a/testing/integration-tests/search-test-gcp/pom.xml +++ b/testing/integration-tests/search-test-gcp/pom.xml @@ -5,13 +5,13 @@ org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.search search-test-gcp - 0.11.0-SNAPSHOT + 0.11.0 1.8 @@ -36,7 +36,7 @@ org.opengroup.osdu.search search-test-core - 0.11.0-SNAPSHOT + 0.11.0 diff --git a/testing/integration-tests/search-test-ibm/pom.xml b/testing/integration-tests/search-test-ibm/pom.xml index 27e3b374..73b5fdfe 100644 --- a/testing/integration-tests/search-test-ibm/pom.xml +++ b/testing/integration-tests/search-test-ibm/pom.xml @@ -5,13 +5,13 @@ org.opengroup.osdu os-search - 0.11.0-SNAPSHOT + 0.11.0 ../pom.xml org.opengroup.osdu.search search-test-ibm - 0.11.0-SNAPSHOT + 0.11.0 1.8 @@ -25,7 +25,7 @@ org.opengroup.osdu.search search-test-core - 0.11.0-SNAPSHOT + 0.11.0 -- GitLab From d5ee29fda03c865d2d4615e964fec95c0c39b9e3 Mon Sep 17 00:00:00 2001 From: Vineeth Guna Date: Mon, 11 Oct 2021 16:07:02 +0530 Subject: [PATCH 04/12] Updated core lib azure version for disabling app insights logging --- provider/search-azure/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index f40335d5..8c74ed76 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -36,7 +36,7 @@ false ${project.parent.basedir} 2.1.7.RELEASE - 0.10.1 + 0.12.0-rc9 0.11.0 0.11.0 0.7 -- GitLab From e010b3382e89c3f3dc58758fdda1fd61cb44d9a2 Mon Sep 17 00:00:00 2001 From: Vibhuti Sharma Date: Mon, 25 Oct 2021 18:34:24 +0530 Subject: [PATCH 05/12] initial commit --- provider/search-azure/pom.xml | 7 +++++++ .../search-azure/src/main/resources/application.properties | 1 + 2 files changed, 8 insertions(+) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index 8c74ed76..ec641bc6 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -176,6 +176,13 @@ true + + io.micrometer + micrometer-registry-prometheus + runtime + 1.1.19 + + io.projectreactor.netty reactor-netty diff --git a/provider/search-azure/src/main/resources/application.properties b/provider/search-azure/src/main/resources/application.properties index 1cc247a2..0b953a5f 100644 --- a/provider/search-azure/src/main/resources/application.properties +++ b/provider/search-azure/src/main/resources/application.properties @@ -78,6 +78,7 @@ redis.database=${REDIS_DATABASE} management.health.redis.enabled=false management.health.elasticsearch.enabled=false management.health.azure-key-vault.enabled=false +management.endpoints.web.exposure.include=health,info,prometheus # Policy service properties service.policy.enabled=true -- GitLab From 9b82b8339edd4f8ad41e861ef5d9e7f382a25628 Mon Sep 17 00:00:00 2001 From: Vibhuti Sharma Date: Mon, 25 Oct 2021 22:17:14 +0530 Subject: [PATCH 06/12] Updating management port --- provider/search-azure/src/main/resources/application.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/provider/search-azure/src/main/resources/application.properties b/provider/search-azure/src/main/resources/application.properties index 0b953a5f..20149d3b 100644 --- a/provider/search-azure/src/main/resources/application.properties +++ b/provider/search-azure/src/main/resources/application.properties @@ -75,6 +75,7 @@ redis.ssl.enabled=true redis.database=${REDIS_DATABASE} # Health checks +management.server.port=8081 management.health.redis.enabled=false management.health.elasticsearch.enabled=false management.health.azure-key-vault.enabled=false -- GitLab From df734ca577574fbadd906b512418574dc37063f3 Mon Sep 17 00:00:00 2001 From: Vibhuti Sharma Date: Tue, 26 Oct 2021 15:10:10 +0530 Subject: [PATCH 07/12] removing version --- provider/search-azure/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index ec641bc6..a7e1315a 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -180,7 +180,6 @@ io.micrometer micrometer-registry-prometheus runtime - 1.1.19 -- GitLab From 4d2b8ab9a34f67a1f9b0e548ce9f1e13b035b8fe Mon Sep 17 00:00:00 2001 From: aalekhj Date: Tue, 26 Oct 2021 19:00:08 +0530 Subject: [PATCH 08/12] Added health checks and updated resource limits --- devops/azure/chart/templates/deployment.yaml | 15 ++++++++------- .../src/main/resources/application.properties | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/devops/azure/chart/templates/deployment.yaml b/devops/azure/chart/templates/deployment.yaml index 43bc3f13..78cac9f6 100644 --- a/devops/azure/chart/templates/deployment.yaml +++ b/devops/azure/chart/templates/deployment.yaml @@ -45,15 +45,16 @@ spec: imagePullPolicy: Always ports: - containerPort: 80 - resources: - requests: - cpu: "100m" - limits: - cpu: "300m" readinessProbe: httpGet: - path: /api/search/v2/actuator/health - port: 80 + path: /actuator/health + port: 8081 + livenessProbe: + httpGet: + path: /actuator/health + port: 8081 + initialDelaySeconds: 250 + periodSeconds: 10 volumeMounts: - name: azure-keyvault mountPath: "/mnt/azure-keyvault" diff --git a/provider/search-azure/src/main/resources/application.properties b/provider/search-azure/src/main/resources/application.properties index 1cc247a2..6216693d 100644 --- a/provider/search-azure/src/main/resources/application.properties +++ b/provider/search-azure/src/main/resources/application.properties @@ -75,6 +75,7 @@ redis.ssl.enabled=true redis.database=${REDIS_DATABASE} # Health checks +management.server.port=8081 management.health.redis.enabled=false management.health.elasticsearch.enabled=false management.health.azure-key-vault.enabled=false -- GitLab From 60ee5c6993e3ab3e623081e52344a22148f64015 Mon Sep 17 00:00:00 2001 From: nikhilsingh Date: Mon, 8 Nov 2021 16:04:18 +0530 Subject: [PATCH 09/12] upgrade core lib and common --- provider/search-azure/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/provider/search-azure/pom.xml b/provider/search-azure/pom.xml index a7e1315a..da9235ef 100644 --- a/provider/search-azure/pom.xml +++ b/provider/search-azure/pom.xml @@ -36,8 +36,8 @@ false ${project.parent.basedir} 2.1.7.RELEASE - 0.12.0-rc9 - 0.11.0 + 0.12.0-rc10 + 0.12.0-rc3 0.11.0 0.7 1.15.0 -- GitLab From 829abcd8ba36f6d05aca14db0b33ffa5b02c92ad Mon Sep 17 00:00:00 2001 From: Ronak Sakhuja Date: Sat, 11 Dec 2021 02:53:11 +0000 Subject: [PATCH 10/12] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 743ac368..6ecd17fc 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 4.5.13 5.3.0 2020.0.0 - 2.13.2 + 2.15.0 1.31.0 1.20 0.11.0 -- GitLab From 4890486c827b85a037f4c535cb944f46017405f8 Mon Sep 17 00:00:00 2001 From: Ronak Sakhuja Date: Sat, 11 Dec 2021 05:26:55 +0000 Subject: [PATCH 11/12] Update pom.xml --- testing/integration-tests/search-test-azure/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/integration-tests/search-test-azure/pom.xml b/testing/integration-tests/search-test-azure/pom.xml index 58bd33b1..bee798a7 100644 --- a/testing/integration-tests/search-test-azure/pom.xml +++ b/testing/integration-tests/search-test-azure/pom.xml @@ -130,7 +130,7 @@ org.apache.logging.log4j log4j-core - 2.13.3 + 2.15.0 @@ -163,4 +163,4 @@ 27.1-jre - \ No newline at end of file + -- GitLab From 7772903707b55e6e2f2f6dcdf5ac884dbe355b8f Mon Sep 17 00:00:00 2001 From: Smitha Manjunath Date: Sat, 11 Dec 2021 10:40:48 +0000 Subject: [PATCH 12/12] Update pom.xml --- testing/integration-tests/search-test-core/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/integration-tests/search-test-core/pom.xml b/testing/integration-tests/search-test-core/pom.xml index 2041ab16..9bd8a7fa 100644 --- a/testing/integration-tests/search-test-core/pom.xml +++ b/testing/integration-tests/search-test-core/pom.xml @@ -116,7 +116,7 @@ org.apache.logging.log4j log4j-to-slf4j - 2.11.2 + 2.15.0 org.slf4j -- GitLab