diff --git a/NOTICE b/NOTICE index 6928cc6a651cd5df94cfa4932a8925a4059251a9..c1a21f80597269e32ab8a6c0a5ef08365b1bc1ef 100644 --- a/NOTICE +++ b/NOTICE @@ -517,6 +517,7 @@ The following software have components provided under the terms of this license: - Netty/Resolver/DNS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns) - Netty/Resolver/DNS/Classes/MacOS (from https://repo1.maven.org/maven2/io/netty/netty-resolver-dns-classes-macos) - Netty/TomcatNative [BoringSSL - Static] (from https://github.com/netty/netty-tcnative/netty-tcnative-boringssl-static/) +- Netty/TomcatNative [OpenSSL - Classes] (from https://repo1.maven.org/maven2/io/netty/netty-tcnative-classes) - Netty/Transport (from https://repo1.maven.org/maven2/io/netty/netty-transport) - Netty/Transport/Classes/Epoll (from https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll) - Netty/Transport/Classes/KQueue (from https://repo1.maven.org/maven2/io/netty/netty-transport-classes-kqueue) diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml index deedbd16561bf3793f16064cbd8a4f2609c9126a..ff7b1c6d14370ede34d08210ad19f95cdd732968 100644 --- a/provider/indexer-azure/pom.xml +++ b/provider/indexer-azure/pom.xml @@ -48,6 +48,7 @@ <mockito.version>3.11.2</mockito.version> <cobertura-maven-plugin.version>2.7</cobertura-maven-plugin.version> <spring-security-oauth2.version>2.3.6.RELEASE</spring-security-oauth2.version> + <netty.version>4.1.96.Final</netty.version> <reactor-netty.version>1.0.7</reactor-netty.version> <reactor-core.version>3.4.24</reactor-core.version> <oauth2-oidc-sdk.version>6.5</oauth2-oidc-sdk.version> @@ -55,10 +56,20 @@ <azure-core.version>1.31.0</azure-core.version> <azure-security-keyvault-keys.version>4.4.6</azure-security-keyvault-keys.version> <azure-security-keyvault-secrets.version>4.4.6</azure-security-keyvault-secrets.version> + <guava.version>32.1.2-jre</guava.version> </properties> <dependencyManagement> <dependencies> + <!-- netty-bom dependency to be declared before spring-boot-dependencies, + to pull all netty-transitive dependencies with same version --> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-bom</artifactId> + <version>${netty.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> <!-- Override version defined in parent's POM --> <!-- Inherit managed dependencies from core-lib-azure --> <dependency> @@ -235,7 +246,11 @@ <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-cbor</artifactId> </dependency> - + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${guava.version}</version> + </dependency> <!-- Resilience4j Dependencies--> <dependency> <groupId>io.github.resilience4j</groupId>