Commit cbe833b2 authored by Riabokon Stanislav(EPAM)[GCP]'s avatar Riabokon Stanislav(EPAM)[GCP]
Browse files

Merge branch 'gcp-fix-properties-and-update-libs' into 'master'

Fix properties & update libs(GCP)

See merge request !107
parents 8d45a8a2 14e57b2e
Pipeline #74253 failed with stages
in 51 minutes and 31 seconds
......@@ -127,8 +127,8 @@ 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-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-backward-codecs)
- Lucene Miscellaneous (from https://repo1.maven.org/maven2/org/apache/lucene/lucene-misc)
......@@ -189,8 +189,10 @@ The following software have components provided under the terms of this license:
- Reactive Streams Netty driver (from https://github.com/reactor/reactor-netty)
- Retrofit (from https://repo1.maven.org/maven2/com/squareup/retrofit2/retrofit)
- SnakeYAML (from http://www.snakeyaml.org)
- Spring Beans (from https://github.com/SpringSource/spring-framework)
- Spring Beans (from https://github.com/SpringSource/spring-framework)
- Spring AOP (from https://github.com/spring-projects/spring-framework)
- 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 (from http://projects.spring.io/spring-boot/)
- Spring Boot (from http://projects.spring.io/spring-boot/)
- Spring Boot AutoConfigure (from http://projects.spring.io/spring-boot/)
......@@ -213,15 +215,22 @@ The following software have components provided under the terms of this license:
- Spring Boot Web Starter (from https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-starters/spring-boot-starter-web)
- 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 Core (from https://github.com/SpringSource/spring-framework)
- Spring Core (from https://github.com/SpringSource/spring-framework)
- Spring Context (from https://github.com/spring-projects/spring-framework)
- Spring Context (from https://github.com/spring-projects/spring-framework)
- Spring Core (from https://github.com/spring-projects/spring-framework)
- Spring Core (from https://github.com/spring-projects/spring-framework)
- Spring Data Core (from https://repo1.maven.org/maven2/org/springframework/data/spring-data-commons)
- Spring Framework: Web (from http://www.springframework.org)
- Spring Framework: Web (from http://www.springframework.org)
- Spring Framework: WebMVC (from http://www.springframework.org)
- Spring Framework: WebMVC (from http://www.springframework.org)
- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework)
- Spring Expression Language (SpEL) (from https://github.com/spring-projects/spring-framework)
- Spring Retry (from https://www.springsource.org)
- Spring Retry (from https://www.springsource.org)
- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework)
- Spring TestContext Framework (from https://github.com/spring-projects/spring-framework)
- Spring Transaction (from https://github.com/spring-projects/spring-framework)
- Spring Web (from https://github.com/spring-projects/spring-framework)
- Spring Web (from https://github.com/spring-projects/spring-framework)
- Spring Web MVC (from https://github.com/spring-projects/spring-framework)
- Spring Web MVC (from https://github.com/spring-projects/spring-framework)
- T-Digest (from https://github.com/tdunning/t-digest)
- TypeTools (from http://github.com/jhalterman/typetools/)
- Vavr (from http://vavr.io)
......@@ -297,10 +306,10 @@ The following software have components provided under the terms of this license:
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://resilience4j.readme.io)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- resilience4j (from https://github.com/resilience4j/resilience4j)
- 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)
......@@ -308,8 +317,6 @@ The following software have components provided under the terms of this license:
- rxjava (from https://github.com/ReactiveX/RxJava)
- server (from https://github.com/elastic/elasticsearch)
- server (from https://github.com/elastic/elasticsearch)
- spring-aop (from https://repo1.maven.org/maven2/org/springframework/spring-aop)
- spring-aop (from https://repo1.maven.org/maven2/org/springframework/spring-aop)
- spring-boot-actuator (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)
......@@ -323,19 +330,12 @@ The following software have components provided under the terms of this license:
- spring-boot-starter-security (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-context (from https://repo1.maven.org/maven2/org/springframework/spring-context)
- spring-context (from https://repo1.maven.org/maven2/org/springframework/spring-context)
- spring-expression (from https://repo1.maven.org/maven2/org/springframework/spring-expression)
- spring-expression (from https://repo1.maven.org/maven2/org/springframework/spring-expression)
- spring-security-config (from https://spring.io/projects/spring-security)
- spring-security-config (from https://spring.io/projects/spring-security)
- spring-security-core (from https://spring.io/projects/spring-security)
- spring-security-core (from https://spring.io/projects/spring-security)
- spring-security-web (from https://spring.io/projects/spring-security)
- spring-security-web (from https://spring.io/projects/spring-security)
- spring-test (from https://repo1.maven.org/maven2/org/springframework/spring-test)
- spring-test (from https://repo1.maven.org/maven2/org/springframework/spring-test)
- spring-tx (from https://repo1.maven.org/maven2/org/springframework/spring-tx)
- swagger-annotations (from https://repo1.maven.org/maven2/io/swagger/swagger-annotations)
- swagger-jaxrs (from https://repo1.maven.org/maven2/io/swagger/swagger-jaxrs)
- tomcat-embed-core (from http://tomcat.apache.org/)
......@@ -395,8 +395,8 @@ The following software have components provided under the terms of this license:
- Protocol Buffers [Util] (from https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util)
- Reflections (from http://github.com/ronmamo/reflections)
- SnakeYAML (from http://www.snakeyaml.org)
- Spring Core (from https://github.com/SpringSource/spring-framework)
- Spring Core (from https://github.com/SpringSource/spring-framework)
- Spring Core (from https://github.com/spring-projects/spring-framework)
- 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/)
......@@ -600,7 +600,7 @@ The following software have components provided under the terms of this license:
- Cucumber-JVM: JUnit (from https://repo1.maven.org/maven2/io/cucumber/cucumber-junit)
- Cucumber-JVM: Java 8 (from https://repo1.maven.org/maven2/io/cucumber/cucumber-java8)
- Cucumber-JVM: Plugin (from https://repo1.maven.org/maven2/io/cucumber/cucumber-plugin)
- DataTable (from https://repo1.maven.org/maven2/io/cucumber/datatable)
- Cucumber-JVN: DataTable (from https://repo1.maven.org/maven2/io/cucumber/datatable)
- JCodings (from https://repo1.maven.org/maven2/org/jruby/jcodings/jcodings)
- JOpt Simple (from http://pholser.github.com/jopt-simple)
- JUL to SLF4J bridge (from http://www.slf4j.org)
......@@ -731,8 +731,8 @@ 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 http://projectlombok.org)
- Project Lombok (from http://projectlombok.org)
- Spring Framework: Web (from http://www.springframework.org)
- Spring Framework: Web (from http://www.springframework.org)
- Spring Web (from https://github.com/spring-projects/spring-framework)
- Spring Web (from https://github.com/spring-projects/spring-framework)
- azure-documentdb (from http://azure.microsoft.com/en-us/services/documentdb/)
- msal4j (from https://github.com/AzureAD/microsoft-authentication-library-for-java)
- reactive-streams (from http://www.reactive-streams.org/)
......
......@@ -23,12 +23,12 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.11.0</version>
<version>0.12.0-rc3</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
<version>0.12.0-SNAPSHOT</version>
<version>0.12.0-rc3</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
......
......@@ -37,6 +37,7 @@ PARTITION_API=${PARTITION_HOST}${PARTITION_PATH}
wks.gcp.datastore-mapping-info-kind=${WKS_GCP_DATASTORE_MAPPING_INFO_KIND}
wks.gcp.tenant-name=${WKS_GCP_TENANT_NAME}
wks.gcp.storage-bucket-name=${WKS_GCP_STORAGE_BUCKET_NAME}
wks.gcp.entitlements-url=${WKS_GCP_ENTITLEMENTS_URL}
osdu.host.search-service-url=${SEARCH_API}
osdu.host.storage-service-url=${STORAGE_API}
osdu.host.schema-service-url=${SCHEMA_API}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment