root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity
10,645 Commits 24 Branches 369 Tags 281 MiB
Commit Graph

10645 Commits

Author SHA1 Message Date
Stephane Nicoll ea4e6fea35 Polish 2017-05-09 09:37:30 +02:00
Stephane Nicoll f8e1345b75 Unify versions used in integration tests 
This commit makes sure the integration tests use the same versions as
the one managed by `spring-boot-dependencies` (including Maven plugins).

Closes gh-8947
 2017-05-09 09:36:21 +02:00
Stephane Nicoll bca96932af Merge pull request #9072 from helpermethod:master 
* pr/9072:
  Add Membrane Spring Boot Starter
 2017-05-09 08:35:04 +02:00
Oliver Weiler 31d4f3b638 Add Membrane Spring Boot Starter 
Closes gh-9072
 2017-05-09 08:34:05 +02:00
Stephane Nicoll 85ae3082b8 Merge pull request #9116 from garyrussell:amqp15 
* pr/9116:
  Upgrade to Spring Kafka 1.1.5.RELEASE
 2017-05-06 10:30:58 +02:00
Gary Russell 74985b610b Upgrade to Spring Kafka 1.1.5.RELEASE 
Closes gh-9116
 2017-05-06 10:30:20 +02:00
Stephane Nicoll e236b71615 Move RabbitMQ Simple listener support to dedicated namespace 
Move `spring.rabbitmq.listener.*` to `spring.rabbitmq.listener.simple.*`
in preparation for Spring AMQP 2.0 that supports different container
types.

Closes gh-9108
See gh-9055
 2017-05-05 10:03:47 +02:00
Madhura Bhave 3d836f7730 Fix test pollution 2017-05-04 12:20:21 -07:00
Madhura Bhave 189e07e9f3 Support values other than String in /env 
Fixes gh-9079
 2017-05-04 11:35:15 -07:00
Andy Wilkinson 216506d20f Upgrade to Jetty 9.4.5.v20170502 
Closes gh-9100
 2017-05-04 15:41:46 +01:00
Andy Wilkinson 1fc6fc1790 Upgrade to Undertow 1.4.14.Final 
Closes gh-9099
 2017-05-04 15:41:46 +01:00
Andy Wilkinson 816ac1dc78 Remove dependency management for jetty-monitor 
Closes gh-9010
 2017-05-04 15:35:26 +01:00
Stephane Nicoll 3e688ecedb Add missing dependency management for Jetty 
Closes gh-9010
 2017-05-04 11:33:52 +02:00
Stephane Nicoll 81e3b392c3 Merge branch '1.4.x' into 1.5.x 2017-05-04 10:42:03 +02:00
Stephane Nicoll e8f99dc01c Fix typo 
Closes gh-9082
 2017-05-04 10:41:21 +02:00
Andy Wilkinson 832b3d1f2f Merge branch '1.4.x' into 1.5.x 2017-05-03 19:36:56 +01:00
Andy Wilkinson 08143edf19 Close streams when unpacking the CLI 
See gh-9080
 2017-05-03 19:36:28 +01:00
Andy Wilkinson ce74047896 Merge branch '1.4.x' into 1.5.x 2017-05-03 18:45:32 +01:00
Andy Wilkinson 2f26088800 Unpack CLI for its integration tests as dir is no longer assembled 
Closes gh-9080
 2017-05-03 18:44:25 +01:00
Andy Wilkinson 51970f81d2 Merge branch '1.4.x' into 1.5.x 2017-05-03 16:48:59 +01:00
Andy Wilkinson dc8a34f324 Fix warnings caused by CLI's assembly configuration 
Closes gh-9080
 2017-05-03 16:47:38 +01:00
Stephane Nicoll 2f4a1f9531 Merge branch '1.4.x' into 1.5.x 2017-05-03 13:21:59 +02:00
Stephane Nicoll 93bd1108bf Fix maven warning 
Closes gh-9075
 2017-05-03 13:21:10 +02:00
Stephane Nicoll ea33cc2f7d Deprecated MustacheCompilerFactoryBean 
Closes gh-8999
 2017-05-03 13:09:52 +02:00
Stephane Nicoll 61f88d0c90 Provide dependency management for missing jersey dependencies 
Closes gh-9009
 2017-05-03 12:19:32 +02:00
Stephane Nicoll 5121b848e1 Making sure to stop embedded web servers in tests 
Closes gh-9012
 2017-05-03 11:33:42 +02:00
Stephane Nicoll 7b1fc01733 Fix checkstyle violations 2017-05-03 10:19:00 +02:00
Stephane Nicoll b4d55a2223 Merge pull request #9007 from Dichotomia:patch-6 
* pr/9007:
  Add dependency section for jersey multipart
 2017-05-03 09:18:28 +02:00
Quentin Caillard 45e0912ecd Add dependency section for jersey multipart 
Closes gh-9007
 2017-05-03 09:18:09 +02:00
Stephane Nicoll 063d301fd3 Make LayoutType public 
Closes gh-9067
 2017-05-03 09:15:34 +02:00
Stephane Nicoll 54a8dc5b33 Merge branch '1.4.x' into 1.5.x 2017-05-03 09:11:37 +02:00
Stephane Nicoll 625a7668c9 Merge pull request #9065 from dsyer:cachedocs 
* pr/9065:
  Polish "Clarify and re-organize docs on caching"
  Clarify and re-organize docs on caching
 2017-05-03 09:11:05 +02:00
Stephane Nicoll e2b209e409 Polish "Clarify and re-organize docs on caching" 
Closes gh-9065
 2017-05-03 09:10:47 +02:00
Dave Syer 11feb75752 Clarify and re-organize docs on caching 
See gh-9065
 2017-05-03 09:01:45 +02:00
Phillip Webb 4d4d03ab2c Merge branch '1.4.x' into 1.5.x 2017-05-02 21:33:33 -07:00
Phillip Webb 4a95b2f174 Polish 2017-05-02 20:39:45 -07:00
Stephane Nicoll 035e27b1d1 Merge branch '1.4.x' into 1.5.x 2017-05-02 13:21:03 +02:00
Stephane Nicoll 8e5bf4b22a Polish CachePublicMetrics 
CachePublicMetrics wasn't explicitly tested and was still using field
injection. This commit improves the situation in preparation of the fix
for gh-8984
 2017-05-02 13:15:31 +02:00
Stephane Nicoll 652a5e7baa Merge branch '1.4.x' into 1.5.x 2017-05-02 12:13:44 +02:00
Stephane Nicoll f060922350 Fix cache example in the doc 
Closes gh-8983
 2017-05-02 11:58:50 +02:00
Phillip Webb 76ee2f401c Polish 2017-04-28 09:48:13 -07:00
Phillip Webb 4db4c81b9b Polish 2017-04-28 09:38:56 -07:00
Andy Wilkinson df05aa4701 Merge branch '1.4.x' into 1.5.x 2017-04-28 15:41:53 +01:00
Andy Wilkinson bd95ad6430 Upgrade to Spring Restdocs 1.1.3.RELEASE 
Closes gh-9040
 2017-04-28 15:33:43 +01:00
Andy Wilkinson 5291fb5ff7 Upgrade to Hsqldb 2.3.5 
Closes gh-9039
 2017-04-28 15:33:43 +01:00
Andy Wilkinson 344255807b Upgrade to Jaybird 2.2.13 
Closes gh-9038
 2017-04-28 15:33:42 +01:00
Andy Wilkinson 59d04d0679 Upgrade to Elasticsearch 2.4.5 
Closes gh-9037
 2017-04-28 15:33:42 +01:00
Andy Wilkinson c3c2a91916 Upgrade to Groovy 2.4.11 
Closes gh-9036
 2017-04-28 15:33:41 +01:00
Andy Wilkinson bc464adba3 Upgrade to Tomcat 8.5.14 
Closes gh-9035
 2017-04-28 15:33:41 +01:00
Andy Wilkinson b5811986b0 Upgrade to Ehcache 2.10.4 
Closes gh-9034
 2017-04-28 15:33:41 +01:00