Skip to content

S
spring-boot
Commit b40f689e authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.1.x' 

Conflicts:
	spring-boot-dependencies/pom.xml
parents 23d7a6bd 6aaa5ee9
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
spring-boot-dependencies/pom.xml
View file @ b40f689e
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<commons-digester.version>2.1</commons-digester.version> <commons-digester.version>2.1</commons-digester.version>
<commons-pool.version>1.6</commons-pool.version> <commons-pool.version>1.6</commons-pool.version>
<commons-pool2.version>2.2</commons-pool2.version> <commons-pool2.version>2.2</commons-pool2.version>
<crashub.version>1.3.0</crashub.version> <crashub.version>1.3.1</crashub.version>
<dropwizard-metrics.version>3.1.0</dropwizard-metrics.version> <dropwizard-metrics.version>3.1.0</dropwizard-metrics.version>
<flyway.version>3.1</flyway.version> <flyway.version>3.1</flyway.version>
<freemarker.version>2.3.21</freemarker.version> <freemarker.version>2.3.21</freemarker.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment