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

4797 Commits

Author SHA1 Message Date
Stephane Nicoll 982b74a9b0 Fix property duplication 2015-06-11 10:32:06 +02:00
Stephane Nicoll fcb45a4bb7 Polish devtools documentation 
See gh-3088
 2015-06-11 09:33:09 +02:00
Phillip Webb e687c9456f Fix documentation bookmarks 2015-06-10 23:32:30 -07:00
Phillip Webb 992a56957f Document spring-boot-devtools module 
Fixes gh-3088
 2015-06-10 22:06:19 -07:00
Phillip Webb f0bba46d45 Tweak devtools restart exclusion patterns 2015-06-10 22:06:03 -07:00
Phillip Webb 88c693c6e1 Provide a way to disable the Restarter 
Allow the Restarter to be disabled via a System property.

Fixes gh-3173
 2015-06-10 13:10:00 -07:00
Phillip Webb b57802190d Polish 2015-06-10 13:09:41 -07:00
Phillip Webb ad7ed1dbae Formatting 2015-06-10 11:26:39 -07:00
Andy Wilkinson 6e79677df8 Merge branch '1.2.x' 2015-06-10 17:53:56 +01:00
Andy Wilkinson defceec90c Reinstate support for spring.groovy.template.configuration.* 
Previously, spring.groovy.template.configuration.* was mapped onto both
GroovyTemplateProperties.configuration and GroovyMarkupConfigurer. The
former being a Map and the latter being specific type with getters and
setters. This clash caused problems with the IDE support.

GroovyTemplateProperties.configuration appeared to be dead code so it
was removed in 326bdf2. Unfortunately this broke the use of
spring.groovy.template.configuration.* properties as
GroovyTemplateProperties uses a prefix of spring.groovy.template and it
no longer had a configuration property.

This commit addresses the problem by updating GroovyTemplateProperties
to ignore unknown fields. This allows
spring.groovy.template.configuration.* properties to be used and bound
to GroovyMarkupConfigurer without reintroducing the clash which prompted
the initial change.

Closes gh-3198
 2015-06-10 17:53:45 +01:00
Stephane Nicoll f87b2be2f9 Update default JMX name used by Maven plugin 
Closes gh-3124
 2015-06-10 17:31:06 +02:00
Andy Wilkinson 5defa42436 Update AetherGrapeEngineTests to only use milestone repo when needed 
Closes gh-3051
 2015-06-10 16:19:07 +01:00
Stephane Nicoll bd3a40c0ea Polish class name 2015-06-10 15:52:42 +02:00
Andy Wilkinson 168d05d4dd Upgrade to mongo-java-driver 2.13.2 
Closes gh-3195
 2015-06-10 14:26:09 +01:00
Andy Wilkinson f73d86e700 Upgrade to Elasticsearch 1.5.2 
Closes gh-3194
 2015-06-10 14:26:09 +01:00
Andy Wilkinson ae64d84b15 Upgrade to Jolokia 1.3.1 2015-06-10 14:26:08 +01:00
Andy Wilkinson c7544094f7 Upgrade to Jersey 2.18 
Closes gh-3192
 2015-06-10 14:26:08 +01:00
Andy Wilkinson ba90ab1f42 Upgrade to HttpClient 4.5 
Closes gh-3189
 2015-06-10 14:26:08 +01:00
Andy Wilkinson 4434bccbb8 Upgrade to org.apache.httpcomponents:httpasyncclient 4.1 
Closes gh-3188
 2015-06-10 14:26:08 +01:00
Andy Wilkinson f55128892b Upgrade to commons-pool2 2.4.1 
Closes gh-3187
 2015-06-10 14:26:08 +01:00
Andy Wilkinson d819cdd24f Upgrade to Joda Time 2.8 
Closes gh-3186
 2015-06-10 14:26:08 +01:00
Andy Wilkinson b919e4a6b4 Upgrade to Undertow 1.2.7.Final 
Closes gh-3185
 2015-06-10 14:26:08 +01:00
Andy Wilkinson e391591883 Upgrade to Reactor and Reactor Spring 2.0.3.RELEASE 
Closes gh-3184
 2015-06-10 14:26:07 +01:00
Andy Wilkinson 6d108436c0 Upgrade to HikariCP 2.3.8 
Closes gh-3183
 2015-06-10 14:26:07 +01:00
Andy Wilkinson 9943f28f0d Upgrade to sendgrid-java 2.2.2 
Closes gh-3182
 2015-06-10 14:26:07 +01:00
Andy Wilkinson 312169804b Update to Jackson 2.5.4 
Closes gh-3180
 2015-06-10 14:26:07 +01:00
Stephane Nicoll ea3816b550 Fix typo 2015-06-10 15:11:19 +02:00
Stephane Nicoll c1dea3797a Add documentation for SpringApplicationAdminMXBean 
Closes gh-3179
 2015-06-10 13:46:37 +02:00
Andy Wilkinson bfc0a3f154 Merge branch '1.2.x' 2015-06-10 12:27:07 +01:00
Andy Wilkinson ad7a1d9a69 Upgrade to Spring Integration 4.1.5.RELEASE 
Closes gh-3176
 2015-06-10 11:36:49 +01:00
Andy Wilkinson 4b02896b1d Upgrade to Jetty 9.2.11.v20150529 
Closes gh-3191
 2015-06-10 11:35:37 +01:00
Andy Wilkinson 0ad93c77d3 Update to AspectJ 1.8.6 
Closes gh-3190
 2015-06-10 11:34:34 +01:00
Stephane Nicoll e0787cbaf0 Polish 
Review 105039c that still refer to "lifecycle" instead of "admin". In
particular, harmonized the configuration properties.

Closes gh-3124
 2015-06-10 11:28:47 +02:00
Stephane Nicoll 18c65f6e63 Merge branch '1.2.x' 2015-06-10 10:31:00 +02:00
Lugi Cardito a37e983296 Create output directory if necessary 
If the `repackage` goal defines an output directory that does not exist,
the maven plugin now creates it.

Closes gh-3136
 2015-06-10 10:27:53 +02:00
Phillip Webb d0fd6145b1 Fix CacheType outer class tangle 
Fixes gh-3168
 2015-06-09 17:22:32 -07:00
Phillip Webb 5312be4a25 Fix CLI package tangle 
Remove explicit TestFailedException catch in CommandRunner and instead
rely on the fact that TestFailedException extends CommandException.

Fixes gh-3167
 2015-06-09 16:41:20 -07:00
Phillip Webb 105039cdb2 Rename SpringApplicationLifecycle => Admin 
Rename SpringApplicationLifecycle JMX beans to SpringApplicationAdmin
and relocate to a dedicated package.

Fixes gh-3124
 2015-06-09 16:06:28 -07:00
Phillip Webb f8f4bd6c95 Fix Javadoc warning 2015-06-09 15:42:34 -07:00
Phillip Webb cc8120f9eb Use bean classloader for Mongo entity scanning 
Fixes gh-3162
 2015-06-09 13:34:10 -07:00
Andy Wilkinson da5ed8f545 Provide dependency management for all of Spring Security OAuth 
Closes gh-3159
 2015-06-09 15:34:10 +01:00
Andy Wilkinson 0a42a0e0d6 Merge branch '1.2.x' 2015-06-09 15:33:44 +01:00
Andy Wilkinson 4a36c2e041 Increase the timeout period for container startup in deployment tests 
The build currently fails intermittently when an external container,
usually TomEE or Wildfly, fails to start within the default timeout
period of two minutes. This commit updates the timeout to 5 minutes for
all containers (Tomcat, TomEE and Wildfly) in the hope that it will
help to stabilise the CI build.
 2015-06-09 15:33:38 +01:00
Andy Wilkinson b6a8401566 Merge branch '1.2.x' 2015-06-09 14:19:58 +01:00
Andy Wilkinson b95a7cbdc4 Polishing: use tabs, not spaces 2015-06-09 14:18:45 +01:00
Stephane Nicoll 6bc4df5690 Fix meta-data for spring.devtools.remote 
See gh-3086
 2015-06-09 14:01:56 +02:00
Andy Wilkinson bdfe5d19a5 Merge branch '1.2.x' 2015-06-09 11:28:41 +01:00
Eddú Meléndez 827c84169b Upgrade to Liquibase 3.3.5 
Closes gh-3122
 2015-06-09 11:27:18 +01:00
Phillip Webb c4dc381a21 Attempt to fix failing build 2015-06-09 00:03:23 -07:00
Phillip Webb 9929e39124 Allow devtools properties in `user.home` 
Support loading a `.spring-boot-devtools.properties` file from the
users home folder. The property file can be used to customize settings
that make sense on a per-user basis, but might not want to be checked
into the project.

Fixes gh-3151
 2015-06-08 23:46:24 -07:00