Commit Graph

13614 Commits

Author SHA1 Message Date
Andy Wilkinson bcbf7b5511 Update ChangeableUrlsTests to cope with URL-like Windows file paths
Closes gh-10268
2017-10-02 12:53:25 +01:00
Andy Wilkinson 30727ab145 Merge branch '1.5.x' 2017-10-02 12:49:13 +01:00
Andy Wilkinson 858b092a87 Make servlet context property source available before refresh
Previously, when deploying a Spring Boot application to a container,
the servlet context property source was not fully initialised until
the context was refreshed. This led to a problem where a value from a
property source with lower precedence would be seen during the early
stages of the application starting. Once the servlet context property
source had been initialized, its value for the property would then
become visible effectively making it appear as if the property's
value had changed during startup. This led to a specific problem
with determining active profiles.

If spring.profiles.active was set both in JNDI and via the servlet
context both profiles would end up being active, rather than the
more intuitive behaviour of the profiles made active via the servlet
context overriding those made active via JNDI.

This commit updates SpringBootServletInitializer so that it explicitly
creates the StandardServletEnvironment and initializes its property
sources using the servlet context. This is done before the application
is created and run, thereby ensuring that the servlet context
property source is available throughout the application's startup.

Closes gh-9972
2017-10-02 12:38:59 +01:00
Andy Wilkinson a7ce9546a2 Upgrade to Spring Data Kay-RELEASE
Closes gh-10329
2017-10-02 12:16:14 +01:00
Andy Wilkinson 1b40e90411 Merge branch '1.5.x' 2017-10-02 11:44:25 +01:00
Andy Wilkinson 71dbbc0d66 Provide more complete dependency management for Solr
Closes gh-10476
2017-10-02 11:40:26 +01:00
Andy Wilkinson f6a55321b0 Merge branch '1.5.x' 2017-10-02 11:25:01 +01:00
Andy Wilkinson 098dd9ddcd Provide more complete dependency management for SLF4J
Closes gh-10475
2017-10-02 11:24:28 +01:00
Andy Wilkinson 96f21f603e Merge branch '1.5.x' 2017-10-02 11:14:30 +01:00
Andy Wilkinson bfa67189d1 Provide complete dependency management for JNA
Closes gh-10474
2017-10-02 11:13:35 +01:00
Stephane Nicoll 76606afe86 Polish 2017-10-02 12:13:06 +02:00
Andy Wilkinson 0ea7d22870 Merge branch '1.5.x' 2017-10-02 11:11:26 +01:00
Andy Wilkinson 8eb676f431 Provide complete dependency management for Jetty
Closes gh-10473
2017-10-02 11:10:42 +01:00
Andy Wilkinson d61ac6bc43 Merge branch '1.5.x' 2017-10-02 10:40:18 +01:00
Andy Wilkinson 95e3443b64 Provide complete dependency management for Dropwizard Metrics
Closes gh-10472
2017-10-02 10:36:51 +01:00
Stephane Nicoll 1254c44985 Revert "Reuse spring.ldap.base in Embedded support" 2017-10-02 10:12:10 +02:00
Stephane Nicoll 5e2ec29413 Merge pull request #10468 from dreis2211:short-circuit-cleanup
* pr/10468:
  Remove non short-circuit expression in Neo4jPropertiesTests
2017-10-02 09:13:04 +02:00
dreis2211 40b4a21f4d Remove non short-circuit expression in Neo4jPropertiesTests
Closes gh-10468
2017-10-02 09:12:02 +02:00
Stephane Nicoll cf30392564 Merge pull request #10469 from dreis2211:iterator-to-remove-if
* pr/10469:
  Replace some loops with removeIf()
2017-10-02 09:08:51 +02:00
dreis2211 38813edc23 Replace some loops with removeIf()
Closes gh-10469
2017-10-02 09:08:34 +02:00
Stephane Nicoll df235d6243 Merge pull request #10467 from dreis2211:remove-redundant-tostring
* pr/10467:
  Remove redundant toString() calls
2017-10-02 09:03:08 +02:00
dreis2211 f72c04286b Remove redundant toString() calls
Closes gh-10467
2017-10-02 09:02:43 +02:00
Stephane Nicoll c795688864 Merge pull request #10444 from pavelda2:master
* pr/10444:
  Reuse spring.ldap.base in Embedded support
2017-09-30 11:10:07 +02:00
David Pavel 0fbc5def32 Reuse spring.ldap.base in Embedded support
Closes gh-10444
2017-09-30 11:09:42 +02:00
Andy Wilkinson 2c7924ba11 Update to Spring Kafka 2.0.0.RELEASE
Closes gh-10328
2017-09-30 10:06:58 +01:00
Andy Wilkinson 5a13a32f6c Revert "Reinstate testing of Jetty JSP sample on Java 9"
This reverts commit bbca612a57.
StandardJarScanner, which contains the faulty assumption about
URLClassLoader is part of Jasper. Jetty, like Tomcat, uses Jasper for
JSPs so it's also affected.

See gh-10456
2017-09-30 09:58:36 +01:00
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