root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
16,946 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

16946 Commits

Author SHA1 Message Date
Andy Wilkinson 65e6011b7f Merge branch '2.0.x' 2018-05-04 11:45:35 +01: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 a3ac21a231 Merge branch '2.0.x' 2018-05-04 10:25:18 +01:00
Andy Wilkinson d70434a27d Use 9.0.4-12-jdk for JDK 9-based CI 
Closes gh-13059
 2018-05-04 10:24:55 +01:00
Andy Wilkinson b4ccf5186b Merge branch '2.0.x' 2018-05-04 10:04:19 +01:00
Andy Wilkinson a1f3e7970c Merge branch '1.5.x' into 2.0.x 2018-05-04 10:03:54 +01:00
Andy Wilkinson bcd2b7d60f Upgrade to Infinispan 8.2.11.Final 
Closes gh-13058
 2018-05-04 09:46:29 +01:00
Andy Wilkinson ebf1622b3a Upgrade to Tomcat 8.5.31 
Closes gh-13057
 2018-05-04 09:46:28 +01:00
Andy Wilkinson f78fd74bb9 Upgrade to Ehcache 2.10.5 
Closes gh-13056
 2018-05-04 09:46:27 +01:00
Andy Wilkinson f1ec54b3b6 Upgrade to Undertow 1.4.25.Final 
Closes gh-13055
 2018-05-04 09:46:27 +01:00
Andy Wilkinson 0fd5ef1632 Upgrade to Gson 2.8.4 
Closes gh-13054
 2018-05-04 09:46:26 +01:00
Andy Wilkinson a45d05347f Upgrade to Jackson 2.8.11.20180405 
Closes gh-13053
 2018-05-04 09:46:26 +01:00
Andy Wilkinson 208c4b9a35 Upgrade to GemFire 8.2.11 
Closes gh-13052
 2018-05-04 09:42:14 +01:00
Phillip Webb b6a2a46f78 Merge branch '2.0.x' 2018-05-03 23:54:42 -07: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 8c0c0ee55a Merge branch '2.0.x' 2018-05-03 12:44:58 -07:00
Phillip Webb e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Phillip Webb 4e96587dc8 Polish modifier declaration ordering 
Follow that Java language specification.
 2018-05-03 09:46:15 -07:00
Phillip Webb 64930d4e5b Polish caught exception names 
Prefer `ex` over `e`.
 2018-05-03 09:46:15 -07:00
Phillip Webb 3ee777e142 Polish ternary expressions 
Consistently format ternary expressions and always favor `!=` as the
the check.
 2018-05-03 09:46:15 -07:00
Phillip Webb 690f946b6d Polish 2018-05-03 09:46:14 -07:00
Stephane Nicoll 36a377764f Merge branch '2.0.x' 2018-05-03 15:53:32 +02:00
Stephane Nicoll 60e4e51fea Merge pull request #13031 from making:more-kafka-ssl-props 
* pr/13031:
  Polish "Complete SSL configuration for Kafka"
  Complete SSL configuration for Kafka
 2018-05-03 15:53:10 +02: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 4ea7d3a767 Merge branch '2.0.x' 2018-05-03 11:35:58 +01: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 921c037956 Merge branch '2.0.x' 2018-05-03 11:47:33 +02: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 ca1b637728 Merge branch '2.0.x' 2018-05-03 11:14:59 +02:00
Stephane Nicoll b3ad902902 Merge branch '1.5.x' into 2.0.x 2018-05-03 11:14:42 +02:00
Stephane Nicoll 830e523531 Clarify behavior of JMX in @SpringBootTest 
Closes gh-13008
 2018-05-03 11:06:55 +02:00
Madhura Bhave 868dc6e370 Merge branch '2.0.x' 2018-05-02 17:21:16 -07:00
Madhura Bhave 1fb51dcc0d Send Slack Notifications when build completes 
Closes gh-10790
 2018-05-02 17:19:36 -07:00
Madhura Bhave 1be616aebc Merge branch '2.0.x' 2018-05-02 14:35:08 -07:00
Madhura Bhave 04d6bc5119 Update email script to find status till one is found 
The determine-email-body script would only look at the previous commit's
status to determine whether to send a success email or not. If no status
was found (this happens when commits are pushed close to each other and CI
only runs the latest one), it would send a successful email even if the last
CI run was successful.
 2018-05-02 13:33:14 -07:00
Stephane Nicoll 33a6f6f807 Merge pull request #13007 from garyrussell:kafka22 
* pr/13007:
  Start building against Spring Kafka 2.2.0 snapshots
 2018-05-02 16:30:59 +02:00
Gary Russell 8cf34238d3 Start building against Spring Kafka 2.2.0 snapshots 
Closes gh-13007
 2018-05-02 16:15:08 +02:00
Stephane Nicoll eab2d4a404 Merge branch '2.0.x' 2018-05-02 16:13:31 +02:00
Stephane Nicoll ed594d7706 Merge pull request #13022 from izeye:polish-20180502 
* pr/13022:
  Polish IgnoreTopLevelConverterNotFoundBindHandlerTests
 2018-05-02 16:13:06 +02:00
Johnny Lim e7d2f22911 Polish IgnoreTopLevelConverterNotFoundBindHandlerTests 
Closes gh-13022
 2018-05-02 16:12:37 +02:00
Stephane Nicoll 11f178538e Merge pull request #13019 from izeye:patch-49 
* pr/13019:
  Fix @since for IgnoreTopLevelConverterNotFoundBindHandler
 2018-05-02 16:11:55 +02:00
Johnny Lim 12cdc8b0e0 Fix @since for IgnoreTopLevelConverterNotFoundBindHandler 
Closes gh-13019
 2018-05-02 16:11:37 +02:00
Stephane Nicoll 7879b38615 Merge branch '2.0.x' 2018-05-02 16:09:56 +02:00
Stephane Nicoll 7cca56e15b Upgrade to HikariCP 2.7.9 
Closes gh-12783
 2018-05-02 16:09:02 +02:00
Stephane Nicoll 4eeddbd889 Merge branch '2.0.x' 2018-05-02 16:08:03 +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