root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity
8,962 Commits 24 Branches 353 Tags 292 MiB
Commit Graph

8962 Commits

Author SHA1 Message Date
Andy Wilkinson fe10ea73b0 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:58:42 +01:00
Andy Wilkinson ad3e5c04bb Add a second, portal-compatible ID to the Gradle plugin 
To be compatible with Gradle's plugin portal, plugins must have an
ID that uses a reverse domain name. This means that spring-boot is
not compatible.

This commit introduces a new ID, org.springframework.boot, and
deprecates the old ID.

Closes gh-6997
 2016-10-05 14:58:26 +01:00
Stephane Nicoll cf28663cd7 Deprecate commons-dbcp 1 
Closes gh-6787
 2016-10-05 15:21:09 +02:00
Stephane Nicoll 0b9283c3cd Merge pull request #6367 from henrikerola:gh-6351 
* pr/6367:
  Polish contribution
  "spring war" should copy resources to WEB-INF/classes
 2016-10-05 13:48:37 +02:00
Stephane Nicoll 2d75cc79c0 Polish contribution 
Closes gh-6367
 2016-10-05 13:47:50 +02:00
Henri Kerola d07f689446 "spring war" should copy resources to WEB-INF/classes 
Closes gh-6351
 2016-10-05 13:36:25 +02:00
Stephane Nicoll 07690bab25 Allow customization of the auto-configured JmsTemplate 
Closes gh-6825
 2016-10-04 15:00:42 +02:00
Stephane Nicoll 4b2970606e Merge branch '1.4.x' into 1.5.x 2016-10-04 13:37:57 +02:00
Stephane Nicoll 7019894f0e Clarify the role of spring-boot-starter-cache 
The cache abstraction is a core feature of the Spring Framework. Basic
features such as `@EnableCaching` are therefore available by default with
no extra dependencies necessary.

However, the actual cache adapters for JCache, Ehcache 2.x, Caffeine and
Guava are located in a separated module, `spring-context-support`. Spring
Boot provides that artifact via the `spring-boot-starter-cache` starter.

It is quite easy to "only" add the cache library dependencies and forget
about this extra dependencies since `@EnableCaching` is available by
default. This commit clarifies the role of the starer in each section so
that it is more obvious. We're already explaining this at the beginning
of the section but it seems that's not enough.

Closes gh-7071
 2016-10-04 13:37:29 +02:00
Stephane Nicoll d0e49cc413 Merge branch '1.4.x' into 1.5.x 2016-10-04 13:05:18 +02:00
Stephane Nicoll 8d2aedc5a8 Merge branch '1.3.x' into 1.4.x 2016-10-04 13:05:01 +02:00
Stephane Nicoll 7f1118b87a Merge pull request #7073 from garyrussell:si4210 
* pr/7073:
  Upgrade to Spring Integration 4.2.11
 2016-10-04 13:04:39 +02:00
Gary Russell 0ffc7dc13f Upgrade to Spring Integration 4.2.11 
Closes gh-7073
 2016-10-04 13:04:15 +02:00
Stephane Nicoll 58050fb72f Merge branch '1.4.x' into 1.5.x 
# Conflicts:
#	spring-boot-dependencies/pom.xml
 2016-10-04 13:01:46 +02:00
Stephane Nicoll dcb3f31901 Merge pull request #7074 from garyrussell:si433-14 
* pr/7074:
  Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
 2016-10-04 13:00:05 +02:00
Gary Russell ad3179b9ee Upgrade to Spring Integration 4.3.4, AMQP 1.6.3 
Closes gh-7074
 2016-10-04 12:59:41 +02:00
Stephane Nicoll dfb3675937 Merge pull request #7085 from dstine:docs-typos 
* pr/7085:
  Fix a typo
 2016-10-04 12:59:02 +02:00
Dan Stine 0926b66123 Fix a typo 
Closes gh-7085
 2016-10-04 12:58:37 +02:00
Phillip Webb 8fe755d281 Fixup parent POM version 2016-10-03 22:52:43 -07:00
Phillip Webb 6d11931421 Merge branch '1.4.x' into 1.5.x 2016-10-03 22:51:49 -07:00
Phillip Webb bd341cbac8 Polish 2016-10-03 22:51:21 -07:00
Phillip Webb a2315378d4 Formatting 2016-10-03 22:44:36 -07:00
Phillip Webb f2b0fa284e Merge branch '1.4.x' into 1.5.x 2016-10-03 22:38:22 -07:00
Phillip Webb cdeed8e934 Merge pull request #7089 from mbhave/gh-7065 
* pr/7089:
  Fix NoClassDefFoundError when Mockito is missing
 2016-10-03 22:27:42 -07:00
Madhura Bhave 16fe332f51 Fix NoClassDefFoundError when Mockito is missing 
Update MockReset class to check for the presence of the MockUtil class
before attempting to use it.

Fixes gh-7065
 2016-10-03 22:27:20 -07:00
Phillip Webb 3326841a97 Formatting 2016-10-03 22:19:35 -07:00
Phillip Webb 39ed0d4dfb Polish 2016-10-03 21:58:13 -07:00
Phillip Webb f59cc25e2b Fix eclipse warnings 2016-10-03 21:51:16 -07:00
Stephane Nicoll 6977dcaf44 Merge branch '1.4.x' into 1.5.x 2016-10-03 12:28:58 +02:00
Stephane Nicoll 9f7e97b23f Improve war to executable app documentation 
Closes gh-7040
 2016-10-03 12:28:25 +02:00
Stephane Nicoll e5bac8dadf Merge branch '1.4.x' into 1.5.x 2016-10-03 11:43:57 +02:00
Stephane Nicoll a9b610c4fc Deprecate ResourceLoaderAware callback 
Closes gh-6986
 2016-10-03 11:42:46 +02:00
Stephane Nicoll 8ad477537e Fail fast if both uri and client attributes are set 
Previously, an URI and individual client attributes can be set to
configure the mongo client. In such a scenario, the URI is ignored.

This commit changes the URI to be "null" and the creation of the client
to fail if both the uri and client attributes are set. If no client
attributes are set, the uri is used as before.

Closes gh-6739
 2016-10-03 11:29:20 +02:00
Stephane Nicoll 42adeda6a3 Merge branch '1.4.x' into 1.5.x 2016-10-03 11:04:06 +02:00
Stephane Nicoll dc067b0fc4 Update Ant sample’s spring-boot-antlib dependency during prepare 
Closes gh-6978
 2016-10-03 11:03:45 +02:00
Stephane Nicoll 3d9c56fbf3 Merge branch '1.4.x' into 1.5.x 
# Conflicts:
#	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java
#	spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
 2016-10-03 10:42:07 +02:00
Stephane Nicoll 8c1b736bb0 Fix list property to be mutable 
Closes gh-7068
 2016-10-03 10:40:46 +02:00
Stephane Nicoll e643fc5bd1 Merge branch '1.4.x' into 1.5.x 2016-10-02 11:08:33 +02:00
Stephane Nicoll 4dfdce5a49 Merge pull request #7081 from izeye:polish-20161002 
* pr/7081:
  Polish
 2016-10-02 11:08:13 +02:00
Johnny Lim 503d735fdd Polish 
Closes gh-7081
 2016-10-02 11:07:04 +02:00
Stephane Nicoll 75f475f2c8 Merge branch '1.4.x' into 1.5.x 2016-10-01 13:20:45 +02:00
Stephane Nicoll 8feef4560b Merge pull request #6991 from Stummi:patch-1 
* pr/6991:
  Fix thymeleaf-layout-dialect.version in doc
 2016-10-01 13:20:18 +02:00
Michael Stummvoll 914becac0e Fix thymeleaf-layout-dialect.version in doc 
Version 2.0.0 had serval bugs which broke compatibility to older
templates, so the guide should refer the fixed version instead.

Closes gh-6991
 2016-10-01 13:18:37 +02:00
Stephane Nicoll 7ffa499949 Merge branch '1.4.x' into 1.5.x 2016-09-30 10:52:44 +02:00
Stephane Nicoll e56119165e Close JestClient on shutdown 
Closes gh-7051
 2016-09-30 10:51:48 +02:00
Stephane Nicoll 8ed20068ca Fix list property to be mutable 
Closes gh-7045
 2016-09-30 10:34:25 +02:00
Andy Wilkinson 901aa2764b Merge branch '1.4.x' into 1.5.x 2016-09-29 21:09:18 +01:00
Andy Wilkinson cf4142dbc0 Prevent htmlunit from pulling in commons-logging 
Update dependency management to exclude commons-logging and add
an enforcer rule to spring-boot-samples to try and prevent unwanted
commons-logging dependencies from sneaking back in again.

Closes gh-7067
 2016-09-29 21:08:15 +01:00
Andy Wilkinson b495ed4772 Merge pull request #7064 from Ken Dombeck 
* gh-7064:
  Prevent spring-session from pulling in commons-logging
 2016-09-29 21:07:29 +01:00
Ken Dombeck 8034ae6e37 Prevent spring-session from pulling in commons-logging 
Closes gh-7064
 2016-09-29 21:06:05 +01:00