Skip to content
Snippets Groups Projects
Commit 69782ed1 authored by Chad Leong's avatar Chad Leong :speech_balloon:
Browse files

Merge branch 'az/td-fixv-json' into 'master'

[MSCOSDU-1865] fix: Upgrade json,netty-http, reactor-netty-http

See merge request !498
parents 25034016 668130e0
No related branches found
No related tags found
1 merge request!498[MSCOSDU-1865] fix: Upgrade json,netty-http, reactor-netty-http
Pipeline #231719 failed
......@@ -30,7 +30,8 @@
<org.springframework.boot.version>2.4.5</org.springframework.boot.version>
<log4j.version>2.17.1</log4j.version>
<guava.version>32.1.2-jre</guava.version>
<netty-version>4.1.97.Final</netty-version>
<netty-version>4.1.101.Final</netty-version>
<snakeyaml.version>2.0</snakeyaml.version>
</properties>
<packaging>pom</packaging>
......@@ -80,6 +81,11 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
......
......@@ -14,9 +14,10 @@
<packaging>jar</packaging>
<properties>
<osdu.corelibazure.version>0.24.0</osdu.corelibazure.version>
<osdu.corelibazure.version>0.25.0-rc2</osdu.corelibazure.version>
<junit.version>4.13.2</junit.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
<reactor-netty-http.version>1.1.13</reactor-netty-http.version>
</properties>
<dependencyManagement>
......@@ -83,12 +84,6 @@
<groupId>org.opengroup.osdu</groupId>
<artifactId>core-lib-azure</artifactId>
<version>${osdu.corelibazure.version}</version>
<exclusions>
<exclusion>
<groupId>com.microsoft.azure</groupId>
<artifactId>documentdb-bulkexecutor</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
......@@ -117,6 +112,11 @@
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-oauth2-jose</artifactId>
</dependency>
<dependency>
<groupId>io.projectreactor.netty</groupId>
<artifactId>reactor-netty-http</artifactId>
<version>${reactor-netty-http.version}</version>
</dependency>
<!-- Azure dependencies -->
<!-- https://mvnrepository.com/artifact/com.azure/azure-storage-blob -->
......
......@@ -122,11 +122,6 @@
<artifactId>spring-security-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.33</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
......
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