diff --git a/NOTICE b/NOTICE index 8f8adc7db8d67675b9bba74c669e9170de0aa301..779d9d42c67d472ca8db91d53029a0ad437a9474 100644 --- a/NOTICE +++ b/NOTICE @@ -16,7 +16,6 @@ Apache-1.1 The following software have components provided under the terms of this license: - Apache Geronimo JMS Spec 2.0 (from http://geronimo.apache.org/maven/${siteId}/${version}) -- Apache Log4j JUL Adapter (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-jul) - AspectJ Weaver (from http://www.aspectj.org, https://www.eclipse.org/aspectj/) - Microsoft Application Insights Java Agent (from https://github.com/Microsoft/ApplicationInsights-Java) - Microsoft Application Insights Java SDK Spring Boot starter (from https://github.com/Microsoft/ApplicationInsights-Java) @@ -69,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) @@ -509,7 +508,6 @@ The following software have components provided under the terms of this license: - JUnit Jupiter API (from http://junit.org/junit5/, https://junit.org/junit5/) - JUnit Jupiter Engine (from http://junit.org/junit5/, https://junit.org/junit5/) - JUnit Jupiter Params (from http://junit.org/junit5/, https://junit.org/junit5/) -- JUnit Platform Commons (from http://junit.org/junit5/, https://junit.org/junit5/) - JUnit Platform Engine API (from http://junit.org/junit5/, https://junit.org/junit5/) - Jakarta Annotations API (from https://projects.eclipse.org/projects/ee4j.ca) - Jakarta Validation API (from https://beanvalidation.org) @@ -658,7 +656,6 @@ The following software have components provided under the terms of this license: - Animal Sniffer Annotations (from https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations) - Apache HttpClient Cache (from http://hc.apache.org/httpcomponents-client, http://hc.apache.org/httpcomponents-client-ga) - Apache Log4j API (from https://repo1.maven.org/maven2/org/apache/logging/log4j/log4j-api) -- 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) - Azure Java Client Authentication Library for AutoRest (from https://github.com/Azure/autorest-clientruntime-for-java) - Azure Java Client Runtime for ARM (from https://github.com/Azure/autorest-clientruntime-for-java) diff --git a/pom.xml b/pom.xml index 656f7727d244bbf3041755377a19649343257fad..9efc7675f53aed7e3394780604f85b89904785de 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <commons-codec.version>1.14</commons-codec.version> <nimbusds.version>7.9</nimbusds.version> <woodstox-core.version>6.5.1</woodstox-core.version> - <log4j2.version>2.17.1</log4j2.version> + <log4j2.version>2.22.0</log4j2.version> <openapi.version>1.6.14</openapi.version> <json-smart.version>2.5.0</json-smart.version> </properties> diff --git a/provider/storage-azure/pom.xml b/provider/storage-azure/pom.xml index 089e51682de3e7d98f5efddad8169239d5acce89..c8b8e262d280a7c7d6cea2d2d965cc12f2c72c72 100644 --- a/provider/storage-azure/pom.xml +++ b/provider/storage-azure/pom.xml @@ -36,7 +36,7 @@ <osdu.storage-core.version>0.26.0-SNAPSHOT</osdu.storage-core.version> <junit.version>4.12</junit.version> <mockito.version>1.10.19</mockito.version> - <nimbus-jose-jwt-azure.version>8.20.1</nimbus-jose-jwt-azure.version> + <nimbus-jose-jwt-azure.version>9.30.2</nimbus-jose-jwt-azure.version> <azure-storage-blob.version>12.10.2</azure-storage-blob.version> <azure-spring-data-cosmos.version>3.21.0</azure-spring-data-cosmos.version> <spring-webmvc.version>5.3.22</spring-webmvc.version> @@ -49,6 +49,9 @@ --add-opens java.base/java.text=ALL-UNNAMED --add-opens jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED </argLine> + <reactor-netty.version>1.1.14</reactor-netty.version> + <okhttp.version>4.12.0</okhttp.version> + <okio.version>3.7.0</okio.version> </properties> <dependencyManagement> @@ -262,6 +265,22 @@ <artifactId>applicationinsights-runtime-attach</artifactId> <version>3.4.18</version> </dependency> + <dependency> + <groupId>io.projectreactor.netty</groupId> + <artifactId>reactor-netty-http</artifactId> + <version>${reactor-netty.version}</version> + </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp</artifactId> + <version>${okhttp.version}</version> + </dependency> + <dependency> + <groupId>com.squareup.okio</groupId> + <artifactId>okio</artifactId> + <version>${okio.version}</version> + </dependency> + </dependencies> <build>