Skip to content
Snippets Groups Projects
Commit adab71e0 authored by Neelesh Thakur's avatar Neelesh Thakur
Browse files

Merge branch 'jackson_tomcat_version_update' into 'master'

update the version of the tomcat-embed-core & jackson-dataformat-cbor

See merge request !154
parents cb89cd94 9aa57a4e
No related branches found
No related tags found
1 merge request!154update the version of the tomcat-embed-core & jackson-dataformat-cbor
Pipeline #39731 passed
...@@ -287,7 +287,6 @@ The following software have components provided under the terms of this license: ...@@ -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 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 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 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 ) - 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: ...@@ -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 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) - 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://mockito.org)
- Mockito (from http://www.mockito.org)
- Mockito (from http://mockito.org) - Mockito (from http://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/) - Mojo's Maven plugin for Cobertura (from http://mojo.codehaus.org/cobertura-maven-plugin/)
- MongoDB Driver (from http://www.mongodb.org) - MongoDB Driver (from http://www.mongodb.org)
- MongoDB Java Driver Core (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: ...@@ -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)
- 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 ) - Byte Buddy (without dependencies) (from )
- Checker Qual (from https://checkerframework.org)
- JUnit (from http://junit.org) - JUnit (from http://junit.org)
- JavaBeans Activation Framework API jar (from ) - JavaBeans Activation Framework API jar (from )
- RabbitMQ Java Client (from http://www.rabbitmq.com) - RabbitMQ Java Client (from http://www.rabbitmq.com)
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId> <artifactId>spring-boot-starter-tomcat</artifactId>
...@@ -69,6 +70,7 @@ ...@@ -69,6 +70,7 @@
<dependency> <dependency>
<groupId>org.apache.tomcat.embed</groupId> <groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId> <artifactId>tomcat-embed-core</artifactId>
<version>9.0.45</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<os-core-common.version>0.9.0-SNAPSHOT</os-core-common.version> <os-core-common.version>0.9.0-SNAPSHOT</os-core-common.version>
<snakeyaml.version>1.26</snakeyaml.version> <snakeyaml.version>1.26</snakeyaml.version>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version> <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
<jackson.version>2.11.2</jackson.version> <jackson.version>2.11.4</jackson.version>
<tomcat-embed-core.version>9.0.37</tomcat-embed-core.version> <tomcat-embed-core.version>9.0.45</tomcat-embed-core.version>
<common-codec.version>1.14</common-codec.version> <common-codec.version>1.14</common-codec.version>
<elasticsearch.version>7.8.1</elasticsearch.version> <elasticsearch.version>7.8.1</elasticsearch.version>
<netty.version>4.1.51.Final</netty.version> <netty.version>4.1.51.Final</netty.version>
......
...@@ -182,6 +182,17 @@ ...@@ -182,6 +182,17 @@
<dependency> <dependency>
<groupId>org.elasticsearch</groupId> <groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId> <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>
<dependency> <dependency>
<groupId>org.elasticsearch.client</groupId> <groupId>org.elasticsearch.client</groupId>
......
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