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
20,381 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

20381 Commits

Author SHA1 Message Date
Andy Wilkinson bd504e68fc Merge branch '2.1.x' 2019-02-14 15:21:30 +00:00
Andy Wilkinson 33b9321071 Track condition evaluation per-context when determining delta 
Closes gh-15766
 2019-02-14 15:11:18 +00:00
Stephane Nicoll a22ba0f801 Merge pull request #15954 from nosan 
* pr/15954:
  Polish "Expose Tomcat AccessLog Max days property"
  Expose Tomcat AccessLog Max days property
 2019-02-14 16:01:35 +01:00
Stephane Nicoll 71df2f311b Polish "Expose Tomcat AccessLog Max days property" 
Closes gh-15954
 2019-02-14 16:01:21 +01:00
Dmytro Nosan 596f0c28c0 Expose Tomcat AccessLog Max days property 
See gh-15954
 2019-02-14 16:01:21 +01:00
Andy Wilkinson be40d000ba Merge branch '2.1.x' 2019-02-14 14:46:59 +00:00
Andy Wilkinson 1be794fe65 Retry upload for any SocketException not just a ConnectException 
Previously, DevTools would retry the upload of the changes to an
application in the event of a ConnectException. If a different
network-level failure occurred, it would not be retried and would
cause the file watching thread to die.

This commit attempts to make things more robust by retrying all
SocketExceptions and not just ConnectExceptions. A warning is
logged when a failure occurs. A separate debug message that
includes the exception is also logged.

Closes gh-10317
 2019-02-14 14:46:52 +00:00
Stephane Nicoll 8939a7eec3 Merge branch '2.1.x' 2019-02-14 15:35:18 +01:00
Stephane Nicoll ad82e8d11d Merge pull request #15950 from michael-simons 
* pr/15950:
  Prevent imports on org.testcontainers.shaded.*
  Polish "Stop using imports from shaded dependencies"
  Stop using imports from shaded dependencies
 2019-02-14 15:34:23 +01:00
Stephane Nicoll 10f58b3f7b Prevent imports on org.testcontainers.shaded.* 
See gh-15950
 2019-02-14 15:34:03 +01:00
Stephane Nicoll f3e142cb7c Polish "Stop using imports from shaded dependencies" 
Closes gh-15950
 2019-02-14 15:34:03 +01:00
Michael Simons de7812aa3a Stop using imports from shaded dependencies 
See gh-15950
 2019-02-14 15:34:03 +01:00
Andy Wilkinson 8bcc0caa06 Merge branch '2.1.x' 2019-02-14 14:25:55 +00:00
Andy Wilkinson 90f059cf3a Upgrade to Spring Session Bean-SR3 
Closes gh-15868
 2019-02-14 14:25:51 +00:00
Stephane Nicoll c1cccc886a Merge branch '2.1.x' 2019-02-14 15:22:35 +01:00
Stephane Nicoll f87b58f5f2 Merge pull request #15943 from sdeleuze 
* pr/15943:
  Polish "Add a link to SpringMockK in the Kotlin documentation"
  Add a link to SpringMockK in the Kotlin documentation
 2019-02-14 15:22:15 +01:00
Stephane Nicoll cd322d7b9c Polish "Add a link to SpringMockK in the Kotlin documentation" 
Closes gh-15943
 2019-02-14 15:22:02 +01:00
Sebastien Deleuze da6de215a6 Add a link to SpringMockK in the Kotlin documentation 
See gh-15943
 2019-02-14 15:21:12 +01:00
Andy Wilkinson 3a4a431eaa Provide a configuration option to enable lazy initialization 
Closes gh-15870
 2019-02-14 12:41:49 +00:00
Andy Wilkinson 6519e85b5a Merge branch '2.1.x' 2019-02-14 08:23:38 +00:00
Andy Wilkinson 027f9182a8 Generate Javadoc with same source level as used for compilation 
This works around a change in javadoc generation in JDK 11.0.2. See
https://bugs.openjdk.java.net/browse/JDK-8212233 for details.
 2019-02-14 08:23:20 +00:00
Madhura Bhave a838aac17d Merge branch '2.1.x' 2019-02-13 18:50:04 -08:00
Madhura Bhave a34e71c2c8 Fix formatting violations in sample 2019-02-13 18:49:09 -08:00
Madhura Bhave 2741e0826f Merge branch '2.1.x' 2019-02-13 16:55:33 -08:00
Madhura Bhave 82a711403d Extract java8 binary to the correct location 
Fixes gh-15948
 2019-02-13 16:52:46 -08:00
Madhura Bhave 1100ab2db2 Merge branch '2.1.x' 2019-02-13 15:35:52 -08:00
Madhura Bhave ddfcc1e28f Change label for automatic jdk upgrade issues 
Closes gh-15825
 2019-02-13 15:35:10 -08:00
Madhura Bhave 862ffcbbf4 Merge branch '2.1.x' 2019-02-13 13:33:14 -08:00
Madhura Bhave bbe555a4f5 Split Jersey management context configuration 
This commit splits the management context configuration for jersey
into two separate configurations depending on if the type is SAME or
CHILD. The configuration for the SAME context should only kick in if
there is no existing ResourceConfig bean.

Fixes gh-15891
 2019-02-13 13:27:54 -08:00
Andy Wilkinson 44046b767f Merge branch '2.1.x' 2019-02-13 21:18:47 +00:00
Andy Wilkinson b645e0a581 Upgrade to Spring Kafka 2.2.4.RELEASE 
Closes gh-15867
 2019-02-13 21:16:32 +00:00
Andy Wilkinson 2460454eb4 Merge branch '2.1.x' 2019-02-13 21:15:35 +00:00
Andy Wilkinson a69eb3729c Upgrade to Spring Security 5.1.4.RELEASE 
Closes gh-15863
 2019-02-13 21:15:09 +00:00
Andy Wilkinson d1e97665e0 Merge branch '2.1.x' 2019-02-13 18:16:40 +00:00
Andy Wilkinson 0380ca33f2 Merge branch '2.0.x' into 2.1.x 2019-02-13 18:16:32 +00:00
Andy Wilkinson 874489f1c8 Upgrade Java 8 CI image to 1.8.0_202-b08 
Closes gh-15813
 2019-02-13 18:14:55 +00:00
Andy Wilkinson 59c017b627 Upgrade JDK 11 CI image to 11.0.2+9 
Closes gh-15812
 2019-02-13 18:10:14 +00:00
Andy Wilkinson b27242f27b Merge branch '2.1.x' 2019-02-13 18:00:15 +00:00
Andy Wilkinson e3806dca42 Upgrade to Micrometer 1.1.3 
Closes gh-15869
 2019-02-13 17:56:59 +00:00
Andy Wilkinson fbf67c4dec Upgrade to Spring AMQP 2.1.4.RELEASE 
Closes gh-15865
 2019-02-13 17:56:25 +00:00
Andy Wilkinson 5c1fc52252 Upgrade to Spring Data Lovelace-SR5 
Closes gh-15864
 2019-02-13 17:55:20 +00:00
Andy Wilkinson 08b0560a86 Upgrade to Lettuce 5.1.4.RELEASE 
Closes gh-15945
 2019-02-13 17:55:13 +00:00
Andy Wilkinson dd1686bea8 Upgrade to Commons Pool2 2.6.1 
Closes gh-15946
 2019-02-13 17:54:51 +00:00
Andy Wilkinson cc87bb28aa Merge branch '2.0.x' into 2.1.x 2019-02-13 17:54:18 +00:00
Andy Wilkinson 5dc285f2cf Upgrade to Spring Hateoas 0.25.1.RELEASE 
Closes gh-15944
 2019-02-13 17:49:00 +00:00
Andy Wilkinson 747e419db1 Merge branch '2.1.x' 2019-02-13 17:45:45 +00:00
Andy Wilkinson 9fb0b97f96 Decorate test containers so tests are skipped without Docker 
Closes gh-15901
Closes gh-15638
 2019-02-13 17:44:45 +00:00
Stephane Nicoll 3d6def9f81 Handle BatchMessagingMessageConverter with Kafka batch listeners 
Closes gh-15942
 2019-02-13 17:06:38 +01:00
Andy Wilkinson b183c0b709 Merge pull request #15637 from Michael Simons 
* gh-15637:
  Polish "Add opt-in support for Neo4j-OGM native types"
  Add opt-in support for Neo4j-OGM native types

Closes gh-15637
 2019-02-13 15:05:37 +00:00
Andy Wilkinson 18174a8e9e Polish "Add opt-in support for Neo4j-OGM native types" 
See gh-15637
 2019-02-13 15:04:54 +00:00