spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-26 11:39:14 +00:00
Code Issues Projects Releases Wiki Activity
21,208 Commits 28 Branches 395 Tags
5f1bbf8c72da1702081da57226304ccb9008a642
Commit Graph
21208 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll 09407efe76 Merge pull request #15401 from igor-suhorukov 
* pr/15401:
  Polish "Replace this lambda with a method reference"
  Replace this lambda with a method reference
 2018-12-07 11:10:41 +01:00
Stephane Nicoll d5f90ffcfb Polish "Replace this lambda with a method reference" 
Closes gh-15401
 2018-12-07 11:10:10 +01:00
igor-suhorukov 5c1813aef8 Replace this lambda with a method reference 
See gh-15401
 2018-12-07 11:01:42 +01:00
Stephane Nicoll 71173f2db5 Merge branch '2.1.x' 2018-12-07 09:57:20 +01:00
Stephane Nicoll c84d199cb7 Upgrade to Flyway 5.2.4 
Closes gh-15402
 2018-12-07 09:56:18 +01:00
Andy Wilkinson 95a14e7ba5 Remove duplicate dependency management for spring-core 
Closes gh-15380
 2018-12-06 12:07:25 +00:00
Stephane Nicoll 6f6e712a7b Merge branch '2.1.x' 2018-12-06 09:08:12 +01:00
Stephane Nicoll bd21113e9f Fix indent of WebServiceTemplate section 
Closes gh-15389
 2018-12-06 09:06:02 +01:00
Madhura Bhave 5a18df2d69 Fix tests 2018-12-05 18:33:50 -08:00
Madhura Bhave 59d2b0a3fb Upgrade tests to Junit5 
See gh-14737
 2018-12-05 17:49:09 -08:00
Madhura Bhave 4c96c76f11 Include Junit5 dependencies in Spring Boot Starter Test 
See gh-14736
 2018-12-05 17:48:52 -08:00
Madhura Bhave 12e1d9a6a4 Add Junit5 OutputCapture Extension 
See gh-14738
 2018-12-05 17:48:27 -08:00
Stephane Nicoll fb1c7c82b4 Merge branch '2.1.x' 2018-12-05 15:56:18 +01:00
Stephane Nicoll ef40241bf6 Merge branch '2.0.x' into 2.1.x 2018-12-05 15:56:04 +01:00
Stephane Nicoll 5e59b56044 Merge pull request #15386 from dreis2211 
* pr/15386:
  Remove unused ByteArrayStartsWith matcher
 2018-12-05 15:55:45 +01:00
dreis2211 d864b427eb Remove unused ByteArrayStartsWith matcher 
Closes gh-15386
 2018-12-05 15:52:42 +01:00
Brian Clozel ed3347f00d Configure Asciidoctor toolchain for ref docs 
This commit replaces the Docbook+Asciidoctor documentation toolchain by
a single Asciidoctor generation process.

First, we need to unzip the contents of the Spring Asciidoctor
documentation resources provided by the
`io.spring.docsresources:spring-docs-resources` distribution zip. This
is done in a `/target/refdocs` folder. We then copy all files from
`src/main/asciidoc` to the same location, and then launch the generation
process.

Closes gh-12611
 2018-12-05 14:20:07 +01:00
Jay Bryant a7d22aaf4b Reorganize asciidoc content 
This commit adds an index page for the multi-file HTML version, and
fixed a couple of casing issues (significant words starting with lower
case in headings).

While researching how to get the content from index-docinfo.xml into
the output, I came across the notion of a colophon, which is a good name
for the information in that file. I have consequently changed "Legal"
(which I never liked but couldn't think of a better term for at the
time) to "Colophon".

See gh-12611
 2018-12-05 10:32:37 +01:00
Jay Bryant a60c575836 Cleanup asciidoctor build 
Remove Guardfile for now; we might reintroduce it later, but it is
currently out of sync with the documentation changes.

Do not ignore html files in the asciidoc directory as those are needed
for docinfo parts.

See gh-12611
 2018-12-05 10:32:36 +01:00
Jay Bryant 11f6a5ab70 Remove docbook toolchain 
See gh-12611
 2018-12-05 10:32:36 +01:00
Stephane Nicoll 096640de84 Merge branch '2.1.x' 2018-12-05 08:57:14 +01:00
Stephane Nicoll 185a49fb3b Add reference to JaVers starter 2018-12-05 08:56:50 +01:00
Stephane Nicoll 95b94c0158 Merge branch '2.1.x' 2018-12-04 10:53:41 +01:00
Stephane Nicoll c56c0ff433 Rename OAuth2ResourceServerJwkConfiguration 
Closes gh-15375
 2018-12-04 10:53:01 +01:00
Andy Wilkinson 5c986b5030 Merge branch '2.1.x' 2018-12-03 16:29:36 +00:00
Andy Wilkinson 42b58f6d27 Add JAXB API dependency that is no longer transitive via testcontainers 
See gh-15371
 2018-12-03 16:29:10 +00:00
Andy Wilkinson 8b21044902 Merge branch '2.1.x' 2018-12-03 15:07:54 +00:00
Andy Wilkinson 917108cce7 Merge branch '2.0.x' into 2.1.x 2018-12-03 15:07:30 +00:00
Andy Wilkinson 425a3aacf5 Add JAXB API dependency that is no longer transitive via testcontainers 
See gh-15371
 2018-12-03 15:06:32 +00:00
Stephane Nicoll a85e27c7cd Further replace magic number by HttpStatus 
See gh-15130
 2018-12-03 15:48:13 +01:00
Stephane Nicoll 9ee6303876 Merge pull request #15130 from holy12345 
* pr/15130:
  Polish "Replace magic number by HttpStatus"
  Replace magic number by HttpStatus
 2018-12-03 15:47:27 +01:00
Stephane Nicoll f2ca2533d5 Polish "Replace magic number by HttpStatus" 
Closes gh-15130
 2018-12-03 15:33:57 +01:00
holy12345 ffdc9f0ff3 Replace magic number by HttpStatus 
See gh-15130
 2018-12-03 15:33:35 +01:00
Stephane Nicoll 9483c91d58 Make sure to include validation query in case of failure 
See gh-15055
 2018-12-03 15:27:52 +01:00
Stephane Nicoll 745ff883ac Merge pull request #15055 from Aerlant 
* pr/15055:
  Polish "Add validation query to DataSourceHealthIndicator details"
  Add validation query to DataSourceHealthIndicator details
 2018-12-03 15:11:40 +01:00
Stephane Nicoll 9e84abc46b Polish "Add validation query to DataSourceHealthIndicator details" 
Closes gh-15055
 2018-12-03 15:10:59 +01:00
Erlend Haugsnes fc85c34dd8 Add validation query to DataSourceHealthIndicator details 
See gh-15055
 2018-12-03 14:33:52 +01:00
Stephane Nicoll 9686ae4f60 Merge pull request #15086 from onraz 
* pr/15086:
  Polish contribution
  Fail fast if nested condition uses a phase inappropriate for its members
 2018-12-03 14:24:00 +01:00
Stephane Nicoll bbad720e23 Polish contribution 
Closes gh-15086
 2018-12-03 14:23:16 +01:00
Razib Shahriar 9e571a2827 Fail fast if nested condition uses a phase inappropriate for its members 
See gh-15086
 2018-12-03 14:14:29 +01:00
Andy Wilkinson 0f474ec08f Merge branch '2.1.x' 2018-12-03 13:01:56 +00:00
Andy Wilkinson 07065532fe Replace accidental use of code shaded by Testcontainers 
See gh-15371
 2018-12-03 13:01:27 +00:00
Andy Wilkinson 910a0e57b8 Drop dependency management for DropWizard Metrics modules removed in v4 
Closes gh-15370
 2018-12-03 12:49:15 +00:00
Andy Wilkinson b05abe8ca0 Merge branch '2.1.x' 2018-12-03 12:16:18 +00:00
Andy Wilkinson 72ad0cc6be Merge branch '2.0.x' into 2.1.x 2018-12-03 12:15:36 +00:00
Andy Wilkinson 3fd0380359 Correct optional dependency declarations in spring-boot-test-support 
Closes gh-15371
 2018-12-03 12:14:18 +00:00
Stephane Nicoll cc69b08cbe Merge pull request #15145 from ayudovin 
* pr/15145:
  Polish "Add configurable property for JWK encryption algorithm"
  Add configurable property for JWK encryption algorithm
 2018-12-03 11:50:10 +01:00
Stephane Nicoll 0df13baa0f Polish "Add configurable property for JWK encryption algorithm" 
Closes gh-15145
 2018-12-03 11:49:18 +01:00
artsiom 460fdaf52f Add configurable property for JWK encryption algorithm 
See gh-15145
 2018-12-03 11:35:10 +01:00
Stephane Nicoll 5674a53d67 Merge pull request #15212 from cac03 
* pr/15212:
  Polish "Configure MessageSource if no "messageSource" bean defined"
  Configure MessageSource if no "messageSource" bean defined
 2018-12-03 11:32:23 +01:00