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.0.x'

This commit is contained in:
Phillip Webb 2018-09-05 13:43:16 -07:00
parent 8c34e053f5 a2cea6a45a
commit 0e725543d5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@
<postgresql.version>42.2.4</postgresql.version> <postgresql.version>42.2.4</postgresql.version>
<quartz.version>2.3.0</quartz.version> <quartz.version>2.3.0</quartz.version>
<querydsl.version>4.2.1</querydsl.version> <querydsl.version>4.2.1</querydsl.version>
<rabbit-amqp-client.version>5.4.0</rabbit-amqp-client.version> <rabbit-amqp-client.version>5.4.1</rabbit-amqp-client.version>
<reactor-bom.version>Californium-M2</reactor-bom.version> <reactor-bom.version>Californium-M2</reactor-bom.version>
<rest-assured.version>3.1.1</rest-assured.version> <rest-assured.version>3.1.1</rest-assured.version>
<reactive-streams.version>1.0.2</reactive-streams.version> <reactive-streams.version>1.0.2</reactive-streams.version>

2
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/mock/mockito/MockReset.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2017 the original author or authors. * Copyright 2012-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.