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

Merge branch 'master' into 'integration-master'

Sync updates from master

See merge request go3-nrg/platform/System/Register!34
parents b908c06d 50746d9e
...@@ -85,6 +85,9 @@ The following software have components provided under the terms of this license: ...@@ -85,6 +85,9 @@ The following software have components provided under the terms of this license:
- Joda-Time (from http://www.joda.org/joda-time/) - Joda-Time (from http://www.joda.org/joda-time/)
- Joda-Time (from http://www.joda.org/joda-time/) - Joda-Time (from http://www.joda.org/joda-time/)
- Json Path (from https://github.com/jayway/JsonPath) - Json Path (from https://github.com/jayway/JsonPath)
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
- Lucene Common Analyzers (from ) - Lucene Common Analyzers (from )
- Lucene Core (from ) - Lucene Core (from )
- Lucene Grouping (from ) - Lucene Grouping (from )
...@@ -101,15 +104,18 @@ The following software have components provided under the terms of this license: ...@@ -101,15 +104,18 @@ The following software have components provided under the terms of this license:
- Lucene Spatial Extras (from ) - Lucene Spatial Extras (from )
- Lucene Suggest (from ) - Lucene Suggest (from )
- MapStruct Core (from ) - MapStruct Core (from )
- Mockito (from http://mockito.org)
- Mockito (from http://www.mockito.org) - Mockito (from http://www.mockito.org)
- Mockito (from http://mockito.org)
- Netty/Buffer (from http://netty.io/) - Netty/Buffer (from http://netty.io/)
- Netty/Codec (from ) - Netty/Codec (from )
- Netty/Common (from ) - Netty/Common (from )
- Netty/Handler (from ) - Netty/Handler (from )
- Netty/Resolver (from ) - Netty/Resolver (from )
- Netty/Transport (from http://netty.io/) - Netty/Transport (from http://netty.io/)
- Nimbus Content Type (from https://bitbucket.org/connect2id/nimbus-content-type)
- Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt) - Nimbus JOSE+JWT (from https://bitbucket.org/connect2id/nimbus-jose-jwt)
- Nimbus LangTag (from https://bitbucket.org/connect2id/nimbus-language-tags)
- 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)
- 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) - OpenCensus (from https://github.com/census-instrumentation/opencensus-java)
...@@ -168,8 +174,8 @@ The following software have components provided under the terms of this license: ...@@ -168,8 +174,8 @@ The following software have components provided under the terms of this license:
- jackson-databind (from http://github.com/FasterXML/jackson) - jackson-databind (from http://github.com/FasterXML/jackson)
- jakarta.inject (from ) - jakarta.inject (from )
- javaparser-core (from ) - javaparser-core (from )
- javax.inject (from http://code.google.com/p/atinject/)
- javax.inject (from ) - javax.inject (from )
- javax.inject (from http://code.google.com/p/atinject/)
- javax.ws.rs-api (from http://jax-rs-spec.java.net) - javax.ws.rs-api (from http://jax-rs-spec.java.net)
- jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet) - jersey-container-servlet (from git://java.net/jersey~code/project/jersey-container-servlet)
- jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core) - jersey-container-servlet-core (from git://java.net/jersey~code/project/jersey-container-servlet-core)
...@@ -345,6 +351,9 @@ The following software have components provided under the terms of this license: ...@@ -345,6 +351,9 @@ The following software have components provided under the terms of this license:
- Eclipse Xtend Active Annotations Library (from https://www.eclipse.org/Xtext/) - Eclipse Xtend Active Annotations Library (from https://www.eclipse.org/Xtext/)
- Eclipse Xtend Runtime Library (from https://www.eclipse.org/Xtext/) - Eclipse Xtend Runtime Library (from https://www.eclipse.org/Xtext/)
- Logback Classic Module (from ) - Logback Classic Module (from )
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
- Logback Core Module (from ) - Logback Core Module (from )
- SnakeYAML (from http://www.snakeyaml.org) - SnakeYAML (from http://www.snakeyaml.org)
- jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca) - jakarta.annotation-api (from https://projects.eclipse.org/projects/ee4j.ca)
...@@ -465,6 +474,9 @@ The following software have components provided under the terms of this license: ...@@ -465,6 +474,9 @@ The following software have components provided under the terms of this license:
- Elastic JNA Distribution (from https://github.com/java-native-access/jna) - Elastic JNA Distribution (from https://github.com/java-native-access/jna)
- Javassist (from http://www.javassist.org/) - Javassist (from http://www.javassist.org/)
- Logback Classic Module (from ) - Logback Classic Module (from )
- Logback Contrib :: JSON :: Classic (from )
- Logback Contrib :: JSON :: Core (from )
- Logback Contrib :: Jackson (from )
- Logback Core Module (from ) - Logback Core Module (from )
======================================================================== ========================================================================
...@@ -569,4 +581,6 @@ The following software have components provided under the terms of this license: ...@@ -569,4 +581,6 @@ The following software have components provided under the terms of this license:
- jersey-ext-entity-filtering (from ) - jersey-ext-entity-filtering (from )
- jersey-inject-hk2 (from ) - jersey-inject-hk2 (from )
- jersey-media-jaxb (from ) - jersey-media-jaxb (from )
- jersey-spring4 (from ) - jersey-spring4 (from )
\ No newline at end of file
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<dependency> <dependency>
<groupId>org.opengroup.osdu</groupId> <groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-gcp</artifactId> <artifactId>core-lib-gcp</artifactId>
<version>0.6.0-SNAPSHOT</version> <version>0.6.1-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
......
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