Stephane Nicoll
b28c31d6c3
Merge branch '2.1.x'
6 years ago
Spring Buildmaster
3370d65ced
Next development version (v2.1.4.BUILD-SNAPSHOT)
6 years ago
Stephane Nicoll
6e8cc49a1e
Merge branch '2.1.x'
6 years ago
Stephane Nicoll
5916393b20
Upgrade to Spring Integration 5.1.3
...
Closes gh-15866
6 years ago
Madhura Bhave
9bc9639954
Merge branch '2.1.x'
6 years ago
Madhura Bhave
012a956454
Fix typo in doc
6 years ago
Andy Wilkinson
bd504e68fc
Merge branch '2.1.x'
6 years ago
Andy Wilkinson
33b9321071
Track condition evaluation per-context when determining delta
...
Closes gh-15766
6 years ago
Stephane Nicoll
a22ba0f801
Merge pull request #15954 from nosan
...
* pr/15954:
Polish "Expose Tomcat AccessLog Max days property"
Expose Tomcat AccessLog Max days property
6 years ago
Stephane Nicoll
71df2f311b
Polish "Expose Tomcat AccessLog Max days property"
...
Closes gh-15954
6 years ago
Dmytro Nosan
596f0c28c0
Expose Tomcat AccessLog Max days property
...
See gh-15954
6 years ago
Andy Wilkinson
be40d000ba
Merge branch '2.1.x'
6 years ago
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
6 years ago
Stephane Nicoll
8939a7eec3
Merge branch '2.1.x'
6 years ago
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
6 years ago
Stephane Nicoll
10f58b3f7b
Prevent imports on org.testcontainers.shaded.*
...
See gh-15950
6 years ago
Stephane Nicoll
f3e142cb7c
Polish "Stop using imports from shaded dependencies"
...
Closes gh-15950
6 years ago
Michael Simons
de7812aa3a
Stop using imports from shaded dependencies
...
See gh-15950
6 years ago
Andy Wilkinson
8bcc0caa06
Merge branch '2.1.x'
6 years ago
Andy Wilkinson
90f059cf3a
Upgrade to Spring Session Bean-SR3
...
Closes gh-15868
6 years ago
Stephane Nicoll
c1cccc886a
Merge branch '2.1.x'
6 years ago
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
6 years ago
Stephane Nicoll
cd322d7b9c
Polish "Add a link to SpringMockK in the Kotlin documentation"
...
Closes gh-15943
6 years ago
Sebastien Deleuze
da6de215a6
Add a link to SpringMockK in the Kotlin documentation
...
See gh-15943
6 years ago
Andy Wilkinson
3a4a431eaa
Provide a configuration option to enable lazy initialization
...
Closes gh-15870
6 years ago
Andy Wilkinson
6519e85b5a
Merge branch '2.1.x'
6 years ago
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.
6 years ago
Madhura Bhave
a838aac17d
Merge branch '2.1.x'
6 years ago
Madhura Bhave
a34e71c2c8
Fix formatting violations in sample
6 years ago
Madhura Bhave
2741e0826f
Merge branch '2.1.x'
6 years ago
Madhura Bhave
82a711403d
Extract java8 binary to the correct location
...
Fixes gh-15948
6 years ago
Madhura Bhave
1100ab2db2
Merge branch '2.1.x'
6 years ago
Madhura Bhave
ddfcc1e28f
Change label for automatic jdk upgrade issues
...
Closes gh-15825
6 years ago
Madhura Bhave
862ffcbbf4
Merge branch '2.1.x'
6 years ago
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
6 years ago
Andy Wilkinson
44046b767f
Merge branch '2.1.x'
6 years ago
Andy Wilkinson
b645e0a581
Upgrade to Spring Kafka 2.2.4.RELEASE
...
Closes gh-15867
6 years ago
Andy Wilkinson
2460454eb4
Merge branch '2.1.x'
6 years ago
Andy Wilkinson
a69eb3729c
Upgrade to Spring Security 5.1.4.RELEASE
...
Closes gh-15863
6 years ago
Andy Wilkinson
d1e97665e0
Merge branch '2.1.x'
6 years ago
Andy Wilkinson
0380ca33f2
Merge branch '2.0.x' into 2.1.x
6 years ago
Andy Wilkinson
874489f1c8
Upgrade Java 8 CI image to 1.8.0_202-b08
...
Closes gh-15813
6 years ago
Andy Wilkinson
59c017b627
Upgrade JDK 11 CI image to 11.0.2+9
...
Closes gh-15812
6 years ago
Andy Wilkinson
b27242f27b
Merge branch '2.1.x'
6 years ago
Andy Wilkinson
e3806dca42
Upgrade to Micrometer 1.1.3
...
Closes gh-15869
6 years ago
Andy Wilkinson
fbf67c4dec
Upgrade to Spring AMQP 2.1.4.RELEASE
...
Closes gh-15865
6 years ago
Andy Wilkinson
5c1fc52252
Upgrade to Spring Data Lovelace-SR5
...
Closes gh-15864
6 years ago
Andy Wilkinson
08b0560a86
Upgrade to Lettuce 5.1.4.RELEASE
...
Closes gh-15945
6 years ago
Andy Wilkinson
dd1686bea8
Upgrade to Commons Pool2 2.6.1
...
Closes gh-15946
6 years ago
Andy Wilkinson
cc87bb28aa
Merge branch '2.0.x' into 2.1.x
6 years ago