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

1985 Commits

Author SHA1 Message Date
Phillip Webb dba73d76b8 Merge branch '1.5.x' into 2.0.x 2018-05-26 08:43:27 -07:00
Arnaud Heritier b60eadb10b Add missing semicolon in example 
Closes gh-13266
 2018-05-26 12:44:11 +02:00
Phillip Webb 6f0ccc64a5 Fix checkstyle violations 2018-05-25 23:03:17 -07:00
Phillip Webb 9fd3b9103a Format code 2018-05-25 23:02:45 -07:00
Phillip Webb e544922dd7 Merge branch '1.5.x' into 2.0.x 2018-05-25 23:02:08 -07:00
Phillip Webb 9c5f207e22 Fix merge error 2018-05-25 20:57:46 -07:00
Phillip Webb 21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Andrea Vacondio aed118c410 Fix documentation error 
Closes gh-13260
 2018-05-25 16:43:35 +02:00
Madhura Bhave 552878c431 Fix javadoc 2018-05-25 10:37:39 +02:00
Stephane Nicoll a5b53b263e Merge branch '1.5.x' into 2.0.x 2018-05-24 11:43:48 +02:00
Stephane Nicoll 585135a280 Polish 2018-05-22 13:40:40 +02:00
Stephane Nicoll d5abd57a91 Remove deprecated use of spring.main.web-environment 
Closes gh-13231
 2018-05-22 13:39:02 +02:00
Stephane Nicoll a124379dd9 Remove use of deprecated `web` methods 
Closes gh-13231
 2018-05-22 12:51:06 +02:00
Phillip Webb 2dc4f1df00 Polish 2018-05-21 21:32:42 -07:00
Phillip Webb 6d8b4710d7 Merge branch '1.5.x' into 2.0.x 2018-05-21 17:18:49 -07:00
Stephane Nicoll 300f6bf4d7 Polish contribution 
Closes gh-13208
 2018-05-18 14:20:31 +02:00
Mihhail Lapushkin d31dbac69e Support custom UriTemplateHandler in LocalHostUriTemplateHandler 
See gh-13208
 2018-05-18 14:19:01 +02:00
Stephane Nicoll 48cf025093 Polish 2018-05-18 13:42:45 +02:00
Stephane Nicoll 6893be5479 Make sure that RabbitMQ metrics are configured early 
The ConnectionFactory can be used early in user configuration to
configure an `Exchange`. Such connection may not hold the proper
MetricCollector and can be cached, leading to missed metrics
information.

This commit moves the configuration of RabbitMQ metrics to a
BeanPostProcessor so that the proper MetricCollector is configured
before any connection is created.

Closes gh-12855
 2018-05-18 11:54:11 +02:00
Stephane Nicoll 125b5974c0 Merge branch '1.5.x' into 2.0.x 2018-05-17 16:17:55 +02:00
Johnny Lim 75639aa682 Polish 
Closes gh-13192
 2018-05-17 15:29:50 +02:00
Stephane Nicoll 1d2edc1d37 Fix wrong reference to WebApplicationType 
Closes gh-13195
 2018-05-17 09:35:07 +02:00
Stephane Nicoll 7b7e802129 Merge branch '1.5.x' into 2.0.x 2018-05-16 13:16:54 +02:00
Johnny Lim 652bbf4ab2 Polish DefaultErrorWebExceptionHandler.renderErrorView() 
Closes gh-13174
 2018-05-16 09:28:26 +02:00
Johnny Lim b9aa934d78 Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue() 
Closes gh-13171
 2018-05-15 15:09:35 +02:00
Andy Wilkinson be0b8eb871 Merge branch '1.5.x' into 2.0.x 2018-05-15 10:28:46 +01:00
Andy Wilkinson 8b028e30d3 Merge branch '1.5.x' into 2.0.x 2018-05-15 09:18:01 +01:00
Andy Wilkinson 73e525a280 Merge branch '1.5.x' into 2.0.x 2018-05-14 20:07:46 +01:00
Andy Wilkinson cddc2b4483 Merge branch '1.5.x' into 2.0.x 2018-05-14 17:54:31 +01:00
Stephane Nicoll a3a6a2b291 Polish "Add CLI manifest for Scoop" 
Closes gh-12541
 2018-05-14 18:20:57 +02:00
Andrey Saksonov daccdbb18d Add CLI manifest for Scoop 
See gh-12541
 2018-05-14 18:00:32 +02:00
Stephane Nicoll 2be1c8f527 Polish "Set classloader for JMX endpoints to application classloader" 
Closes gh-12209
 2018-05-14 17:41:47 +02:00
David Herberth e44c81672f Set classloader for JMX endpoints to application classloader 
See gh-12209
 2018-05-14 17:41:31 +02:00
Sebastien Deleuze d747d43b23 Update Kotlin refdoc with the new tutorial 
Closes gh-13161
 2018-05-14 16:03:46 +02:00
Andy Wilkinson 285203d272 Provide dependency management for Hibernate's JPA API module 
Closes gh-13154
 2018-05-14 11:43:31 +01:00
Stephane Nicoll caa271dcc1 Merge branch '1.5.x' into 2.0.x 2018-05-14 11:08:59 +02:00
Stephane Nicoll 8f53c2e2bb Support for custom comment prefix 
Some Quartz initialization scripts have comments in a different format.

This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.

Closes gh-13041
 2018-05-14 09:32:42 +02:00
Johnny Lim 3dd2f5bb05 Polish 
See gh-13148
 2018-05-14 08:19:10 +02:00
Johnny Lim aa60d60b8a Polish JpaProperties.determineDdlAuto() 
Closes gh-13036
 2018-05-14 08:13:06 +02:00
Andy Wilkinson 3992dacdc8 Bind empty string to empty collection or array of rich types 
Previously, when an empty String was bound to a collection or
array of rich types it would fail as there was no converter capable
of creating a Collection<RichType> or RichType[] from the String.

This commit updates IndexedElementsBinder to apply special treatment
to empty String values. Now, when such a value is being processed,
an empty Collection or array is the result.

Closes gh-12965
 2018-05-11 16:41:37 +01:00
Andy Wilkinson 45f4e8795e Merge branch '1.5.x' into 2.0.x 2018-05-11 13:32:08 +01:00
Vedran Pavic a08fa27c39 Add .gitignore for Gradle Plugin module 
Closes gh-13137
 2018-05-11 14:28:02 +02:00
dreis2211 e6a23fa3ff Remove unnecessary semicolons 
Closes gh-13144
 2018-05-11 14:23:47 +02:00
Andy Wilkinson 972d952716 Merge branch '1.5.x' into 2.0.x 2018-05-11 11:54:12 +01:00
Andy Wilkinson 7913d9b599 Add methods to BootJar for adding content to BOOT-INF 
Closes gh-13000
 2018-05-11 11:14:14 +01:00
Andy Wilkinson d9d7499ae6 Merge branch '1.5.x' into 2.0.x 2018-05-11 10:31:52 +01:00
Johnny Lim 75e591e76e Polish 
Closes gh-13130
 2018-05-11 10:00:15 +02:00
Stephane Nicoll 4683940423 Merge branch '1.5.x' into 2.0.x 2018-05-11 09:56:54 +02:00
Stephane Nicoll 4bec3b7cd9 Polish 
See gh-13123
 2018-05-11 08:55:03 +02:00
Madhura Bhave 05cf8229d9 Fix tests 2018-05-10 11:50:43 -07:00