Stephane Nicoll
157db9a4de
Merge pull request #10451 from dreis2211:string-is-empty
...
* pr/10451:
Replace some String.length() checks with String.isEmpty()
2017-09-30 10:43:32 +02:00
dreis2211
756398b52c
Replace some String.length() checks with String.isEmpty()
...
Closes gh-10451
2017-09-30 10:42:48 +02:00
Phillip Webb
b08e51f0b3
Increase WebClient testing timeout
2017-09-29 16:20:21 -07:00
Phillip Webb
69a1eebf68
Polish
2017-09-29 16:20:21 -07:00
Phillip Webb
14af3463ec
Polish whitespace
2017-09-29 15:47:38 -07:00
Madhura Bhave
f1cfad6755
Handle required parameters in endpoint infrastructure
...
Closes gh-10372
2017-09-29 14:41:58 -07:00
Andy Wilkinson
c903f87429
Merge branch '1.5.x'
2017-09-29 15:52:20 +01:00
Andy Wilkinson
663cae1255
Note behaviour of @MockBean and @SpyBean with non-bean dependencies
...
Closes gh-10381
2017-09-29 15:51:56 +01:00
Stephane Nicoll
bcdc6958f0
Merge pull request #10447 from jfarcand:master
...
* pr/10447:
Upgrade sample to Atmosphere 2.4.14
2017-09-29 16:29:31 +02:00
jfarcand
9dbc3e25bb
Upgrade sample to Atmosphere 2.4.14
...
Closes gh-10447
2017-09-29 16:28:22 +02:00
Stephane Nicoll
ce8b59fc7d
Extract configuration of MessageSourceAutoConfiguration
...
This commit extracts the configuration of MessageSourceAutoConfiguration
in a dedicated object.
Closes gh-9666
2017-09-29 16:09:38 +02:00
Andy Wilkinson
bbca612a57
Reinstate testing of Jetty JSP sample on Java 9
...
See gh-10456
2017-09-29 14:16:38 +01:00
Andy Wilkinson
082258952a
Fall back to JVM's class path when finding jars with static resources
...
Previously, StaticResourceJars would only find jars with
META-INF/resources content if it had been loaded by a URLClassLoader.
This is not the case on Java 9 and, as a result, static content in
META-INF/resources of any jars on the class path was not found.
This commit updates StaticResourceJars to fall back to using the
JVM's class path to find static resource jars when it was loaded by
a ClassLoader that is not a URLClassLoader.
Closes gh-10455
2017-09-29 12:38:37 +01:00
Andy Wilkinson
ce77f48c3f
Fall back to JVM's class path when TCCL is not a URLClassLoader
...
Previously, DevTools assumed that the TCCL was a URLClassLoader
when trying to determine the URLs that it should examine to determine
the locations that should be watched for triggering a restart. This
fails on Java 9 as the TCCL is not a URLClassLoader.
This commit updates the logic that determines the changeable URLs to
fall back to examining the JVM's class path when the TCCL is not a
URLClassLoader, typically because the application is running on Java
9. This fall back isn't a direct equivalent of the behaviour on Java 8
as the class path of the TCCL and the class path with which the JVM
was launched may not be the same. However, I consider the fix to be
reasonable for two reasons:
1. In reality, the class path of the TCCL and the class path with
which the JVM was launched are the same.
2. There appears to be now to get the URLs on the class path of the
TCCL on Java 9. There is a URLClassPath field, however Java 9's
access restrictions prevent us from using it even if we resort to
reflection.
Closes gh-10454
2017-09-29 12:17:26 +01:00
Andy Wilkinson
b152b98f84
Improve diagnostics in DevTools integration tests
...
See gh-10454
2017-09-29 12:06:05 +01:00
Andy Wilkinson
5cf48a29a5
Merge branch '1.5.x'
2017-09-29 12:05:08 +01:00
Andy Wilkinson
f01bb8e175
Polish
2017-09-29 12:04:46 +01:00
Andy Wilkinson
b6a0d67332
Merge branch '1.5.x'
2017-09-29 11:50:28 +01:00
Andy Wilkinson
c27d678b81
Improve handling of absolute URLs in Class-Path manifest attribute
...
Closes gh-10268
2017-09-29 11:45:57 +01:00
Stephane Nicoll
75dbe5c2de
Include java.xml.ws module when running on Java 9
...
See gh-7226
2017-09-29 12:12:46 +02:00
Stephane Nicoll
5ba2906045
Disable JSP sample tests on Java 9
...
See gh-10456
2017-09-29 12:07:13 +02:00
Stephane Nicoll
8637547509
Disable embedded server integration tests on Java 9
...
See gh-10455
2017-09-29 11:47:11 +02:00
Stephane Nicoll
8f8b1371b7
Disable devtools integration tests on Java 9
...
See gh-10454
2017-09-29 11:39:48 +02:00
Stephane Nicoll
eddf27320f
Configuring Surefire for samples when running on Java 9
...
See gh-7226
2017-09-29 10:59:49 +02:00
Stephane Nicoll
4caeed2ac4
Disable cassandra test on Java 9
...
See gh-10453
2017-09-29 10:34:46 +02:00
Andy Wilkinson
eefdbb7341
Merge Actuator's loggers package into its logging package
...
Closes gh-10430
2017-09-28 19:47:07 +01:00
Andy Wilkinson
94fefbf8a6
Update to Lettuce 5.0.0.RELEASE
...
Closes gh-10439
2017-09-28 19:37:37 +01:00
Stephane Nicoll
27a59579db
Polish
2017-09-28 20:06:17 +02:00
Andy Wilkinson
46155ca5da
Tolerate illegal reflective access warnings when testing with Java 9
...
See gh-7226
2017-09-28 17:38:52 +01:00
Andy Wilkinson
ebf3b47305
Make ExtendedGroovyClassLoader compatible with Java 9
...
Closes gh-10445
2017-09-28 17:38:05 +01:00
Phillip Webb
bec2e97b95
Polish
2017-09-28 09:17:33 -07:00
Madhura Bhave
c592e3b67d
Simplify AuthenticationManagerConfiguration
...
Simplify `AuthenticationManagerConfiguration` following the recent
Spring Security auto-configuration updates.
See gh-7958
2017-09-28 08:56:20 -07:00
Phillip Webb
93f6168fd0
Polish
2017-09-28 07:54:22 -07:00
Stephane Nicoll
52babaa2d2
Upgrade to Spring Framework 5.0.0.RELEASE
...
Closes gh-10325
2017-09-28 16:03:20 +02:00
Stephane Nicoll
fa78170d78
Fix LiquibaseAutoConfigurationTests with Java 9
...
Liquibase does not currently work with Java 9. This commit disables on
test reproducing that behaviour when running with that version.
See gh-10442
2017-09-28 14:05:26 +02:00
Stephane Nicoll
6bf33774fe
Fix ConditionalOnJavaTests with Java 9
...
See gh-7226
2017-09-28 14:05:26 +02:00
Stephane Nicoll
1403ff1b00
Add a way to run a test only with a certain Java version
...
Closes gh-9530
2017-09-28 14:05:26 +02:00
Stephane Nicoll
0ccd57285f
Move JavaVersion to a reusable location.
2017-09-28 14:05:26 +02:00
Andy Wilkinson
2c2b9be4be
Fix Jackson custom locale with Joda Time test on Java 9
...
The translations for the timezone names vary between Java 8 and Java
9. For example, with Java 9, UTC's name is no longer localized while
others have different localizations. This commit updates the test
to verify that the correct locale is being used while also tolerating
the different localization's of Java 8 and 9.
See gh-7226
2017-09-28 11:05:59 +01:00
Andy Wilkinson
f396740a2f
Rename Micrometer Clock bean: clock -> micrometerClock
...
Closes gh-10436
2017-09-28 07:46:01 +01:00
Andy Wilkinson
0e2d34cdb4
Remove additional auto-configured security configurers
...
Closes gh-10435
2017-09-28 07:43:25 +01:00
Andy Wilkinson
8f9b47aa4c
Start building against Lettuce snapshots for 5.0.0.RELEASE
...
See gh-10439
2017-09-28 06:38:24 +01:00
Andy Wilkinson
644e43b98c
Polish
2017-09-28 06:00:50 +01:00
Phillip Webb
9e43b99966
Polish
2017-09-27 17:44:48 -07:00
Andy Wilkinson
7e2d7dcd1d
Polish
2017-09-27 19:48:26 +01:00
Andy Wilkinson
bd1bd6bf64
Start building against snapshots for Spring Kafka 2.0.0.RELEASE
...
See gh-10328
2017-09-27 19:48:26 +01:00
Andy Wilkinson
89f9112abd
Start building against snapshots for Spring Data Kay-RELEASE
...
See gh-10329
2017-09-27 19:48:26 +01:00
Andy Wilkinson
58c3b0d390
Start building against snapshots for Spring AMQP 2.0.0.RELEASE
...
See gh-7053
2017-09-27 19:48:26 +01:00
Andy Wilkinson
696cdb6b58
Start building against snapshots for Spring Session 2.0.0.M5
...
See gh-10326
2017-09-27 16:19:51 +01:00
Stephane Nicoll
4c576f6d19
Override AspectJ version when building with Java9
...
See gh-7226
2017-09-27 15:33:56 +02:00