diff --git a/NOTICE b/NOTICE index 6b22e74c2e0fad3759f5f580c6e8c2c67c6b8cb6..5c84cd90428dfa263c389c621fda2f4a8f9cca53 100644 --- a/NOTICE +++ b/NOTICE @@ -287,7 +287,6 @@ The following software have components provided under the terms of this license: - Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://github.com/google/google-http-java-client.git/google-http-client-jackson2) - Jackson 2 extensions to the Google HTTP Client Library for Java. (from https://github.com/google/google-http-java-client.git/google-http-client-jackson2) - Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) -- Jackson dataformat: CBOR (from http://github.com/FasterXML/jackson-dataformats-binary) - Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) - Jackson datatype: JSR310 (from http://wiki.fasterxml.com/JacksonModuleJSR310) - Jackson extensions to the Google HTTP Client Library for Java. (from ) @@ -382,9 +381,9 @@ The following software have components provided under the terms of this license: - Microsoft Azure Netty HTTP Client Library (from https://github.com/Azure/azure-sdk-for-java) - Microsoft Azure SDK for SQL API of Azure Cosmos DB Service (from https://github.com/Azure/azure-sdk-for-java) - Mockito (from http://mockito.org) +- Mockito (from http://www.mockito.org) - Mockito (from http://mockito.org) - Mockito (from http://mockito.org) -- Mockito (from http://www.mockito.org) - Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/) - MongoDB Driver (from http://www.mongodb.org) - MongoDB Java Driver Core (from http://www.mongodb.org) @@ -1088,6 +1087,7 @@ The following software have components provided under the terms of this license: - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) - Bouncy Castle Provider (from http://www.bouncycastle.org/java.html) - Byte Buddy (without dependencies) (from ) +- Checker Qual (from https://checkerframework.org) - JUnit (from http://junit.org) - JavaBeans Activation Framework API jar (from ) - RabbitMQ Java Client (from http://www.rabbitmq.com) diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml index ba48b3cc7976a73c3b69b4433ca9110e91f03562..6a506916315115f5e405e38bd3cd126c2017721d 100644 --- a/indexer-core/pom.xml +++ b/indexer-core/pom.xml @@ -50,6 +50,7 @@ <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> <exclusions> + <exclusion> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId> @@ -69,6 +70,7 @@ <dependency> <groupId>org.apache.tomcat.embed</groupId> <artifactId>tomcat-embed-core</artifactId> + <version>9.0.45</version> </dependency> <dependency> diff --git a/pom.xml b/pom.xml index 7546228a31d394b89b303783770b268ef74ded5a..6265945bd14bac470785a373998e3e37ade3b30a 100644 --- a/pom.xml +++ b/pom.xml @@ -22,8 +22,8 @@ <os-core-common.version>0.9.0-SNAPSHOT</os-core-common.version> <snakeyaml.version>1.26</snakeyaml.version> <hibernate-validator.version>6.1.5.Final</hibernate-validator.version> - <jackson.version>2.11.2</jackson.version> - <tomcat-embed-core.version>9.0.37</tomcat-embed-core.version> + <jackson.version>2.11.4</jackson.version> + <tomcat-embed-core.version>9.0.45</tomcat-embed-core.version> <common-codec.version>1.14</common-codec.version> <elasticsearch.version>7.8.1</elasticsearch.version> <netty.version>4.1.51.Final</netty.version> diff --git a/provider/indexer-azure/pom.xml b/provider/indexer-azure/pom.xml index 239bfe36f7f64a3e8a7ea93c64dd6b3432d557d5..764fabd09e41e39c7aa40402da08f2e7102b1d97 100644 --- a/provider/indexer-azure/pom.xml +++ b/provider/indexer-azure/pom.xml @@ -182,6 +182,17 @@ <dependency> <groupId>org.elasticsearch</groupId> <artifactId>elasticsearch</artifactId> + <exclusions> + <exclusion> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-cbor</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-cbor</artifactId> + <version>2.11.4</version> </dependency> <dependency> <groupId>org.elasticsearch.client</groupId>