Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,834 Commits 20 Branches 322 Tags 258 MiB
7ed0faa574
Commit Graph

21834 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phillip Webb
791be953fe Merge branch 'spring-projects/2.1.x' 
Closes gh-17018
 2019-05-29 16:11:52 -07:00
Phillip Webb
8e268987ff Improve thread safety in property source cache 
Update `SpringIterableConfigurationPropertySource` so that they cache
and cache key are not stored in different fields. Prior to this commit
it was possible that the an incorrect cache could be returned from
because the key and cache were out of sync.

This commit also allows more lenient handling of ConcurrentModification
exceptions if they are thrown during cache retrieval.

Closes gh-17017
See gh-17013
 2019-05-29 16:05:24 -07:00
Phillip Webb
9d6695a9d9 Merge pull request #17012 from dreis2211 
* pr/17012:
  Add missing @Test annotation

Closes gh-17012
 2019-05-29 14:41:50 -07:00
dreis2211
38c21f58b8 Add missing @Test annotation 
See gh-17012
 2019-05-29 14:41:22 -07:00
Phillip Webb
c84c9409bd Polish 2019-05-29 14:41:01 -07:00
Phillip Webb
6509322bd8 Merge branch '2.1.x' 
Closes gh-17016
 2019-05-29 14:36:34 -07:00
Phillip Webb
e05799d963 Merge pull request #17005 from izeye 
* pr/17005:
  Handle all getters first in JavaBeanBinder

Closes gh-17005
 2019-05-29 14:36:00 -07:00
Johnny Lim
f52ab0040f Handle all getters first in JavaBeanBinder 
Update `JavaBeanBinder.addProperties` to add both `get` and `is` methods
before `set`.

See gh-17005
 2019-05-29 11:15:41 -07:00
Andy Wilkinson
e481eccd57 Merge branch '2.1.x' 
Closes gh-17006
 2019-05-29 14:19:57 +01:00
Andy Wilkinson
0b5bb6eb9d Merge pull request #17002 from Johnny Lim 
* gh-17002:
  Add a missing @Test in JavaBeanBinderTests

Closes gh-17002
 2019-05-29 14:19:45 +01:00
Johnny Lim
765b66c599 Add a missing @Test in JavaBeanBinderTests 
See gh-17002
 2019-05-29 14:17:41 +01:00
Andy Wilkinson
960c03dee5 Merge pull request #16850 from Ilya Lukyanovich 
* gh-16850:
  Polish "Auto-configure Flyway and Liquibase when there's a URL but no DataSource"
  Auto-configure Flyway and Liquibase when there's a URL but no DataSource

Closes gh-16850
 2019-05-29 11:03:02 +01:00
Andy Wilkinson
880721557b Polish "Auto-configure Flyway and Liquibase when there's a URL but no DataSource" 
See gh-16850
 2019-05-29 11:01:37 +01:00
ilya.lukyanovich@dataart.com
3ca73bf00d Auto-configure Flyway and Liquibase when there's a URL but no DataSource 
See gh-16850
 2019-05-29 11:01:26 +01:00
Andy Wilkinson
f59e337aba Merge pull request #16947 from Alan Gomes 
* gh-16947:
  Polish "Configure FluentConfiguration to use ResourceLoader's ClassLoader"
  Configure FluentConfiguration to use ResourceLoader's ClassLoader

Closes gh-16947
 2019-05-29 10:17:58 +01:00
Andy Wilkinson
69a298231c Polish "Configure FluentConfiguration to use ResourceLoader's ClassLoader" 
See gh-16947
 2019-05-29 10:11:24 +01:00
Alan Gomes
cc5bd51343 Configure FluentConfiguration to use ResourceLoader's ClassLoader 
See gh-16947
 2019-05-29 10:02:56 +01:00
Andy Wilkinson
898b7918c0 Merge branch '2.1.x' 
Closes gh-16914
 2019-05-29 09:57:06 +01:00
Andy Wilkinson
6b199c84d7 Upgrade to Jackson 2.9.9 
Closes gh-16910
 2019-05-29 09:02:25 +01:00
Stephane Nicoll
73a09a8aaa Merge pull request #16986 from izeye 
* pr/16986:
  Use MediaType.APPLICATION_CBOR constant
 2019-05-29 09:34:48 +02:00
Johnny Lim
0741e6470f Use MediaType.APPLICATION_CBOR constant 
See https://github.com/spring-projects/spring-framework/pull/23042

Closes gh-16986
 2019-05-29 09:21:15 +02:00
Andy Wilkinson
ecf7c817a6 Build and test the Gradle plugin with Java 11 and 12 
Closes gh-12333
 2019-05-29 07:20:34 +01:00
Andy Wilkinson
86380ab8db Add missing package-info.java files 2019-05-29 07:20:34 +01:00
Phillip Webb
eb38c3abb7 Fix test broken by additional customizer 
See gh-16498
 2019-05-28 18:18:25 -07:00
Phillip Webb
9a6415375d Polish 2019-05-28 17:00:25 -07:00
Phillip Webb
988f02d766 Merge branch '2.1.x' 
Closes gh-16996
 2019-05-28 16:46:09 -07:00
Phillip Webb
f380ba63eb Exclude Groovy MetaClass from property meta-data 
Update `TypeExcludeFilter` to exclude `groovy.lang.MetaClass`.

Closes gh-16981
 2019-05-28 16:42:42 -07:00
Phillip Webb
6d413afecf Merge branch '2.1.x' 
Closes gh-16995
 2019-05-28 16:31:36 -07:00
Phillip Webb
826b18f63e Merge pull request #16892 from jpmsilva 
* pr/16892:
  Polish "Allow Tomcat be destroyed regardless of exceptions"
  Allow Tomcat be destroyed regardless of exceptions
 2019-05-28 16:31:13 -07:00
Phillip Webb
09373622ca Polish "Allow Tomcat be destroyed regardless of exceptions" 
See gh-16892
 2019-05-28 16:15:26 -07:00
Joao Silva
2b33e31a7c Allow Tomcat be destroyed regardless of exceptions 
Update `TomcatWebServer` so that lifecycle exceptions are silently
swallowed when attempting shutdown. Prior to this commit it was
possible that a Tomcat instance might not be properly destroyed and
could leave non daemon threads running, which prevent the JVM from
exiting.

Fixes gh-16892
 2019-05-28 16:10:37 -07:00
Phillip Webb
f96dc33c0f Merge branch '2.1.x' 2019-05-28 16:02:41 -07:00
Phillip Webb
c5199322cb Merge pull request #16944 from cr0wst 
* pr/16944:
  Add Nexmo to list of third-party starters
 2019-05-28 16:02:24 -07:00
Steve Crow
e0e871c77b Add Nexmo to list of third-party starters 
Closes gh-16944
 2019-05-28 16:01:33 -07:00
Phillip Webb
e86bb74074 Merge branch '2.1.x' 
Closes gh-16993
 2019-05-28 15:59:22 -07:00
Phillip Webb
e643515f05 Merge branch '2.1.x' 2019-05-28 15:58:56 -07:00
Phillip Webb
e01bcbb4a5 Merge pull request #16946 from phillipuniverse 
* pr/16946:
  Use a regex that captures numbers and qualifiers
 2019-05-28 15:57:11 -07:00
Phillip Verheyden
2149ba4051 Use a regex that captures numbers and qualifiers 
Fix the regular expression used in the devtools documentation to
include a version number pattern.

Closes gh-16946
 2019-05-28 15:55:00 -07:00
Phillip Webb
af1720aa2e Fix checkstyle issue 2019-05-28 15:52:00 -07:00
Phillip Webb
6e9f2e42af Merge branch '2.1.x' 
Closes gh-16992
 2019-05-28 15:06:16 -07:00
Phillip Webb
a51996fc10 Merge pull request #16889 from vpavic 
* pr/16889:
  Polish "Fix NoClassDefFound when missing Spring Security"
  Fix NoClassDefFound when missing Spring Security
 2019-05-28 15:00:52 -07:00
Phillip Webb
6913ea24b0 Polish "Fix NoClassDefFound when missing Spring Security" 
See gh-16889
 2019-05-28 14:56:58 -07:00
Vedran Pavic
e9bd11ee83 Fix NoClassDefFound when missing Spring Security 
Update Spring Session auto-configuration to ensure that the
`DefaultCookieSerializer` doesn't break when Spring Security is not
present on the classpath.

Closes gh-16889
 2019-05-28 14:55:18 -07:00
Phillip Webb
c080a4c7f2 Merge branch '2.1.x' 2019-05-28 14:34:50 -07:00
Phillip Webb
5fc67c545c Work around Framework regression in handling of null model values 
See https://github.com/spring-projects/spring-framework/issues/23038.
 2019-05-28 14:33:08 -07:00
Phillip Webb
df55d73bff Merge branch '2.1.x' 
Closes gh-16990
 2019-05-28 13:49:34 -07:00
Phillip Webb
8fe18303cc Merge pull request #16971 from nosan 
* pr/16971:
  Polish "Fix Spring Data Cassandra auto-configure condition"
  Fix Spring Data Cassandra auto-configure condition
 2019-05-28 13:49:07 -07:00
Phillip Webb
278a0866cd Polish "Fix Spring Data Cassandra auto-configure condition" 
See gh-16971
 2019-05-28 13:47:45 -07:00
Dmytro Nosan
be435130e6 Fix Spring Data Cassandra auto-configure condition 
Update `CassandraDataAutoConfiguration` do that it's only applied when
a `Cluster` bean is found.

Fixes gh-16971
 2019-05-28 13:47:40 -07:00
Phillip Webb
a819b1c49c Merge branch '2.1.x' 
Closes gh-16989
 2019-05-28 13:30:59 -07:00