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
26,603 Commits 24 Branches 372 Tags 284 MiB
Commit Graph

26603 Commits

Author SHA1 Message Date
Phillip Webb 5ae623c43a Polish 'Add Period converter support' 
Polish period converter support, primarily by changing
`PeriodStyle` to parse and print periods that include
more than one unit.

See gh-21136
 2020-05-06 00:21:50 -07:00
Grubhart dc4d71f91e Add Period converter support 
Add converter support for `javax.time.Period` including:

	String -> Period
	Number -> Period
	Period -> String

Period to Number conversion is not supported since `Period` has no
ability to deduce the number of calendar days in the period.

See gh-21136
 2020-05-05 22:31:49 -07:00
Madhura Bhave a8f56b57cb Consider legacy environment names in isAncestorOf 
Update the `isAncestorOf` method of SpringConfigurationPropertySources
so that legacy names are considered for the system environment.

Prior to this commit, binding a property such as `my.camelCase.prop`
would detect `MY_CAMELCASE_PROP` but not `MY_CAMEL_CASE_PROP` in
the system environment.

Fixes gh-14479

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
 2020-05-05 21:36:11 -07:00
Phillip Webb fb9bf7a0b2 Merge pull request #21259 from dreis2211 
* pr/21259:
  Further optimize StringSequence.startsWith
  Optimize StringSequence.startsWith

Closes gh-21259
 2020-05-05 18:37:11 -07:00
Phillip Webb 4a8492d428 Further optimize StringSequence.startsWith 
See gh-21259
 2020-05-05 18:37:10 -07:00
dreis2211 70ffc70993 Optimize StringSequence.startsWith 
See gh-21259
 2020-05-05 18:37:10 -07:00
Madhura Bhave 7634901fb3 Return null when getting a logback logger that does not exist 
Closes gh-21292
 2020-05-05 17:07:51 -07:00
Madhura Bhave f23d0501e4 Merge branch '2.2.x' 
Closes gh-21323
 2020-05-05 14:14:24 -07:00
Madhura Bhave 43e7ccd620 Detect log4j2-test.* files when using log4J2 
Fixes gh-17001
 2020-05-05 14:12:34 -07:00
Phillip Webb 3325709a78 Upgrade to JNA 5.5.0 
Upgrade JNA to 5.5.0 and only use the jna-platform dependency.

Closes gh-21313
 2020-05-05 12:50:33 -07:00
Phillip Webb 365f65d214 Merge branch '2.2.x' 
Closes gh-21321
 2020-05-05 12:12:54 -07:00
Phillip Webb 98d27db767 Merge branch '2.1.x' into 2.2.x 
Closes gh-21320
 2020-05-05 12:12:31 -07:00
Phillip Webb df70c42f98 Allow classpath wildcards with Java 11 or above 
Update `StaticResourceJars` to catch both `IOException` and
`InvalidPathException` when checking URLs. Prior to this commit only
`IOException` was caught which worked on Java 8 but not Java 11 or
above.

Fixes gh-21312
 2020-05-05 12:10:31 -07:00
Phillip Webb 720d23af41 Further restrict configuration wildcard patterns 
Extend wildcard restrictions to the `spring.config.name` property. Also
refine exception messages to include the property value.

Closes gh-21217
 2020-05-05 10:27:35 -07:00
Stephane Nicoll 8611b2c585 Merge pull request #21108 from jkatada 
* pr/21108:
  Fix duplicate slashes in URL links

Closes gh-21108
 2020-05-05 17:49:04 +02:00
Katada, Junya bc2a83062b Fix duplicate slashes in URL links 
See gh-21108
 2020-05-05 17:48:49 +02:00
Andy Wilkinson f6d8c7d23c Simplify ReactiveWebServerApplicationContext.ServerManager 
Closes gh-21315
 2020-05-05 15:04:09 +01:00
Andy Wilkinson a688ac3f64 Improve testing of ReactiveWebServerApplicationContext 
Closes gh-21314
 2020-05-05 12:45:24 +01:00
Madhura Bhave 965756456c Merge pull request #21310 from kylehoehns 
* pr/21310:
  Fix typo for includeLayerTools

Closes gh-21310
 2020-05-04 17:30:59 -07:00
Kyle Hoehns fd46002666 Fix typo for includeLayerTools 
See gh-21310
 2020-05-04 17:29:28 -07:00
Andy Wilkinson e484246388 Add missing implementation attributes to Shade config 
Fixes gh-21304
 2020-05-04 15:58:33 +01:00
Andy Wilkinson de1e3c6069 Include empty layers when listing and extracting 
Fixes gh-21301
 2020-05-04 15:50:55 +01:00
Stephane Nicoll 5d7df790f1 Merge branch '2.2.x' 
Closes gh-21261
 2020-05-04 15:02:51 +02:00
Stephane Nicoll 487329fafa Merge branch '2.1.x' into 2.2.x 
Closes gh-21260
 2020-05-04 15:02:17 +02:00
Stephane Nicoll f4ae2b0584 Merge branch '2.2.x' 
Closes gh-21305
 2020-05-04 14:58:43 +02:00
Stephane Nicoll 9e0f7ad245 Polish bomr exclusion for the maven shade plugin 
See gh-21265
 2020-05-04 14:56:08 +02:00
Stephane Nicoll e54b7d07c9 Upgrade Ubuntu version in CI images 
Closes gh-21262
 2020-05-04 14:19:02 +02:00
Stephane Nicoll 0f04aa3805 Merge branch '2.2.x' 2020-05-04 14:10:49 +02:00
Stephane Nicoll 0f86baea8e Add bomr exclusion for the maven shade plugin 
Closes gh-21265
 2020-05-04 14:10:37 +02:00
Stephane Nicoll 8abf658087 Remove dependency management for the Wavefront SDK 
Closes gh-21295
 2020-05-04 10:17:01 +02:00
Phillip Webb 9486842bad Merge branch '2.2.x' 
Closes gh-21294
 2020-05-01 18:31:14 -07:00
Phillip Webb 92ef515fbe Fix @DefaultValue PropertyEditor based conversion 
Update `ValueObjectBinder` reattempt conversion if the `@DefaultValue`
contains a single element. Prior to this commit, single element
conversion relied on the `ArrayToObjectConverter` which isn't always
available.

Fixes gh-21264
 2020-05-01 18:26:18 -07:00
Phillip Webb ff3b05a421 Add json starter to integration test repo 2020-04-30 20:55:35 -07:00
Phillip Webb 07415e1603 Attempt to fix Windows CI test failure 2020-04-30 18:17:29 -07:00
Phillip Webb 57179c0d3d Add InputStreamSourceToByteArrayConverter 
Add an `InputStreamSourceToByteArrayConverter` that can be used to
convert from an `InputStreamSource` (such as a `Resource`) to a
byte array.

Closes gh-21285
 2020-04-30 16:40:05 -07:00
Phillip Webb d52bf83ab2 Polish 2020-04-30 16:40:05 -07:00
Scott Frederick aa63070fb9 Apply test conventions unconditionally 
See gh-21272
 2020-04-30 16:32:48 -05:00
Madhura Bhave 8ec16bd027 Restrict wildcard pattern support for configuration files 
This commit restricts how wildcards can be used in search
locations for property files. If a search location contains
a pattern, there must be only one '*' and the location should
end with a '*/'. For search locations that specify the file
name, the pattern should end with '*/<filename>'.

The list of files read from wildcard locations are now sorted
alphabetically according to the absolute path of the file.

Closes gh-21217
 2020-04-30 14:17:44 -07:00
Andy Wilkinson 080123ebeb Only enable flaky test support on CI 
Closes gh-21272
 2020-04-30 20:30:18 +01:00
Andy Wilkinson 79a2e7f469 Upgrade to Undertow 2.1.0.Final 
Closes gh-21278
 2020-04-30 20:18:11 +01:00
Andy Wilkinson 1f00938c5a Upgrade to SAAJ Impl 1.5.2 
Closes gh-21277
 2020-04-30 20:18:11 +01:00
Andy Wilkinson a361583c8c Upgrade to Jetty EL 8.5.54 
Closes gh-21276
 2020-04-30 19:46:48 +01:00
Andy Wilkinson a7fd02e243 Upgrade to Hazelcast 3.12.7 
Closes gh-21275
 2020-04-30 19:46:46 +01:00
Andy Wilkinson 2b76f837b4 Upgrade to Byte Buddy 1.10.10 
Closes gh-21274
 2020-04-30 19:46:45 +01:00
Andy Wilkinson 04c7132eb3 Rename customize to reflect type that it customizes 
See gh-20961
 2020-04-30 19:43:52 +01:00
Scott Frederick 1c11e163c7 Fix Maven plugin command-line examples 
Fixes gh-21078
 2020-04-30 12:19:14 -05:00
Andy Wilkinson 83e4bb39b6 Add transaction auto-configuration to @DataMongoTest 
Closes gh-20182
 2020-04-30 15:05:23 +01:00
Stephane Nicoll 52fbf47e7f Upgrade to Flyway 6.4.1 
Closes gh-21269
 2020-04-30 15:35:48 +02:00
Stephane Nicoll 679679ad5c Merge branch '2.2.x' 2020-04-30 15:24:46 +02:00
Stephane Nicoll 6051a27bd7 Upgrade to Spring Integration 5.2.6 
Closes gh-20950
 2020-04-30 15:24:19 +02:00