spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-08 18:41:37 +00:00
Code Issues Projects Releases Wiki Activity
12,550 Commits 24 Branches 395 Tags
2892039ccd5576131a6ce07d05f4464d4fa40e81
Commit Graph
12550 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll 2892039ccd Better tests for datasource initialization 
See gh-9528
 2017-06-28 10:48:47 +02:00
Stephane Nicoll 4e19c47e78 Fix wrong assertion 2017-06-28 10:31:14 +02:00
Stephane Nicoll 1ba0df99b2 Polish 2017-06-28 09:40:31 +02:00
Madhura Bhave acaef9c95a Make origin aware system property source 
Closes gh-9252
 2017-06-27 12:26:30 -07:00
Stephane Nicoll 7275c8795e Merge branch '1.5.x' 2017-06-27 16:59:29 +02:00
Stephane Nicoll 90112559bf Expand doc on @MockBean usage 
Closes gh-9609
 2017-06-27 16:59:16 +02:00
Stephane Nicoll 531c0708c1 Merge branch '1.5.x' 2017-06-27 16:49:38 +02:00
Stephane Nicoll d8d156bd1b Improve documentation on EnvironmentPostProcessor 
Closes gh-9617
 2017-06-27 16:49:14 +02:00
Stephane Nicoll 557361c9e0 Properly set redis password for Cluster and Sentinel config 
Closes gh-9583
 2017-06-27 15:47:07 +02:00
Stephane Nicoll 1a839d6656 Remove useless cluster check 2017-06-27 15:23:36 +02:00
Stephane Nicoll 1b181b2f34 Upgrade to Tomcat 8.5.16 
This commit uses the replacement for deprecated APIs in 8.5.16 to ease
a forward compatibility with Tomcat 9

Closes gh-9611
 2017-06-27 14:38:02 +02:00
Andy Wilkinson 88c770486c Merge branch '1.5.x' 2017-06-27 12:03:05 +01:00
Andy Wilkinson 606bc77da0 Upgrade to Tomcat 8.5.16 
Closes gh-9611
 2017-06-27 11:58:59 +01:00
Stephane Nicoll e3a9d7647d Merge branch '1.5.x' 2017-06-27 08:53:57 +02:00
Stephane Nicoll f54f2bc315 Merge pull request #9585 from dsyer:feature/appengine 
* pr/9585:
  Add short docs on using Google App Engine
 2017-06-27 08:53:43 +02:00
Dave Syer 21f616f853 Add short docs on using Google App Engine 
Now that Google actually supports arbitrary docker container
execution in app engine, we can provide some more guidance
on how to use it in the "deployment" section.

Closes gh-9585
 2017-06-27 08:53:22 +02:00
Stephane Nicoll bc81d0a08b Merge pull request #9610 from izeye:polish-20170627 
* pr/9610:
  Polish
 2017-06-27 08:51:37 +02:00
Johnny Lim 533c418ad4 Polish 
Closes gh-9610
 2017-06-27 08:51:11 +02:00
Stephane Nicoll 74a71b01ad Merge pull request #9608 from izeye:patch-22 
* pr/9608:
  Remove redundant hash code for the same field
 2017-06-27 08:41:09 +02:00
Johnny Lim 4dee630d36 Remove redundant hash code for the same field 
Closes gh-9608
 2017-06-27 08:40:50 +02:00
Madhura Bhave 4c29a8cfa2 Fix NPE in NettyWebServer stop 
Fixes gh-9542
 2017-06-26 14:27:30 -07:00
Andy Wilkinson 9dfa6a8f6a Start building against Spring Security OAuth snapshots 
Closes gh-9589
 2017-06-26 19:44:42 +01:00
Andy Wilkinson 5a4ef50ef1 Adapt to API changes in Spring Data Commons 2017-06-26 17:21:14 +01:00
Stephane Nicoll c99a222759 Merge branch '1.5.x' 2017-06-26 17:47:09 +02:00
Stephane Nicoll 85c7643638 Remove use of 'javax.annotation.Resource' 
This commit removes the only use of the `javax.annotation.Resource`
annotation from the codebase. This ensures that injection point are
only defined with Spring's annotation model.

Closes gh-9441
 2017-06-26 17:46:46 +02:00
Stephane Nicoll 8ea38d1cbe Merge branch '1.5.x' 2017-06-26 13:37:18 +02:00
Stephane Nicoll 58a1ed19a9 Polish 2017-06-26 13:36:57 +02:00
Stephane Nicoll 88d16ddf6b Add missing class check 
Closes gh-9602
 2017-06-26 13:36:34 +02:00
Andy Wilkinson a1ab994e70 Actually build against Spring Security 5.0 snapshots 
See gh-9603
 2017-06-26 10:30:57 +01:00
Andy Wilkinson 9579500cc7 Start building against Spring Security snapshots 
See gh-9603
 2017-06-26 10:18:56 +01:00
Stephane Nicoll 352ccbbd9b Merge pull request #9557 from espiegelberg:master 
* pr/9557:
  Polish "Add health indicator for Neo4j"
  Add health indicator for Neo4j
  Remove dead code
  Add missing whitespace in log
 2017-06-26 11:06:46 +02:00
Stephane Nicoll 01272fa0cc Polish "Add health indicator for Neo4j" 
Closes gh-9557
 2017-06-26 11:04:34 +02:00
Eric Spiegelberg 4c97dcb53a Add health indicator for Neo4j 
See gh-9557
 2017-06-26 10:31:02 +02:00
Stephane Nicoll 3b0cbea682 Remove dead code 2017-06-26 10:31:00 +02:00
Misagh Moayyed b39c59e97a Add missing whitespace in log 
Closes gh-9597
 2017-06-26 10:31:00 +02:00
Stephane Nicoll b465d9d815 Remove dead code 2017-06-26 09:07:07 +02:00
Stephane Nicoll 1b62f664e4 Merge branch '1.5.x' 2017-06-26 08:49:32 +02:00
Stephane Nicoll e008ce2517 Merge pull request #9597 from mmoayyed:patch-1 
* pr/9597:
  Add missing whitespace in log
 2017-06-26 08:49:14 +02:00
Misagh Moayyed 07d09f3f18 Add missing whitespace in log 
Closes gh-9597
 2017-06-26 08:48:37 +02:00
Andy Wilkinson dc020ffa6c Merge branch '1.5.x' 2017-06-23 16:59:35 -07:00
Andy Wilkinson 99d53a5980 Polish 2017-06-23 16:59:24 -07:00
Andy Wilkinson 43319a4484 Merge branch '1.5.x' 2017-06-23 14:48:05 -07:00
Andy Wilkinson 0aa0fd0670 Ensure that Jackson and GSON are auto-configured by @AutoConfigureJsonTesters 
Previously, @AutoConfigureJsonTesters only imported
JsonTestersAutoConfiguration and relied on something else pulling in
the Jackson and GSON auto-configuration upon which it depends. This
worked with @JsonTest which imported those auto-configurations. It
did not work with @SpringBootTest which would use
@EnableAutoConfiguration and the ordering was then wrong and
JsonTestersAutoConfiguration would be processed before the Jackson
and GSON auto-configurations had a chance to create the beans that
JsonTestersAutoConfiguration needs.

This commit updates the spring.factories configuration for
JsonTestersAutoConfiguration so that it imports
JacksonAutoConfiguration and GsonAutoConfiguration.
Appropriate @AutoConfigureAfter has also been added to
JsonTestersAutoConfiguration to ensure that it is considered after
JacksonAutoConfiguration and GsonAutoConfiguration.

Lastly, ExampleJsonApplication and associated classes have been moved
into an app sub-package to prevent its component scanning from
pulling in JsonTestersAutoConfiguration as if it were user
configuration.

Closes gh-9515
 2017-06-23 14:44:08 -07:00
Andy Wilkinson 532e0a254f Start building against Spring Integration snapshots 
See gh-9586
 2017-06-23 10:44:10 -07:00
Stephane Nicoll e418cad752 Merge branch '1.5.x' 2017-06-23 11:48:17 +02:00
Stephane Nicoll 5aa27beb54 Polish 2017-06-23 11:40:16 +02:00
Stephane Nicoll 90c4e7518b Detect Neo4j https driver url 
Closes gh-9549
 2017-06-23 11:39:39 +02:00
Stephane Nicoll d333bd1a93 Merge pull request #9554 from vpavic:align-session-2.0 
* pr/9554:
  Polish "Ensure compatibility with Spring Session module split"
  Ensure compatibility with Spring Session module split
 2017-06-23 10:35:33 +02:00
Stephane Nicoll 27f8a63f1c Polish "Ensure compatibility with Spring Session module split" 
Closes gh-9554
 2017-06-23 10:34:17 +02:00
Vedran Pavic ccb1eaf8ed Ensure compatibility with Spring Session module split 
This commit updates Spring Session auto-configuration to ensure
compatibility with extraction of `SessionRepository` implementations into
separate Spring Session modules.

See gh-9554
 2017-06-23 10:00:24 +02:00