Skip to content
GitLab
Commit 37646918 authored by David Diederich's avatar David Diederich
Browse files

Merge branch 'update-dependencies' into 'master' 

Updating OSDU dependencies

See merge request !91
parents c057eb17 1cbf108f
Pipeline #61945 failed with stages
in 54 minutes and 22 seconds
Hide whitespace changes
Inline Side-by-side
.fossa.yml
View file @ 37646918
......@@ -28,3 +28,7 @@ analyze:
type: pip
target: deployments/scripts/azure
path: deployments/scripts/azure
- name: gcp
type: pip
target: deployments/scripts/gcp
path: deployments/scripts/gcp
NOTICE
View file @ 37646918
......@@ -128,8 +128,8 @@ The following software have components provided under the terms of this license:
- 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-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 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)
......@@ -239,6 +239,8 @@ The following software have components provided under the terms of this license:
- elasticsearch-geo (from https://github.com/elastic/elasticsearch)
- 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)
- google-cloud-datastore (from https://github.com/GoogleCloudPlatform/google-cloud-python)
- google-cloud-storage (from https://github.com/GoogleCloudPlatform/google-cloud-python)
- grpc-google-cloud-pubsub-v1 (from https://repo1.maven.org/maven2/com/google/api/grpc/grpc-google-cloud-pubsub-v1)
- io.grpc:grpc-alts (from https://github.com/grpc/grpc-java)
- io.grpc:grpc-api (from https://github.com/grpc/grpc-java)
......@@ -287,10 +289,10 @@ The following software have components provided under the terms of this license:
- 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://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)
......@@ -707,6 +709,13 @@ The following software have components provided under the terms of this license:
- Spongy Castle (from http://rtyley.github.io/spongycastle/)
========================================================================
Python-2.0
========================================================================
The following software have components provided under the terms of this license:
- google-cloud-datastore (from https://github.com/GoogleCloudPlatform/google-cloud-python)
========================================================================
SPL-1.0
========================================================================
......
pom.xml
View file @ 37646918
......@@ -8,7 +8,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<springfox-version>2.7.0</springfox-version>
<osdu.oscorecommon-version>0.10.0</osdu.oscorecommon-version>
<osdu.oscorecommon-version>0.11.0</osdu.oscorecommon-version>
</properties>
<licenses>
......
provider/wks-azure/pom.xml
View file @ 37646918
......@@ -12,7 +12,7 @@
<description>WKS service on Azure</description>
<packaging>jar</packaging>
<properties>
<osdu.corelibazure.version>0.11.0-rc5</osdu.corelibazure.version>
<osdu.corelibazure.version>0.11.0</osdu.corelibazure.version>
<azure.applicationinsights.version>2.6.1</azure.applicationinsights.version>
<osdu.os-wks-core.version>0.11.0-SNAPSHOT</osdu.os-wks-core.version>
<azure.version>2.1.7</azure.version>
......
provider/wks-gcp/pom.xml
View file @ 37646918
......@@ -24,12 +24,12 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.10.0</version>
<version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId>
<version>0.10.0</version>
<version>0.11.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
......
testing/wks-test-core/pom.xml
View file @ 37646918
......@@ -24,7 +24,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>0.10.1</version>
<version>0.11.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
......@@ -81,7 +81,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>os-core-common</artifactId>
<version>0.10.0</version>
<version>0.11.0</version>
</dependency>
<dependency>
<groupId>com.github.berkesa</groupId>
......@@ -125,7 +125,7 @@
<dependency>
<groupId>org.opengroup.osdu.de</groupId>
<artifactId>os-automation-test-common-lib</artifactId>
<version>0.10.0</version>
<version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
......@@ -141,7 +141,7 @@
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>0.10.1</version>
<version>0.11.0</version>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......
Supports Markdown
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