Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,024 Commits 23 Branches 0 Tags
2ff41ce9cc397740c3e7bdd98de6bc040d610cfa
Commit Graph

9024 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
2ff41ce9cc Merge branch '1.5.x' 2016-10-06 09:35:15 +02:00
Stephane Nicoll
200e246238 Merge branch '1.4.x' into 1.5.x 2016-10-06 09:35:01 +02:00
Stephane Nicoll
e9f43f30df Merge pull request #7111 from izeye:string-format 
* pr/7111:
  Remove unused parameters in String.format()
 2016-10-06 09:34:45 +02:00
Johnny Lim
91254f2110 Remove unused parameters in String.format() 
Closes gh-7111
 2016-10-06 09:34:32 +02:00
Andy Wilkinson
59ce40edbc Merge branch '1.5.x' 2016-10-05 17:03:37 +01:00
Andy Wilkinson
31e6819a6c Merge branch '1.4.x' into 1.5.x 2016-10-05 17:03:27 +01:00
Andy Wilkinson
97cf2e9677 Polish new tests for the Gradle plugin's deprecated ID 
The output capture for the deprecation warning only appears to work
when the test is run in isolation. I can't figure out why that's the
case, particularly as we have another test class
(BootRunResourceTests) that uses OutputCapture and works reliably.

I'm cutting my loses and removing the use of OutputCapture and the
assertion that the warnings is logged.

See gh-6997
 2016-10-05 16:54:37 +01:00
Andy Wilkinson
4b3b293691 Merge branch '1.5.x' 2016-10-05 14:59:20 +01:00
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
Andy Wilkinson
f137ec6a3a Merge branch '1.5.x' 2016-10-05 14:58:02 +01:00
Andy Wilkinson
846f264da8 Merge branch '1.4.x' into 1.5.x 2016-10-05 14:57:51 +01:00
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
 2016-10-05 14:54:23 +01:00
Stephane Nicoll
8b61d15120 Remove deprecated support for commons-dbcp 1 
See gh-6787
 2016-10-05 15:51:14 +02:00
Stephane Nicoll
543498f040 Merge branch '1.5.x' 2016-10-05 15:21:23 +02:00
Stephane Nicoll
cf28663cd7 Deprecate commons-dbcp 1 
Closes gh-6787
 2016-10-05 15:21:09 +02:00
Stephane Nicoll
4119da1d9e Merge branch '1.5.x' 2016-10-05 13:48:51 +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
0d5985b8dd Merge branch '1.5.x' 2016-10-04 15:01:04 +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
fc1a700d4c Merge branch '1.5.x' 
# Conflicts:
#	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
 2016-10-04 13:39:33 +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
fff4376f3d Merge branch '1.5.x' 2016-10-04 13:05:34 +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
39534aea6b Merge branch '1.5.x' 
# Conflicts:
#	spring-boot-dependencies/pom.xml
 2016-10-04 13:02:53 +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
d0d01b92b9 Fixup parent POM version 2016-10-03 22:54:06 -07:00
Phillip Webb
17bb3b51df Merge branch '1.5.x' 2016-10-03 22:53:10 -07: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
53f50eda39 Merge branch '1.5.x' 2016-10-03 22:47:11 -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
e6ab3cef73 Merge branch '1.5.x' 2016-10-03 12:29:14 +02:00