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

99 Commits

Author SHA1 Message Date
Andy Wilkinson aef92b9295 Merge branch '2.1.x' 
Closes gh-17079
 2019-06-07 11:00:44 +01:00
Andy Wilkinson 24925c3dae Merge branch '2.0.x' into 2.1.x 
Closes gh-17078
 2019-06-07 10:50:34 +01:00
Phillip Webb d306b31ce9 Merge branch '2.1.x' 2019-06-04 02:08:00 -07:00
Phillip Webb ccfbd03482 Merge branch '2.0.x' into 2.1.x 2019-06-04 02:07:14 -07:00
Phillip Webb 5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
Phillip Webb 32068c21a3 Polish resource files to all end with a new line 2019-06-03 23:48:43 -07:00
Andy Wilkinson 0644a79401 Repackage output capture and always use extension declaratively 
Closes gh-17029
 2019-05-31 18:33:10 +01:00
Phillip Webb d11d5ceb29 Split up JUnit 5 OutputCapture class 
Split the JUnit 5 `OutputCapture` class into separate `OutputExtension`
and `CapturedOutput` classes. The JUnit 5 callback methods are now
contained only in the `OutputExtension` class so no longer pollute the
public API that users will interact with.

The `CapturedOutput` class has also been updated to capture System.err
and System.out separately to allow distinct assertions if required.

Closes gh-17029
 2019-05-30 23:44:35 -07:00
Spring Buildmaster 67fa63d0e3 Next Development Version 2019-05-14 08:21:02 +00:00
Madhura Bhave 1db1c8b03c Validate our own tests work with JUnit5 and the vintage engine 
Closes gh-14737

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
 2019-05-08 16:05:44 +02:00
Phillip Webb ddbfb2530d Update copyright header of changed files 2019-04-03 17:01:00 -07:00
Phillip Webb ad7eebee9e Merge branch '2.1.x' 2019-04-03 17:00:25 -07:00
Phillip Webb f12ab1ff90 Update copyright header of changed files 2019-04-03 16:13:00 -07:00
Spring Buildmaster ca3a864565 Next Development Version 2019-04-03 10:34:44 +00:00
Andy Wilkinson 878a635bfb Merge branch '2.1.x' 2019-03-28 11:48:47 +00:00
Andy Wilkinson 864942ad4f Merge branch '2.0.x' into 2.1.x 2019-03-28 09:35:53 +00:00
Andy Wilkinson ba4671f0ab Merge branch '1.5.x' into 2.0.x 2019-03-27 19:59:36 +00:00
Andy Wilkinson 94633cfd89 Merge branch '1.4.x' into 1.5.x 2019-03-27 14:04:32 +00:00
Spring Operator 189eeefbb1 Use HTTPS for external links wherever possible 
See gh-16317
 2019-03-27 12:30:55 +00:00
Andy Wilkinson baec3d6e8e Merge branch '1.3.x' into 1.4.x 2019-03-27 12:22:40 +00:00
Spring Operator e401d02ced Use HTTPS for external links wherever possible 
See gh-16316
 2019-03-27 11:35:54 +00:00
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Andy Wilkinson 4b6bddd476 Merge branch '1.4.x' into 1.5.x 2019-03-20 16:30:04 +00:00
Andy Wilkinson 6920c39349 Merge branch '1.3.x' into 1.4.x 2019-03-20 15:06:50 +00:00
Andy Wilkinson 0e009ef047 Use HTTPS to link to the Apache license 2019-03-20 15:00:10 +00:00
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Andy Wilkinson a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator 3e2b6ac8ed Update build and setup configuration to use HTTPS 
See gh-16246
 2019-03-19 16:58:31 +00:00
Spring Operator 991ba550d3 Update build and setup configuration to use HTTPS 
See gh-16245
 2019-03-19 16:48:30 +00:00
Spring Operator e2837843e1 Update build and setup configuration to use HTTPS 
See gh-16244
 2019-03-19 16:44:10 +00:00
Spring Operator 7c314122f7 Update build and setup configuration to use HTTPS 
See gh-16243
 2019-03-19 16:01:05 +00:00
Spring Buildmaster b04710d744 Next development version 2019-01-11 15:59:00 +00:00
Andy Wilkinson 064f6478df Move back to JUnit 4 until SUREFIRE-1614 has been resolved 
See gh-14736
See gh-14737
See gh-14738
 2018-12-12 16:49:30 +00:00
Madhura Bhave 59d2b0a3fb Upgrade tests to Junit5 
See gh-14737
 2018-12-05 17:49:09 -08:00
Spring Buildmaster 9bb64a3493 Next Development Version 2018-11-29 09:52:39 +00:00
Spring Buildmaster 4d24feb443 Next development version 2018-10-16 08:44:44 +00:00
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
Spring Buildmaster 46df506b0a Next development version 2018-09-11 14:24:40 +00:00
Spring Buildmaster 73bf744cb0 Next Development Version 2018-07-30 13:37:38 +00:00
Andy Wilkinson 134edf9f2a Upgrade to Jooq 3.11.2 
Closes gh-13675
 2018-07-03 17:30:48 +01:00
Spring Buildmaster 36b8639853 Next Development Version 2018-06-14 10:05:31 +00:00
Phillip Webb 21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Phillip Webb 4853477081 Reformat code 2018-05-25 18:17:37 -07:00
Spring Buildmaster 010b4fccbd Next development version 2018-05-09 09:31:46 +00:00
Spring Buildmaster c10aad165f Next Development Version 2018-04-09 23:14:33 +00:00
Spring Buildmaster ade4760842 Next Development Version 2018-04-05 09:01:52 +00:00
Phillip Webb 4b9c3c137e Polish Collection.toArray 
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.

Fixes gh-12160
 2018-02-22 21:11:30 -08:00
Spring Buildmaster 6414b42335 Next Development Version 2018-01-30 23:29:33 +00:00