Commit Graph

20609 Commits

Author SHA1 Message Date
Phillip Webb
0ef331018e Merge branch '2.0.x' into 2.1.x 2019-06-04 14:30:52 -07:00
Phillip Webb
7fc01971ed Merge branch '1.5.x' into 2.0.x 2019-06-04 14:20:25 -07:00
Phillip Webb
d548c5ed31 Fix checkstyle violations 2019-06-04 12:45:23 -07:00
Phillip Webb
e161c6f826 Broaden files covered by checkstyle
Closes gh-16682
2019-06-04 12:45:23 -07:00
Phillip Webb
930d110178 Merge branch '2.0.x' into 2.1.x 2019-06-04 08:55:31 -07:00
Phillip Webb
90468c4d53 Fix checkstyle violation in OAuth sample 2019-06-04 08:53:06 -07:00
Phillip Webb
ccfbd03482 Merge branch '2.0.x' into 2.1.x 2019-06-04 02:07:14 -07:00
Phillip Webb
b442d3b906 Merge branch '1.5.x' into 2.0.x 2019-06-04 01:49:03 -07:00
Phillip Webb
80d8a5cfa2 Add nohttp checkstyle rule
Closes gh-16682
2019-06-04 00:52:45 -07:00
Phillip Webb
72268a266b Switch livereload links to https 2019-06-04 00:52:45 -07:00
Phillip Webb
cd537155a9 Use https for Thymeleaf xmlns:layout 2019-06-04 00:52:45 -07:00
Phillip Webb
a99131f727 Polish resource files to all end with a new line 2019-06-04 00:52:45 -07:00
Phillip Webb
5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
Phillip Webb
e61f7a33a7 Add nohttp checkstyle rule
Closes gh-16682
2019-06-03 23:51:59 -07:00
Phillip Webb
e79c2cc8a7 Switch livereload links to https 2019-06-03 23:50:37 -07:00
Phillip Webb
0049f1985c Use https for Thymeleaf xmlns:layout 2019-06-03 23:50:06 -07:00
Phillip Webb
32068c21a3 Polish resource files to all end with a new line 2019-06-03 23:48:43 -07:00
Phillip Webb
d057f49618 Restore JUnit assert checkstyle restrictions
Closes gh-16949
2019-05-29 16:14:55 -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
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
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
6b199c84d7 Upgrade to Jackson 2.9.9
Closes gh-16910
2019-05-29 09:02:25 +01: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
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
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
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
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
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
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
ef09ee5dea Add new line when rewriting git message
Update the forward merge script to add an additional new line when
rewiring the commit message. Prior this this commit, if an additional
line immediately followed the "Fixes ... in ..." pattern it would be
appended to the end of the rewritten fixes line.

Closes gh-16861
2019-05-28 13:30:13 -07:00
Phillip Webb
07ebfc036b Polish 2019-05-28 13:17:56 -07:00
Phillip Webb
b1e90fdca9 Merge pull request #16974 from izeye
* pr/16974:
  Use actual resolvedType when checking Binder cache
2019-05-28 13:17:44 -07:00
Johnny Lim
e2f69d040a Use actual resolvedType when checking Binder cache
Update `JavaBeanBinder` so that the `isOfDifferentType` method checks
both the actual type and the resolved type. Prior to this commit, it
was possible that when `canCallGetValue` is `true` the `resolvedType`
could be different from `type.resolve`.

Closes gh-16974
2019-05-28 13:13:08 -07:00
Stephane Nicoll
2c364ceb89 Fix wrong ApplicationContext import
Closes gh-16978
2019-05-27 16:59:12 +02:00
Andy Wilkinson
5a5b5a0d8b Merge pull request #16938 from Robeatoz
* gh-16938:
  Correct name and description of spring-boot-project module

Closes gh-16938
2019-05-25 08:10:56 +01:00
Robeatoz
9f248c6043 Correct name and description of spring-boot-project module
This commit corrects the Maven project name and description of spring-boot-project to
avoid the already used name "Spring Boot Build".

See gh-16938
2019-05-25 08:08:36 +01:00
Andy Wilkinson
d964357bfa Start building against snapshots for Reactor Californium-SR9
See gh-16962
2019-05-25 07:49:15 +01:00
Andy Wilkinson
636113823c Start building against Spring Framework 5.1.8 snapshots
See gh-16961
2019-05-25 07:48:19 +01:00
Andy Wilkinson
60d60a8304 Use basedir as forked JVM's working directory in Maven plugin
Fixes gh-16811
2019-05-24 20:49:03 +01:00