Commit Graph

20635 Commits

Author SHA1 Message Date
dreis2211 23b09ecca6 Make dependency available for javadoc generation
See gh-17111
2019-06-12 08:18:26 +01:00
Andy Wilkinson 95d0e26c35 Fix command DevTools uses to shut down in-memory Derby DB
Closes gh-17099
2019-06-11 10:29:09 +01:00
Andy Wilkinson a243b56ade Merge branch '2.0.x' into 2.1.x 2019-06-08 08:18:56 +01:00
Andy Wilkinson 9d28238598 Update formatting of spring-boot-samples 2019-06-08 08:16:44 +01:00
Phillip Webb 80e5762457 Merge branch '2.0.x' into 2.1.x
Closes gh-17087
2019-06-07 20:59:29 -07:00
Phillip Webb da1d4b8c3b Run root nohttp checkstyle on CI
Closes gh-17081
2019-06-07 20:57:02 -07:00
Phillip Webb dd3d8b43cd Polish checkstyle settings 2019-06-07 20:55:55 -07:00
Phillip Webb fed11febec Fix checkstyle violations 2019-06-07 12:48:55 -07:00
Phillip Webb 866e2b712e Merge branch '2.0.x' into 2.1.x 2019-06-07 12:35:28 -07:00
Phillip Webb 2c8881a908 Merge branch '1.5.x' into 2.0.x 2019-06-07 12:34:13 -07:00
Andy Wilkinson fb24b5a684 Separate nottp checkstyle configuration
See gh-16682
2019-06-07 11:39:32 -07:00
Andy Wilkinson ede197fa55 Polish formatting
Fix formatting issues, primarily around header comments.
2019-06-07 11:33:42 -07:00
Andy Wilkinson 1098c60a44 Merge branch '2.0.x' into 2.1.x 2019-06-07 14:56:53 +01:00
Andy Wilkinson fad3644b68 Merge branch '1.5.x' into 2.0.x 2019-06-07 14:56:44 +01:00
Andy Wilkinson 5a22ae6340 Suppress NoHTTP checks on Shade-generated reduced dependency pom
Closes gh-17080
2019-06-07 14:55:55 +01:00
Andy Wilkinson 39b74b17f6 Merge branch '2.0.x' into 2.1.x
Closes gh-17083
2019-06-07 14:52:31 +01:00
Andy Wilkinson bdf5f48c71 Merge branch '1.5.x' into 2.0.x 2019-06-07 14:52:21 +01:00
Andy Wilkinson 1e863c082a Fix suppression for .jar, .git, .ico, .p12, .svg, and .png files
Closes gh-17082
2019-06-07 14:48:09 +01:00
Andy Wilkinson 612a929c19 Merge branch '2.0.x' into 2.1.x 2019-06-07 12:24:18 +01:00
Andy Wilkinson 5c21c68146 Merge branch '1.5.x' into 2.0.x 2019-06-07 12:23:34 +01:00
Andy Wilkinson 0c74b3cd14 Format deployment integration test source code
Closes gh-17077
2019-06-07 12:18:54 +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
Andy Wilkinson c6c139d980 Merge branch '1.5.x' into 2.0.x 2019-06-07 10:46:31 +01:00
Andy Wilkinson 8f1be4cded Upgrade to spring-javaformat 0.0.11 2019-06-07 09:44:58 +01:00
Phillip Webb 857b96b77d Merge branch '2.0.x' into 2.1.x 2019-06-04 16:09:02 -07:00
Phillip Webb 3f3d1d1768 Ignore Gradle plugin build output 2019-06-04 16:07:36 -07:00
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