fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,377 Commits 22 Branches 339 Tags
Commit Graph

1892 Commits

Author SHA1 Message Date
Andy Wilkinson
c16f99f782 Revert "Upgrade to Ehcache 2.10.5" in 2.0 as well 
See gh-13056
 2018-05-04 16:01:39 +01:00
Stephane Nicoll
18b1e8da60 Merge branch '1.5.x' into 2.0.x 2018-05-04 16:57:12 +02:00
Stephane Nicoll
959c569199 Merge branch '1.5.x' into 2.0.x 2018-05-04 16:15:10 +02:00
Stephane Nicoll
126f928f36 Polish "Improve Spring Session docs" 
Closes gh-13061
 2018-05-04 14:26:51 +02:00
Vedran Pavic
370160720d Improve Spring Session docs 
See gh-13061
 2018-05-04 14:26:39 +02:00
Andy Wilkinson
2bcf29913d Skip building the Gradle plugin on Java 9 as well as 10 
Upgrading the JDK 9-based build to use JDK 9.0.4 has revealed that
Gradle 4.0.x doesn't work with it as it fails to parse the 9.0.4
version number.

This commit disables building the Gradle plugin on Java 9 (as we
had already done for Java 10) until we decide what to do
(see gh-12333).
 2018-05-04 11:40:35 +01:00
Andy Wilkinson
a1f3e7970c Merge branch '1.5.x' into 2.0.x 2018-05-04 10:03:54 +01:00
Phillip Webb
2d70a7ae5e Polish caught exception names 
Prefer `ex` over `e`.
 2018-05-03 22:43:32 -07:00
Phillip Webb
41efea51a7 Polish ternary expressions 
Consistently format ternary expressions and always favor `!=` as the
the check.
 2018-05-03 22:43:12 -07:00
Phillip Webb
bbf94c22da Polish 2018-05-03 22:42:49 -07:00
Phillip Webb
e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Stephane Nicoll
700ec6b840 Polish "Complete SSL configuration for Kafka" 
Closes gh-13031
 2018-05-03 15:50:33 +02:00
Toshiaki Maki
d208641c59 Complete SSL configuration for Kafka 
See gh-13031
 2018-05-03 15:38:49 +02:00
Andy Wilkinson
f5fabbc1b9 Remove the use of internal API from Gradle Plugin's BootJar 
Closes gh-13037
 2018-05-03 11:34:42 +01:00
Stephane Nicoll
69ab956e8b Stop assuming datasource creation failure originates from auto-config 
There are documented way to reuse bits of the infrastructure in user
config to offer similar datasource configuration. If that fails, the
regular failure there will kick in.

This commit improves `DataSourceBeanCreationFailureAnalyzer` to not
misguide users that the auto-configuration has failed. Rather, it
describes what has failed in a more generic way.

Closes gh-12947
 2018-05-03 11:46:27 +02:00
Stephane Nicoll
b3ad902902 Merge branch '1.5.x' into 2.0.x 2018-05-03 11:14:42 +02:00
Johnny Lim
e7d2f22911 Polish IgnoreTopLevelConverterNotFoundBindHandlerTests 
Closes gh-13022
 2018-05-02 16:12:37 +02:00
Johnny Lim
12cdc8b0e0 Fix @since for IgnoreTopLevelConverterNotFoundBindHandler 
Closes gh-13019
 2018-05-02 16:11:37 +02:00
Stephane Nicoll
7cca56e15b Upgrade to HikariCP 2.7.9 
Closes gh-12783
 2018-05-02 16:09:02 +02:00
Stephane Nicoll
d6244889f5 Add default value for "spring.flyway.locations" 
See gh-12193
 2018-05-02 16:07:38 +02:00
Stephane Nicoll
79c222da78 Allow to provide manual metadata for keys that are not unique 
Closes gh-12193
 2018-05-02 16:04:02 +02:00
Stephane Nicoll
782d8c63da Merge branch '1.5.x' into 2.0.x 2018-05-02 15:59:56 +02:00
Andy Wilkinson
f019d5c85b Merge branch '1.5.x' into 2.0.x 2018-05-02 12:22:04 +01:00
Andy Wilkinson
0a9d950a44 Start building against Spring Kafka 2.1.6 snapshots 
See gh-13018
 2018-05-02 11:32:26 +01:00
Andy Wilkinson
2a8eb2c113 Start building against Spring Integration 5.0.5 snapshots 
See gh-13016
 2018-05-02 11:31:29 +01:00
Andy Wilkinson
c50687758e Start building against Spring Data Kay SR7 snapshots 
See gh-13017
 2018-05-02 11:30:53 +01:00
Andy Wilkinson
0d67ca1e81 Starting building against Spring Framework 5.0.6 snapshots 
See gh-13021
 2018-05-02 11:29:25 +01:00
Andy Wilkinson
49089546f8 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:57:29 +01:00
Stephane Nicoll
fbf8f57773 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:41:24 +02:00
Madhura Bhave
aad279208e Throw exception if RandomAccessData tries to read beyond EOF 
Fixes gh-12986
 2018-05-01 16:35:43 -07:00
Madhura Bhave
d268b2102f Fix typo 2018-05-01 11:33:47 -07:00
Stephane Nicoll
9f7be62687 Backport polish commit "22b99a90" 2018-05-01 11:33:26 -07:00
Andy Wilkinson
d5841982d9 Upgrade to Testcontainers 1.7.2 
See gh-12821
 2018-05-01 09:25:04 +01:00
Johnny Lim
d8700522d3 Rename nested *AutoConfiguration classes to *Configuration 
Closes gh-12989
 2018-04-30 16:50:18 +02:00
Johnny Lim
a723ac95a9 Polish 
Closes gh-12999
 2018-04-30 16:44:46 +02:00
Yaman Jain
50ca33ecd2 Fix typo 
Closes gh-12996
 2018-04-30 16:42:22 +02:00
Sebastien Deleuze
933f0bbca8 Upgrade to Kotlin 1.2.41 
Includes KT-23973 critical regression fix.
 2018-04-30 12:25:00 +01:00
Madhura Bhave
0385bd4131 Use spring.session.timeout for Spring Session timeout 
Fallback to server.servlet.session.timeout for backwards compatibility.

Fixes gh-12906
 2018-04-27 13:16:17 -07:00
Stephane Nicoll
36fb078935 Merge branch '1.5.x' into 2.0.x 2018-04-27 10:19:45 +02:00
Johnny Lim
b941c5f1a6 Polish 
Closes gh-12981
 2018-04-27 09:29:16 +02:00
Madhura Bhave
f2d8ca8b3a Fix failing NettyReactiveWebServerFactoryTests 
NettyReactiveWebServerFactoryTests.portInUseExceptionIsThrownWhenPortIsAlreadyInUse
started failing on CI following this change in reactor netty:
e6634c27f6
Instead of a `BindException`, a `NativeIoException` is thrown. Since that Exception
is for internal use only, we throw a generic `WebServerException`
instead of the `PortInUseException`.
 2018-04-26 15:39:08 -07:00
Madhura Bhave
24ce3ecb43 Fix typo in docs 2018-04-26 13:43:51 -07:00
Madhura Bhave
228c85fe67 Improve List and Map binding documentation 
Closes gh-12444
 2018-04-26 12:18:49 -07:00
Stephane Nicoll
fbe88c483e Prevent rabbitmq starter to bring webflux on the classpath 
This commit excludes `com.rabbitmq:http-client` from `spring-rabbit` as
the former brings spring webflux for an optional feature. This also
prevents Spring Boot to consider that a web server should be started as
all the necessary pieces are unexpectedly present.

Closes gh-12853
 2018-04-26 16:44:42 +02:00
Stephane Nicoll
9cf8080a17 Polish "Document Kotlin custom metadata generation" 
Closes gh-12960
 2018-04-25 17:19:55 +02:00
sdeleuze
c24e7a5930 Document Kotlin custom metadata generation 
See gh-12960
 2018-04-25 17:19:38 +02:00
Andy Wilkinson
a358f3f0e8 Merge branch '1.5.x' into 2.0.x 2018-04-25 11:58:31 +01:00
Stephane Nicoll
11ad9bfebf Upgrade version of gradle-git-properties in doc 
Closes gh-12955
 2018-04-25 09:43:19 +02:00
Stephane Nicoll
55ef9e6dc9 Deprecate excludeArtifactIds 
While being able to exclude all artifacts of a given group is a handy
feature, excluding all artifacts with a given artifactId does not make
much sense as it should refer to a single artifact anyway. Also the
general "exclude" mechanism is meant to do the exact same thing.

Closes gh-12885
 2018-04-24 13:25:58 +02:00
Andy Wilkinson
c9f04c3977 Avoid race between container starting and getting mapped port 2018-04-24 11:03:54 +01:00