Commit Graph

11921 Commits

Author SHA1 Message Date
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
Andy Wilkinson 0fbe903308 Merge branch '1.5.x' 2017-05-03 19:37:06 +01: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 9ea461229c Merge branch '1.5.x' 2017-05-03 18:45:41 +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 bc4a11dd7b Make argument ordering consistent across web server initialized events 2017-05-03 17:09:02 +01:00
Andy Wilkinson 328bbaf17f Update port file writer to support reactive servers
Closes gh-8531
2017-05-03 17:06:42 +01:00
Andy Wilkinson bdd8cb3468 Merge branch '1.5.x' 2017-05-03 16:49:21 +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
Andy Wilkinson 2d6bb9b507 Revert "Exclude commons-logging from Spring Security"
This reverts commit ec57c3d92a.

Closes gh-8985
2017-05-03 15:04:05 +01:00
Stephane Nicoll 91ac9440ff Merge pull request #9049 from eddumelendez:polish-lambdas
* pr/9049:
  Replace lambdas with method references
2017-05-03 15:09:10 +02:00
Eddú Meléndez 1d9fa8395c Replace lambdas with method references
Closes gh-9049
2017-05-03 15:08:28 +02:00
Andy Wilkinson d46591f141 Stop setting org.jboss.logging.provider when using Logback
This fix for gh-1928 to address a problemw with Log4j was to set
a system property that forces JBoss Logging to use SLF4J. This has the
unwanted side-effect of crashing Glassfish. We no longer support Log4j
so gh-1928 is no longer a concern. However, you can shoot yourself in
the foot by having Logback and Log4j2 on the classpath in that
particular order, but the latter has to be without its
log4j-slf4j-impl module. At this point you don't get any warnings or
error output at startup, but JBoss Logging uses Log4j2 while
everything else uses SLF4J and Logback. As a result, any logging
that's performed through JBoss Logging is silently lost.

Given the problems caused by setting the system property, and the
contrived nature of the arrangement that's necessary to cause a
problem when the property isn't set, this commit updates
LogbackLoggingSystem so that the system property is no longer set.

Closes gh-8669
2017-05-03 13:25:55 +01:00
Andy Wilkinson abdc23905f Drop ignoreNestedProperties attribute from @ConfigurationProperties
Closes gh-8657
2017-05-03 13:20:25 +01:00