root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
13,583 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

13583 Commits

Author SHA1 Message Date
Andy Wilkinson fd2945f2c1 Upgrade to Netty 4.1.16.Final 
Closes gh-10485
 2017-10-02 15:46:59 +01:00
Andy Wilkinson f763533805 Merge branch '1.5.x' 2017-10-02 15:39:37 +01:00
Stephane Nicoll b37d3e1153 Merge pull request #10380 from eddumelendez:gh-10376 
* pr/10380:
  Polish "Auto-configure Kafka MessageConverter"
  Auto-configure Kafka MessageConverter
 2017-10-02 16:37:24 +02:00
Stephane Nicoll 2537a0a753 Polish "Auto-configure Kafka MessageConverter" 
Closes gh-10380
 2017-10-02 16:36:56 +02:00
Eddú Meléndez d7bc93f278 Auto-configure Kafka MessageConverter 
See gh-10380
 2017-10-02 16:36:56 +02:00
Andy Wilkinson c1092f77f5 Upgrade to Jooq 3.9.6 
Closes gh-10484
 2017-10-02 15:36:13 +01:00
Andy Wilkinson e9749765ab Upgrade to Aspectj 1.8.11 
Closes gh-10483
 2017-10-02 15:36:13 +01:00
Andy Wilkinson a0fa782237 Upgrade to Tomcat 8.5.23 
Closes gh-10482
 2017-10-02 15:36:12 +01:00
Andy Wilkinson f32531b4e4 Upgrade to Appengine Sdk 1.9.57 
Closes gh-10481
 2017-10-02 15:36:11 +01:00
Andy Wilkinson 5c0ce4e514 Remove dependency management for non-existent dependencies 
See gh-10475
See gh-10473
 2017-10-02 15:31:04 +01:00
Andy Wilkinson 41424e4529 Merge branch '1.5.x' 
Closes gh-10457
 2017-10-02 15:24:12 +01:00
Andy Wilkinson d94f545b4d Merge pull request #10457 from Johnny Lim 
* gh-10457:
  Polish
 2017-10-02 15:14:48 +01:00
Johnny Lim bfa291f671 Polish 2017-10-02 15:07:03 +01:00
Stephane Nicoll ec6659db2e Merge pull request #10466 from kedar-joshi:master 
* pr/10466:
  Polish
  Polish "Adds support for useCodeAsDefaultMessage"
  Adds support for useCodeAsDefaultMessage
 2017-10-02 15:56:35 +02:00
Stephane Nicoll d778173089 Polish 2017-10-02 15:56:09 +02:00
Stephane Nicoll 6c826ef0b6 Polish "Adds support for useCodeAsDefaultMessage" 
Closes gh-10466
 2017-10-02 15:43:27 +02:00
Kedar Joshi a68ec76bb6 Adds support for useCodeAsDefaultMessage 
See gh-10466
 2017-10-02 15:37:43 +02:00
Andy Wilkinson 9102eb32d1 Polish 2017-10-02 13:34:32 +01:00
Andy Wilkinson 9ba20cc380 Merge branch '1.5.x' 2017-10-02 12:56:14 +01:00
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