Merge branch '2.1.x'

pull/15694/head
Andy Wilkinson 6 years ago
commit f8de67e6e9

@ -42,7 +42,7 @@
<assertj.version>3.11.1</assertj.version> <assertj.version>3.11.1</assertj.version>
<atomikos.version>4.0.6</atomikos.version> <atomikos.version>4.0.6</atomikos.version>
<bitronix.version>2.1.4</bitronix.version> <bitronix.version>2.1.4</bitronix.version>
<byte-buddy.version>1.9.6</byte-buddy.version> <byte-buddy.version>1.9.7</byte-buddy.version>
<caffeine.version>2.6.2</caffeine.version> <caffeine.version>2.6.2</caffeine.version>
<cassandra-driver.version>3.6.0</cassandra-driver.version> <cassandra-driver.version>3.6.0</cassandra-driver.version>
<classmate.version>1.4.0</classmate.version> <classmate.version>1.4.0</classmate.version>
@ -63,7 +63,7 @@
<freemarker.version>2.3.28</freemarker.version> <freemarker.version>2.3.28</freemarker.version>
<elasticsearch.version>6.4.3</elasticsearch.version> <elasticsearch.version>6.4.3</elasticsearch.version>
<glassfish-el.version>3.0.0</glassfish-el.version> <glassfish-el.version>3.0.0</glassfish-el.version>
<glassfish-jaxb.version>2.3.1</glassfish-jaxb.version> <glassfish-jaxb.version>2.3.2</glassfish-jaxb.version>
<groovy.version>2.5.5</groovy.version> <groovy.version>2.5.5</groovy.version>
<gson.version>2.8.5</gson.version> <gson.version>2.8.5</gson.version>
<h2.version>1.4.197</h2.version> <h2.version>1.4.197</h2.version>
@ -130,7 +130,7 @@
<logback.version>1.2.3</logback.version> <logback.version>1.2.3</logback.version>
<lombok.version>1.18.4</lombok.version> <lombok.version>1.18.4</lombok.version>
<mariadb.version>2.3.0</mariadb.version> <mariadb.version>2.3.0</mariadb.version>
<micrometer.version>1.1.1</micrometer.version> <micrometer.version>1.1.2</micrometer.version>
<mimepull.version>1.9.10</mimepull.version> <mimepull.version>1.9.10</mimepull.version>
<mockito.version>2.23.4</mockito.version> <mockito.version>2.23.4</mockito.version>
<mongo-driver-reactivestreams.version>1.9.2</mongo-driver-reactivestreams.version> <mongo-driver-reactivestreams.version>1.9.2</mongo-driver-reactivestreams.version>

Loading…
Cancel
Save