0b9283c3cd
Merge pull request #6367 from henrikerola:gh-6351
...
* pr/6367:
Polish contribution
"spring war" should copy resources to WEB-INF/classes
8 years ago
2d75cc79c0
Polish contribution
...
Closes gh-6367
8 years ago
d07f689446
"spring war" should copy resources to WEB-INF/classes
...
Closes gh-6351
8 years ago
07690bab25
Allow customization of the auto-configured JmsTemplate
...
Closes gh-6825
8 years ago
4b2970606e
Merge branch '1.4.x' into 1.5.x
8 years ago
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
8 years ago
d0e49cc413
Merge branch '1.4.x' into 1.5.x
8 years ago
8d2aedc5a8
Merge branch '1.3.x' into 1.4.x
8 years ago
7f1118b87a
Merge pull request #7073 from garyrussell:si4210
...
* pr/7073:
Upgrade to Spring Integration 4.2.11
8 years ago
0ffc7dc13f
Upgrade to Spring Integration 4.2.11
...
Closes gh-7073
8 years ago
58050fb72f
Merge branch '1.4.x' into 1.5.x
...
# Conflicts:
# spring-boot-dependencies/pom.xml
8 years ago
dcb3f31901
Merge pull request #7074 from garyrussell:si433-14
...
* pr/7074:
Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
8 years ago
ad3179b9ee
Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
...
Closes gh-7074
8 years ago
dfb3675937
Merge pull request #7085 from dstine:docs-typos
...
* pr/7085:
Fix a typo
8 years ago
0926b66123
Fix a typo
...
Closes gh-7085
8 years ago
8fe755d281
Fixup parent POM version
8 years ago
6d11931421
Merge branch '1.4.x' into 1.5.x
8 years ago
bd341cbac8
Polish
8 years ago
a2315378d4
Formatting
8 years ago
f2b0fa284e
Merge branch '1.4.x' into 1.5.x
8 years ago
cdeed8e934
Merge pull request #7089 from mbhave/gh-7065
...
* pr/7089:
Fix NoClassDefFoundError when Mockito is missing
8 years ago
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
8 years ago
3326841a97
Formatting
8 years ago
39ed0d4dfb
Polish
8 years ago
f59cc25e2b
Fix eclipse warnings
8 years ago
6977dcaf44
Merge branch '1.4.x' into 1.5.x
8 years ago
9f7e97b23f
Improve war to executable app documentation
...
Closes gh-7040
8 years ago
e5bac8dadf
Merge branch '1.4.x' into 1.5.x
8 years ago
a9b610c4fc
Deprecate ResourceLoaderAware callback
...
Closes gh-6986
8 years ago
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
8 years ago
42adeda6a3
Merge branch '1.4.x' into 1.5.x
8 years ago
dc067b0fc4
Update Ant sample’s spring-boot-antlib dependency during prepare
...
Closes gh-6978
8 years ago
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
8 years ago
8c1b736bb0
Fix list property to be mutable
...
Closes gh-7068
8 years ago
e643fc5bd1
Merge branch '1.4.x' into 1.5.x
8 years ago
4dfdce5a49
Merge pull request #7081 from izeye:polish-20161002
...
* pr/7081:
Polish
8 years ago
503d735fdd
Polish
...
Closes gh-7081
8 years ago
75f475f2c8
Merge branch '1.4.x' into 1.5.x
8 years ago
8feef4560b
Merge pull request #6991 from Stummi:patch-1
...
* pr/6991:
Fix thymeleaf-layout-dialect.version in doc
8 years ago
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
8 years ago
7ffa499949
Merge branch '1.4.x' into 1.5.x
8 years ago
e56119165e
Close JestClient on shutdown
...
Closes gh-7051
8 years ago
8ed20068ca
Fix list property to be mutable
...
Closes gh-7045
8 years ago
901aa2764b
Merge branch '1.4.x' into 1.5.x
8 years ago
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
8 years ago
b495ed4772
Merge pull request #7064 from Ken Dombeck
...
* gh-7064:
Prevent spring-session from pulling in commons-logging
8 years ago
8034ae6e37
Prevent spring-session from pulling in commons-logging
...
Closes gh-7064
8 years ago
733cfe9f70
Merge branch '1.4.x' into 1.5.x
8 years ago
51eb1ac04d
Declare embedded queue up front in samples that use Artemis
...
Closes gh-7063
8 years ago
2a035d0748
Remove support for Velocity following its deprecation in 1.4
...
Closes gh-6971
8 years ago
Stephane Nicoll
Henri Kerola
Gary Russell
Dan Stine
Phillip Webb
Madhura Bhave
Johnny Lim
Michael Stummvoll
Andy Wilkinson
Ken Dombeck