Commit Graph

9017 Commits (4b3b293691883ec9fd05536e279eb13188bc75e1)
 

Author SHA1 Message Date
Andy Wilkinson 4b3b293691 Merge branch '1.5.x' 8 years ago
Andy Wilkinson fe10ea73b0 Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Andy Wilkinson f137ec6a3a Merge branch '1.5.x' 8 years ago
Andy Wilkinson 846f264da8 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 77f1da871f 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
8 years ago
Stephane Nicoll 8b61d15120 Remove deprecated support for commons-dbcp 1
See gh-6787
8 years ago
Stephane Nicoll 543498f040 Merge branch '1.5.x' 8 years ago
Stephane Nicoll cf28663cd7 Deprecate commons-dbcp 1
Closes gh-6787
8 years ago
Stephane Nicoll 4119da1d9e Merge branch '1.5.x' 8 years ago
Stephane Nicoll 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
Stephane Nicoll 2d75cc79c0 Polish contribution
Closes gh-6367
8 years ago
Henri Kerola d07f689446 "spring war" should copy resources to WEB-INF/classes
Closes gh-6351
8 years ago
Stephane Nicoll 0d5985b8dd Merge branch '1.5.x' 8 years ago
Stephane Nicoll 07690bab25 Allow customization of the auto-configured JmsTemplate
Closes gh-6825
8 years ago
Stephane Nicoll fc1a700d4c Merge branch '1.5.x'
# Conflicts:
#	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
8 years ago
Stephane Nicoll 4b2970606e Merge branch '1.4.x' into 1.5.x 8 years ago
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
8 years ago
Stephane Nicoll fff4376f3d Merge branch '1.5.x' 8 years ago
Stephane Nicoll d0e49cc413 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 8d2aedc5a8 Merge branch '1.3.x' into 1.4.x 8 years ago
Stephane Nicoll 7f1118b87a Merge pull request #7073 from garyrussell:si4210
* pr/7073:
  Upgrade to Spring Integration 4.2.11
8 years ago
Gary Russell 0ffc7dc13f Upgrade to Spring Integration 4.2.11
Closes gh-7073
8 years ago
Stephane Nicoll 39534aea6b Merge branch '1.5.x'
# Conflicts:
#	spring-boot-dependencies/pom.xml
8 years ago
Stephane Nicoll 58050fb72f Merge branch '1.4.x' into 1.5.x
# Conflicts:
#	spring-boot-dependencies/pom.xml
8 years ago
Stephane Nicoll 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
Gary Russell ad3179b9ee Upgrade to Spring Integration 4.3.4, AMQP 1.6.3
Closes gh-7074
8 years ago
Stephane Nicoll dfb3675937 Merge pull request #7085 from dstine:docs-typos
* pr/7085:
  Fix a typo
8 years ago
Dan Stine 0926b66123 Fix a typo
Closes gh-7085
8 years ago
Phillip Webb d0d01b92b9 Fixup parent POM version 8 years ago
Phillip Webb 17bb3b51df Merge branch '1.5.x' 8 years ago
Phillip Webb 8fe755d281 Fixup parent POM version 8 years ago
Phillip Webb 6d11931421 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb bd341cbac8 Polish 8 years ago
Phillip Webb 53f50eda39 Merge branch '1.5.x' 8 years ago
Phillip Webb a2315378d4 Formatting 8 years ago
Phillip Webb f2b0fa284e Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb cdeed8e934 Merge pull request #7089 from mbhave/gh-7065
* pr/7089:
  Fix NoClassDefFoundError when Mockito is missing
8 years ago
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
8 years ago
Phillip Webb 3326841a97 Formatting 8 years ago
Phillip Webb 39ed0d4dfb Polish 8 years ago
Phillip Webb f59cc25e2b Fix eclipse warnings 8 years ago
Stephane Nicoll e6ab3cef73 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6977dcaf44 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 9f7e97b23f Improve war to executable app documentation
Closes gh-7040
8 years ago
Stephane Nicoll 58005542cf Merge branch '1.5.x' 8 years ago
Stephane Nicoll e5bac8dadf Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll a9b610c4fc Deprecate ResourceLoaderAware callback
Closes gh-6986
8 years ago
Stephane Nicoll f181421f67 Merge branch '1.5.x' 8 years ago
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
8 years ago