root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 13 Packages Projects Releases Wiki Activity
11,937 Commits 25 Branches 369 Tags 282 MiB
Commit Graph

11937 Commits

Author SHA1 Message Date
Stephane Nicoll 70a3daa266 Merge branch '1.5.x' 2017-05-09 08:35:18 +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 3b0fb97081 Upgrade to Spring Framework 5.0.0.RC1 
Closes gh-9129
 2017-05-08 10:46:05 +02:00
Stephane Nicoll 3f58095192 Merge pull request #9103 from izeye:polish-20170505 
* pr/9103:
  Polish
 2017-05-07 10:36:52 +02:00
Johnny Lim 53e5d67cde Polish 
Closes gh-9103
 2017-05-07 10:32:12 +02:00
Stephane Nicoll 068c52b725 Merge branch '1.5.x' 2017-05-06 10:31:17 +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
Madhura Bhave 7c71fdd9ff Fix typo 2017-05-05 17:08:03 -07:00
Andy Wilkinson 6dd385898f Upgrade to Rxjava 1.3.0 
Closes gh-9112
 2017-05-05 14:33:14 +01:00
Stephane Nicoll 275bff39aa Remove deprecated code 
Closes gh-8891
 2017-05-05 14:32:09 +02:00
Andy Wilkinson 269cea291c Upgrade to Neo4j OGM 3.0.0-M01 
Closes gh-8687
 2017-05-05 11:40:29 +01:00
Stephane Nicoll 2245bced9f Merge pull request #9055 from garyrussell:GH-9041 
* pr/9055:
  Remove deprecated spring.rabbitmq.listener.* properties
  Polish "Support direct AMQP container"
  Support direct AMQP container
 2017-05-05 12:04:12 +02:00
Stephane Nicoll 1e9c1a68e4 Remove deprecated spring.rabbitmq.listener.* properties 
See gh-9055, gh-9108
 2017-05-05 12:03:21 +02:00
Stephane Nicoll 2894e57146 Polish "Support direct AMQP container" 
Closes gh-9055
 2017-05-05 11:32:25 +02:00
Gary Russell 6eddf1b372 Support direct AMQP container 
Add support for auto configuration - select container type and separate
discrete properties.

See gh-9055
 2017-05-05 10:08:13 +02:00
Stephane Nicoll 0f38031f93 Merge branch '1.5.x' 2017-05-05 10:04:27 +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 ba8bdd2683 Fix actuator path used in tests 2017-05-04 14:59:47 -07:00
Madhura Bhave 2519d73f5e Merge branch '1.5.x' 2017-05-04 13:58:52 -07:00
Madhura Bhave 3d836f7730 Fix test pollution 2017-05-04 12:20:21 -07:00
Phillip Webb a841a6a11d Polish 2017-05-04 11:41:15 -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 3abd8d3adf Drop support for configuring PropertiesLauncher with application.properties 
Closes gh-8464
 2017-05-04 17:01:07 +01:00
Andy Wilkinson 525f421441 Update MultipartProperties' prefix to reflect that it's Servlet-specific 
Closes gh-8628
 2017-05-04 16:47:46 +01:00
Andy Wilkinson 9caf82ce80 Remove redundant ordering from ImportBeanDefinitionRegistrar implementations 
Closes gh-8603
 2017-05-04 16:30:01 +01:00
Andy Wilkinson 643364e74d Try to ensure that embedded container tests can see milestones and snapshots 2017-05-04 15:49:24 +01:00
Andy Wilkinson 7a9af02943 Merge branch '1.5.x' 2017-05-04 15:41:57 +01: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 8ed33a1da5 Properly remove Spock from spring-boot-dependencies 
See gh-9043
 2017-05-04 15:37:16 +01:00
Andy Wilkinson a48f4f3320 Merge branch '1.5.x' 2017-05-04 15:35:51 +01:00
Andy Wilkinson 816ac1dc78 Remove dependency management for jetty-monitor 
Closes gh-9010
 2017-05-04 15:35:26 +01:00
Stephane Nicoll 39a1c5e6ea Merge pull request #7469 from vpavic:gh-4918 
* pr/7469:
  Polish "Add auto-configuration support for Hazelcast client"
  Add auto-configuration support for Hazelcast client
 2017-05-04 15:52:47 +02:00
Stephane Nicoll 0aded58884 Polish "Add auto-configuration support for Hazelcast client" 
Closes gh-7469
 2017-05-04 15:52:02 +02:00
Vedran Pavic 3fbf1a2ea6 Add auto-configuration support for Hazelcast client 
See gh-7469
 2017-05-04 14:20:03 +02:00
Stephane Nicoll ae3225e76e Mention that Lettuce requires commons-pool2 
We intend to remove this limitation in a future milestone but as the
Lettuce auto-configuration requires `commons-pool2`, this commit updates
the How-To to mention that.

See gh-9091
 2017-05-04 14:03:50 +02:00
Stephane Nicoll de53a24e60 Merge branch '1.5.x' 2017-05-04 11:35:11 +02:00
Stephane Nicoll 3e688ecedb Add missing dependency management for Jetty 
Closes gh-9010
 2017-05-04 11:33:52 +02:00
Andy Wilkinson 822b473cbe Update samples following API changes in Spring Data snapshots 
findOne is now findById
 2017-05-04 10:27:51 +01:00
Andy Wilkinson 11c3c4c20b Drop support for org.json:json-based JSON parsing 
Closes gh-8710
 2017-05-04 10:27:51 +01:00
Stephane Nicoll 05cf41bd9e Merge branch '1.5.x' 2017-05-04 10:42:25 +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 f853576bec Upgrade to Reactor Bismuth-M1 
Closes gh-8884
 2017-05-04 09:37:08 +01:00
Andy Wilkinson 329a950bd8 Remove testing support from the CLI 
The testing support in the CLI has proven to be more trouble than
it's worth. Our recommendation is that, once an app gets to the stage
of requiring a test suite, it should be converted to a Maven or
Gradle project. This makes it easy to version, publish, deploy etc
using the vast ecosystems of the two build systems.

As part of this change, the dependency management for Spock has been
moved into spring-boot-parent, thereby making it "private". This
allows it to continue to manage the test-only Spock dependency in
spring-boot-test without also managing the version of Spring that is
used by a user's application.

Closes gh-9087
Fixes gh-9043
 2017-05-04 09:35:29 +01:00
Andy Wilkinson acda8e647b Update CLI's tests following introduction of spring-jcl module 
The new spring-jcl module is now a dependency of spring-core. This
commit updates the CLI's dependency resolution-related tests to
account for the new dependency.
 2017-05-04 09:29:22 +01:00
Stephane Nicoll 5247fa323b Harmonize reactive auto-configuration class names 
Closes gh-9086
 2017-05-04 10:19:10 +02:00
Stephane Nicoll de268d97e2 Add auto-configuration for reactive Redis 
This commit provides an auto-configuration for reactive Redis and a
starter that provides Lettuce as Jedis doesn't support reactive
operations.

There are no support for reactive redis repositories at the moment so
only a `ReactiveRedisTemplate` is auto-configured if necessary.

Closes gh-8053
 2017-05-04 09:25:36 +02:00