From 6f3d0faac1b6fe7627f2de900a7cbf48feeb2de9 Mon Sep 17 00:00:00 2001
From: VidyaDharani Lokam <vidyadharani_lokam@epam.com>
Date: Fri, 5 Jan 2024 11:58:45 +0000
Subject: [PATCH] [MSCOSDU-1894] upgrade json-smart and reactor-netty
---
NOTICE | 8 ++++----
pom.xml | 2 +-
provider/notification-azure/pom.xml | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/NOTICE b/NOTICE
index 350e57837..dbc8ac6c3 100644
--- a/NOTICE
+++ b/NOTICE
@@ -68,7 +68,7 @@ The following software have components provided under the terms of this license:
- Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul)
- Apache Log4j SLF4J Binding (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-slf4j-impl)
- Apache Log4j to SLF4J Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-to-slf4j)
-- AssertJ Core (from ${project.organization.url}#${project.artifactId})
+- AssertJ Core (from https://assertj.github.io/doc/#assertj-core)
- Asynchronous Http Client (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client)
- Asynchronous Http Client Netty Utils (from https://repo1.maven.org/maven2/org/asynchttpclient/async-http-client-netty-utils)
- AutoValue Annotations (from https://github.com/google/auto/tree/main/value, https://github.com/google/auto/tree/master/value, https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations)
@@ -142,7 +142,7 @@ The following software have components provided under the terms of this license:
- Java Native Access Platform (from https://github.com/java-native-access/jna)
- Java Servlet 4.0 API
- JavaBeans Activation Framework (from <http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp>, http://java.sun.com/javase/technologies/desktop/javabeans/jaf/index.jsp, https://repo1.maven.org/maven2/com/sun/activation/javax.activation)
-- Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
- JetBrains Java Annotations (from https://github.com/JetBrains/java-annotations)
- Joda-Time (from http://joda-time.sourceforge.net, http://www.joda.org/joda-time/, https://www.joda.org/joda-time/)
- KeePassJava2 :: All (from https://repo1.maven.org/maven2/org/linguafranca/pwdb/KeePassJava2)
@@ -583,7 +583,7 @@ The following software have components provided under the terms of this license:
- JBoss Threads (from <https://repo1.maven.org/maven2/org/jboss/threads/jboss-threads>, https://repo1.maven.org/maven2/org/jboss/threads/jboss-threads)
- Java Native Access (from https://github.com/java-native-access/jna, https://github.com/twall/jna)
- Java Native Access Platform (from https://github.com/java-native-access/jna)
-- Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
========================================================================
MIT
@@ -650,7 +650,7 @@ MPL-1.1
========================================================================
The following software have components provided under the terms of this license:
-- Javassist (from http://www.javassist.org/)
+- Javassist (from http://www.javassist.org/, https://www.javassist.org/)
========================================================================
MPL-2.0
diff --git a/pom.xml b/pom.xml
index 18232e525..ada486812 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<os-core-common.version>0.25.0-rc2</os-core-common.version>
<log4j2.version>2.17.1</log4j2.version>
- <json-smart.version>2.4.7</json-smart.version>
+ <json-smart.version>2.5.0</json-smart.version>
<openapi.version>1.6.14</openapi.version>
</properties>
diff --git a/provider/notification-azure/pom.xml b/provider/notification-azure/pom.xml
index 7bee328c4..970ab2f27 100644
--- a/provider/notification-azure/pom.xml
+++ b/provider/notification-azure/pom.xml
@@ -38,13 +38,13 @@
<springframework.version>4.3.0.RELEASE</springframework.version>
<reactor.netty.version>0.11.0.RELEASE</reactor.netty.version>
<reactor.core.version>3.3.0.RELEASE</reactor.core.version>
- <osdu.corelibazure.version>0.25.0-rc2</osdu.corelibazure.version>
+ <osdu.corelibazure.version>0.25.0</osdu.corelibazure.version>
<junit.version>5.6.0</junit.version>
<jjwt.version>3.8.1</jjwt.version>
<mockito.version>2.23.0</mockito.version>
<spring-boot.version>2.7.7</spring-boot.version>
<reactor-core.version>3.4.6</reactor-core.version>
- <reactor-netty.version>1.1.13</reactor-netty.version>
+ <reactor-netty.version>1.1.14</reactor-netty.version>
<oauth2-oidc-sdk.version>6.0</oauth2-oidc-sdk.version>
<woodstox-core.version>5.4.0</woodstox-core.version>
<spring-webmvc.version>5.3.22</spring-webmvc.version>
--
GitLab