root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
18,878 Commits 23 Branches 345 Tags 270 MiB
Commit Graph

18878 Commits

Author SHA1 Message Date
Phillip Webb d76bba5e6f Migrate from ExpectedException rule to AssertJ 
Replace ExpectedException JUnit rules with AssertJ exception
assertions.

Closes gh-14336
 2018-10-02 10:55:28 -07:00
Phillip Webb 42cb0effc4 Merge branch '2.0.x' 2018-10-02 10:30:33 -07:00
Phillip Webb 3ff20b2440 Restore import-control checkstyle 
Restore checkstyle import control and fix a few violations in the
process.

Closes gh-14660
 2018-10-02 10:30:14 -07:00
Phillip Webb 63b64b4efa Fix checkstyle import regex patterns 
Update checkstyle rules to fix import regex patterns for both packages
and classes.
 2018-10-02 09:15:24 -07:00
Andy Wilkinson ab8d286200 Merge pull request #11458 from Leo Gutiérrez Ramírez 
* gh-11458:
  Polish "Fix shellcheck warnings in CLI's bash script"
  Fix shellcheck warnings in CLI's bash script
 2018-10-02 16:46:55 +01:00
Andy Wilkinson fcc73c6d88 Polish "Fix shellcheck warnings in CLI's bash script" 
Closes gh-11458
 2018-10-02 16:45:58 +01:00
leogtzr 69b844cb13 Fix shellcheck warnings in CLI's bash script 
See gh-11458
 2018-10-02 16:45:58 +01:00
Stephane Nicoll aaecdfb527 Deprecate Cassandra properties that require a default constructor 
Closes gh-14473
 2018-10-02 17:43:59 +02:00
Stephane Nicoll 068040e227 Register SpringBeanContainer with default Hibernate setup 
Closes gh-13717
 2018-10-02 16:41:02 +02:00
Stephane Nicoll 7bf32290c6 Update description of the `logger-name` hint 
Closes gh-14456
 2018-10-02 15:05:50 +02:00
Stephane Nicoll 3f9c41df81 Merge branch '2.0.x' 2018-10-02 10:48:14 +02:00
Stephane Nicoll 13491b5f94 Merge pull request #14514 from rodolphocouto 
* pr/14514:
  Add reference to valiktor-spring-boot-starter
 2018-10-02 10:48:03 +02:00
Rodolpho Couto e30f693699 Add reference to valiktor-spring-boot-starter 
Closes gh-14514
 2018-10-02 10:47:26 +02:00
Phillip Webb 6b9ee32757 Merge pull request #14568 from michael-simons 
* pr/14568:
  Polish Neo4J BookmarkManager auto-configuration
  Auto-configure Neo4J BookmarkManager when possible
 2018-10-01 10:37:37 -07:00
Phillip Webb 2add65fe15 Polish Neo4J BookmarkManager auto-configuration 
Closes gh-14568
 2018-10-01 10:34:10 -07:00
Michael J. Simons b7847d98a7 Auto-configure Neo4J BookmarkManager when possible 
Add `Neo4jBookmarkManagementConfiguration` which provides an instance
of `BookmarkManager` if necessary and Caffeine cache is on the
classpath. Depending on the kind of application, the `BookmarkManager`
will be request scoped or singleton, as recommended by Spring Data
Neo4j.

See gh-14568
 2018-10-01 10:29:17 -07:00
Phillip Webb 94b366bc16 Make assertable context interfaces configurable 
Update `Assertable*ApplicationContext` interfaces so that they also
extend the appropriate `Configurable*ApplicationContext` interface.

Closes gh-14650
 2018-10-01 10:27:39 -07:00
Stephane Nicoll 1e6c7cc122 Merge pull request #14621 from izeye 
* pr/14621:
  Polish
 2018-10-01 10:51:30 -04:00
Johnny Lim b079eeff1a Polish 
Closes gh-14621
 2018-10-01 10:51:13 -04:00
Stephane Nicoll 2d36a6f952 Merge branch '2.0.x' 2018-10-01 10:50:58 -04:00
Stephane Nicoll 7163fe1f46 Merge pull request #14621 from izeye 
* pr/14621:
  Polish
 2018-10-01 10:50:42 -04:00
Johnny Lim 1eca492c5e Polish 
See gh-14621
 2018-10-01 10:46:27 -04:00
Andy Wilkinson 121aad8397 Merge branch '2.0.x' 2018-10-01 15:39:15 +01:00
Andy Wilkinson da1fde6a5f Merge branch '1.5.x' into 2.0.x 2018-10-01 15:38:53 +01:00
Andy Wilkinson 1471db220f Merge pull request #13714 from Welton Rodrigo Torres Nascimento 
* gh-13714:
  Polish "Clarify that RestTemplateBuilder overwrites default converters"
  Clarify that RestTemplateBuilder overwrites default converters
 2018-10-01 15:38:41 +01:00
Andy Wilkinson 5c1d22eed8 Polish "Clarify that RestTemplateBuilder overwrites default converters" 
Closes gh-13714
 2018-10-01 15:37:31 +01:00
Welton Rodrigo Torres Nascimento 3dbeff56e4 Clarify that RestTemplateBuilder overwrites default converters 
See gh-13714
 2018-10-01 15:37:12 +01:00
Andy Wilkinson d145fab7e5 Merge branch '2.0.x' 2018-10-01 15:14:53 +01:00
Andy Wilkinson fd10226c54 Merge branch '1.5.x' into 2.0.x 2018-10-01 15:14:45 +01:00
Andy Wilkinson 17e9a2ee62 Polish 2018-10-01 15:14:18 +01:00
Andy Wilkinson bbe4f47cc7 Merge branch '2.0.x' 2018-10-01 14:48:23 +01:00
Andy Wilkinson 7d0dcf781c Merge branch '1.5.x' into 2.0.x 2018-10-01 14:48:15 +01:00
Andy Wilkinson bc7bac8091 Only retrieve values from request if they will be traced 
Closes gh-14550
 2018-10-01 14:46:28 +01:00
Andy Wilkinson 9735774b4a Merge branch '2.0.x' 2018-10-01 14:28:16 +01:00
Andy Wilkinson 62b481c7db Merge branch '1.5.x' into 2.0.x 2018-10-01 14:28:09 +01:00
Andy Wilkinson 3dc93641dd Clarify documentation on using Spock 1.0 
Closes gh-14612
 2018-10-01 14:26:47 +01:00
Andy Wilkinson 726579a910 Merge branch '2.0.x' 2018-10-01 14:01:38 +01:00
Andy Wilkinson 89f5cfc5a4 Merge branch '1.5.x' into 2.0.x 2018-10-01 13:51:55 +01:00
Andy Wilkinson da1a17e8b2 Stop adding filters with disabled registrations to MockMvc 
Closes gh-14636
 2018-10-01 13:30:33 +01:00
Stephane Nicoll 42a77a09f4 Merge pull request #14637 from izeye 
* pr/14637:
  Use Commons Logging for OnlyOnceLoggingDenyMeterFilter
 2018-09-30 17:49:34 -04:00
Johnny Lim 1e756db966 Use Commons Logging for OnlyOnceLoggingDenyMeterFilter 
Closes gh-14637
 2018-09-30 17:47:18 -04:00
Andy Wilkinson 9a4f655d10 Merge pull request #14631 from Gustavo Andrade 
* gh-14631:
  Upgrade Java 11 CI image to 11-ea-28-jdk
 2018-09-28 14:02:48 -04:00
Gustavo Andrade 95ae66b3ff Upgrade Java 11 CI image to 11-ea-28-jdk 
Closes gh-14631
 2018-09-28 14:02:10 -04:00
Andy Wilkinson 9b7122bf91 Merge branch '2.0.x' 2018-09-28 13:58:30 -04:00
Andy Wilkinson d5b81f9327 Merge pull request #14630 from Gustavo Andrade 
* gh-14630:
  Upgrade Java 10 CI image to 10.0.2-13-jdk
 2018-09-28 13:58:20 -04:00
Gustavo Andrade 9cd0c5a05d Upgrade Java 10 CI image to 10.0.2-13-jdk 
Closes gh-14630
 2018-09-28 13:57:42 -04:00
Andy Wilkinson 285f6bfd5f Merge branch '2.0.x' 2018-09-27 06:59:37 -04:00
Andy Wilkinson 997a27c57d Merge pull request #14593 from JB Nizet 
* gh-14593:
  Move away from deprecated Gradle configurations
 2018-09-27 06:59:27 -04:00
jnizet eee07a840f Move away from deprecated Gradle configurations 
Closes gh-14593
 2018-09-27 06:58:31 -04:00
Andy Wilkinson d4e7959a93 Merge branch '2.0.x' 2018-09-27 06:22:59 -04:00