Commit Graph

20118 Commits

Author SHA1 Message Date
isank
e546ed4834 Order TaskExecution auto-config before TaskScheduling auto-config
See gh-15984
2019-02-18 21:18:09 +01:00
Andy Wilkinson
68e3de0357 Use name from header not alias when checking entry has expected name
Previously, an entry’s potentially aliased name would be used when
checking that it has a particular name. The alias would always be
applied, irrespective of the name in the header. As a result, when
there was a clashing hash and an entry with a particular index did
not have the expected name, this would be concealed by the alias
being applied and the name check being done with the alias.

This commit reworks JarEntry to store the name in its header in
addition to its alias, if any. When checking that the entry has the
expected name, the unaliased name is passed in and the entry compares
it with the name from the header rather than the alias.

Closes gh-15981
2019-02-18 17:29:25 +00:00
Stephane Nicoll
20c39dc554 Document missing keys mapped on third party types
Closes gh-15980
2019-02-18 16:48:51 +01:00
Spring Buildmaster
3370d65ced Next development version (v2.1.4.BUILD-SNAPSHOT) 2019-02-15 11:19:26 +00:00
Stephane Nicoll
5916393b20 Upgrade to Spring Integration 5.1.3
Closes gh-15866
2019-02-15 09:38:34 +01:00
Madhura Bhave
012a956454 Fix typo in doc 2019-02-14 19:39:01 -08:00
Andy Wilkinson
33b9321071 Track condition evaluation per-context when determining delta
Closes gh-15766
2019-02-14 15:11:18 +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
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
90f059cf3a Upgrade to Spring Session Bean-SR3
Closes gh-15868
2019-02-14 14:25:51 +00: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
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
a34e71c2c8 Fix formatting violations in sample 2019-02-13 18:49:09 -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
ddfcc1e28f Change label for automatic jdk upgrade issues
Closes gh-15825
2019-02-13 15:35:10 -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
b645e0a581 Upgrade to Spring Kafka 2.2.4.RELEASE
Closes gh-15867
2019-02-13 21:16:32 +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
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
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
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
46bf82ca82 Upgrade to Spring Framework 5.1.5
Closes gh-15862
2019-02-13 09:18:46 +01:00
Stephane Nicoll
e38bd28271 Upgrade to Reactor Bom Californium-SR5
Closes gh-15878
2019-02-13 06:44:22 +01:00
Andy Wilkinson
a0cf4ec017 Add dependency now needed for javadoc generation on Java 11
See gh-15775
2019-02-12 17:33:32 +00:00
Andy Wilkinson
948bafa4d8 Repackage kotlin-module metadata beneath BOOT-INF/classes
Closes gh-15890
2019-02-12 16:41:15 +00:00
Andy Wilkinson
3a6d15acf6 Caution against using component scanning in an auto-configuration
Closes gh-15348
2019-02-12 16:34:05 +00:00
Andy Wilkinson
8e6b4629d4 Tolerate AuthenticationSwitchUserEvent with null target user
When Spring Security is misconfigured it's possible to switch from an anonymous user
to a normal user. When switching back again, the corresponding
AuthenticationSwitchUserEvent will have a null target user. Previously, Actuator's
AuthenticationAuditListener would throw a NullPointerException when it received such an
event.

This commit updates the audit listener to defensively handled events with a null target
user.

Closes gh-15767
2019-02-12 16:26:19 +00:00
Stephane Nicoll
a74717307f Merge pull request #15859 from matthiasstock
* pr/15859:
  Polish contribution
  Polish 'Database Initialization' section
2019-02-12 17:17:54 +01:00
Stephane Nicoll
a1fbfbe6be Polish contribution
Closes gh-15859
2019-02-12 17:17:29 +01:00
Matthias Stock
3c761cfc96 Polish 'Database Initialization' section
See gh-15859
2019-02-12 17:17:06 +01:00
Andy Wilkinson
d368e9c6eb Merge pull request #15775 from Johnny Lim
* gh-15775:
  Polish "Use class for @ConditionalOnClass"
  Use class for @ConditionalOnClass

Closes gh-15775
2019-02-12 15:45:32 +00:00
Andy Wilkinson
ab8fcf0d71 Polish "Use class for @ConditionalOnClass"
See gh-15775
2019-02-12 15:45:05 +00:00
Johnny Lim
b423962c89 Use class for @ConditionalOnClass
See gh-15775
2019-02-12 15:45:00 +00:00
Andy Wilkinson
5ae7aeff21 Revert "Upgrade to Saaj Impl 1.5.1"
This reverts commit 1f47bd9717.

See gh-15915
2019-02-12 15:26:45 +00:00
Andy Wilkinson
799ac24da1 Reinstate auto-config of RequestContextFilter with Jersey
Previously, the auto-configuration for both Jersey and WebMvc would auto-configure
a RequestContextFilter bean. In 2.1.0, this led to a startup failure due to the latter
attempting to override the bean defined by the former. In addition to the override there
were also problems with the order of the filter as Jersey uses -1 and MVC uses -105.

To avoid the above-described problems, the auto-configuration of the RequestContextFilter
was removed from JerseyAutoConfiguration in 2.1.1. Unfortunately, the broke
request-scoped beans for those using only Jersey.

This commit attempts to strike a better balance by reintroducing the auto-configuration
of RequestContextFilter in JerseyAutoConfiguration. It will back off if the user defines
their own filter or filter registration. WebMvcAutoConfiguration has been updated to
back off in the same manner. This leaves the potential for ordering problems, but they
are no worse than they were before. Furthermore, the user has the means to correct any
problems by using the various filter ordering properties that are provided for Jersey,
Spring Session, Spring Security, etc.

Closes gh-15376
2019-02-12 14:05:36 +00:00
Andy Wilkinson
cc64398800 Revert "Upgrade to Couchbase Client 2.7.3"
This reverts commit 06feb728b8.

See gh-15914
2019-02-12 13:53:43 +00:00
Stephane Nicoll
04aacdb37a Merge pull request #15881 from kedar-joshi
* pr/15881:
  Polish "Document internationalization support"
  Document internationalization support
2019-02-12 13:35:19 +01:00