Skip to content
Snippets Groups Projects
Commit b9fbc8fc authored by Deepa Kumari's avatar Deepa Kumari
Browse files

Merge branch 'az/dk-upgrade-dependencies' into 'master'

Dependency upgrade

See merge request !323
parents 7a383c97 def3048e
No related branches found
No related tags found
1 merge request!323Dependency upgrade
Pipeline #173850 passed
......@@ -88,7 +88,7 @@ The following software have components provided under the terms of this license:
- Byte Buddy Java agent (from https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent)
- ClassMate (from http://github.com/cowtowncoder/java-classmate)
- Cloud Key Management Service (KMS) API (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-cloudkms)
- Cloud Storage JSON API (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Cloud Storage JSON API v1-rev20230301-2.0.0 (from https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage)
- Collections (from https://repo1.maven.org/maven2/commons-collections/commons-collections)
- Commons Digester (from http://commons.apache.org/digester/)
- Converter: Jackson (from https://github.com/square/retrofit, https://repo1.maven.org/maven2/com/squareup/retrofit2/converter-jackson)
......@@ -115,7 +115,6 @@ The following software have components provided under the terms of this license:
- HTTP functionality for the Reactor Netty library (from https://github.com/reactor/reactor-netty)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Hibernate Validator (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
- Hibernate Validator Engine - Relocation Artifact (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator)
- HikariCP (from https://github.com/brettwooldridge/HikariCP)
- Hop (from https://github.com/rabbitmq/hop, https://www.rabbitmq.com)
- IBM COS Java SDK for Amazon S3 (from https://github.com/ibm/ibm-cos-sdk-java)
......@@ -453,7 +452,6 @@ The following software have components provided under the terms of this license:
- Guava: Google Core Libraries for Java (from http://code.google.com/p/guava-libraries, https://github.com/google/guava, https://repo1.maven.org/maven2/com/google/guava/guava)
- HdrHistogram (from http://hdrhistogram.github.io/HdrHistogram/)
- Hibernate Validator (from https://repo1.maven.org/maven2/org/hibernate/hibernate-validator, https://repo1.maven.org/maven2/org/hibernate/validator/hibernate-validator)
- LatencyUtils (from http://latencyutils.github.io/LatencyUtils/)
- MongoDB Java Driver (from http://mongodb.org/, http://www.mongodb.org, https://www.mongodb.com/)
- Netty/Common (from https://repo1.maven.org/maven2/io/netty/netty-common)
......@@ -843,6 +841,13 @@ The following software have components provided under the terms of this license:
- Netty/Codec (from https://repo1.maven.org/maven2/io/netty/netty-codec)
========================================================================
mit-old-style-no-advert
========================================================================
The following software have components provided under the terms of this license:
- Brave (from https://repo1.maven.org/maven2/io/zipkin/brave/brave)
========================================================================
public-domain
========================================================================
......
......@@ -29,28 +29,18 @@
<packaging>jar</packaging>
<version>0.20.0-SNAPSHOT</version>
<properties>
<osdu.corelibazure.version>0.18.0</osdu.corelibazure.version>
<osdu.corelibazure.version>0.20.0-rc5</osdu.corelibazure.version>
<osdu.oscorecommon.version>0.19.0-rc8</osdu.oscorecommon.version>
<junit-jupiter.version>5.6.0</junit-jupiter.version>
<mockito-junit-jupiter.version>2.23.0</mockito-junit-jupiter.version>
<oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version>
<woodstox-core.version>6.4.0</woodstox-core.version>
<hibernate-validator.version>5.3.6.Final</hibernate-validator.version>
<jackson-databind.version>2.13.4.1</jackson-databind.version>
<jackson.version>2.13.2</jackson.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
</properties>
<dependencyManagement>
<dependencies>
<!-- Inherit managed dependencies from core-lib-azure -->
<dependency>
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>${osdu.corelibazure.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
......@@ -59,7 +49,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
......@@ -70,6 +59,13 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>${osdu.corelibazure.version}</version>
<exclusions>
<exclusion>
<!--excluded as it introduces a crash at the startup-->
<artifactId>byte-buddy</artifactId>
<groupId>net.bytebuddy</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.opengroup.osdu</groupId>
......@@ -107,12 +103,10 @@
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
<version>3.14.0</version>
</dependency>
<!-- Spring Dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${spring-webmvc.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -131,7 +125,6 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-client</artifactId>
<version>5.7.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -166,6 +159,13 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<!--excluded as it introduces a crash at the startup-->
<artifactId>byte-buddy</artifactId>
<groupId>net.bytebuddy</groupId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
......@@ -185,7 +185,11 @@
<artifactId>micrometer-registry-prometheus</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.2</version>
</dependency>
<!-- Jackson Dependencies -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment