Merge branch '2.0.x'

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -142,7 +142,7 @@
 		<postgresql.version>42.2.4</postgresql.version>
 		<quartz.version>2.3.0</quartz.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>
 		<rest-assured.version>3.1.1</rest-assured.version>
 		<reactive-streams.version>1.0.2</reactive-streams.version>

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

@@ -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");
  * you may not use this file except in compliance with the License.