root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.1.x' 

Closes gh-17943
This commit is contained in:
Andy Wilkinson 2019-08-23 11:29:24 +01:00
parent c48228f645 0fb0eb6e5b
commit bac63cf79e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@ -80,7 +80,9 @@
<httpcore.version>4.4.11</httpcore.version>
<infinispan.version>9.4.15.Final</infinispan.version>
<influxdb-java.version>2.15</influxdb-java.version>
<!-- deprecated in favor of "jackson-bom.version" -->
<jackson.version>2.9.9.20190807</jackson.version>
<jackson-bom.version>${jackson.version}</jackson-bom.version>
<jakarta-activation.version>1.2.1</jakarta-activation.version>
<jakarta-annotation.version>1.3.4</jakarta-annotation.version>
<jakarta-jms.version>2.0.2</jakarta-jms.version>
@ -640,7 +642,7 @@
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
<version>${jackson.version}</version>
<version>${jackson-bom.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>