Commit Graph

9748 Commits (4ed26825d7d31ad2a225d2e7c57ab44c5f82ceac)
 

Author SHA1 Message Date
Stephane Nicoll e3688455fa Merge branch '1.5.x' 8 years ago
Stephane Nicoll cc07f56c87 Merge pull request #6961 from garyrussell:kafkaAutoConfig
* pr/6961:
  Polish "Apache Kafka support" contribution
  Add Apache Kafka support
8 years ago
Stephane Nicoll 642af52d01 Polish "Apache Kafka support" contribution
Closes gh-6961
8 years ago
Gary Russell c4188c8e4a Add Apache Kafka support
See gh-6961
8 years ago
Andy Wilkinson a501afdeb1 Merge branch '1.5.x' 8 years ago
Andy Wilkinson b2a8be8bbe Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 3423ca87b4 Ensure that RestClientTest can be used without Jackson on the class path
Closes gh-7431
8 years ago
Andy Wilkinson bbf6fee446 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5a9fc9aa49 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 3464c0b16e Ensure that Hypermedia-related auto-config works without Jackson
Previously, both HypermediaAutoConfiguration and HttpMessageConverters
assumed that if Spring HATEOAS was on the class path, then Jackson
would be too. When this was not the case, an application would fail
to start.

This commit updates both classes to back off appropriately when
Spring HATEOAS is on the classpath but Jackson is not.

Closes gh-7434
8 years ago
Andy Wilkinson a87f8419f8 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 2c856124e1 Polish ModifiedClassPathRunner 8 years ago
Andy Wilkinson f4b119cb53 Tidy up spring-boot-junit-runners' dependencies 8 years ago
Andy Wilkinson 34f73eb4e0 Correct the version of spring-boot-junit-runners' parent 8 years ago
Andy Wilkinson 37bdaf9ccf Merge branch '1.5.x' 8 years ago
Andy Wilkinson ac05b61df9 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson c9427191ee Set TCCL before initialising test class in FilteredClassPathRunner
Closes gh-7435
8 years ago
Stephane Nicoll 77bef0536f Merge branch '1.5.x' 8 years ago
Stephane Nicoll 9423b9831c Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 249ed899a6 Fix use of KB and MB in Multipart documentation
Closes gh-7364
8 years ago
Phillip Webb 20d7dd5747 Merge branch '1.5.x' 8 years ago
Phillip Webb 1657120286 Move ModifiedClassPathRunner to its own module
Migrate `ModifiedClassPathRunner` from `spring-boot` test source to
its own module.

Fixes gh-7420
8 years ago
Phillip Webb 9e18021e8c Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb c2c5611f77 Polish 8 years ago
Phillip Webb fce17ca6d9 Polish 8 years ago
Madhura Bhave 3a3228fc70 Add CORS interceptor for Cloud Foundry actuators
This interceptor processes the response with CORS headers
and apepars before the Cloud Foundry security interceptor.

See gh-7108
8 years ago
Andy Wilkinson 9ec38dc8c1 Merge branch '1.5.x' 8 years ago
Andy Wilkinson f35fa87366 Fix problems in SpringBootMockUtil reported by Checkstyle 8 years ago
Andy Wilkinson 9273b1789b Merge branch '1.5.x' 8 years ago
Andy Wilkinson 1cd781b242 Make spring-boot-test compatible with Mockito 2.1 and 2.2
We use some internal Mockito classes and some  breaking API changes
have been made to them in Mockito 2. This commit introduces a utility
class, SpringBootMockUtil, to shield our code from these differences.
Mockito 1 is called directly and Mockito 2 is called via reflection.

To allow these changes to be tested, FilteredClassPathRunner has been
enhanced to also support overriding a dependency on the class path.
As a result it has been renamed to ModifiedClassPathRunner. The new
ClassPathOverrides annotation can be used to provide the Maven
coordinates of one or more dependencies that should be resolved and
added to the class path. Such additions are added to the start of
the class path so that they override any existing dependency that
contains the same classes.

Closes gh-6520
8 years ago
Andy Wilkinson fd10d428f9 Merge branch '1.5.x' 8 years ago
Andy Wilkinson e0bf8ad280 Merge pull request #7279 from Quentin Caillard
* gh-7279:
  Update to Jersey 2.24
8 years ago
Quentin Caillard bcc6726c2c Update to Jersey 2.24
Closes gh-7279
8 years ago
Andy Wilkinson 318fcb37de Merge branch '1.5.x' 8 years ago
Andy Wilkinson b1ba484d0c Add dependency management for SQL Server's JDBC driver
Closes gh-7413
8 years ago
Andy Wilkinson 93612116c5 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 5527e3fdad Fix SpringApplicationHierarchyTests following latest Neo4j changes
See gh-7391
8 years ago
Andy Wilkinson ae8ad454b3 Merge branch '1.5.x' 8 years ago
Andy Wilkinson af4ca7cf6e Align Spring Data Neo4j auto-configuration with latest Ingalls snapshots
Closes gh-7391
8 years ago
Andy Wilkinson 800718637e Add dependency management for Reactor 3's Add-ons
Closes gh-7414
8 years ago
Stephane Nicoll 7ebe324514 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 2ba3b27954 Merge branch '1.4.x' into 1.5.x
# Conflicts:
#	spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java
#	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
8 years ago
Stephane Nicoll 0072a93915 Expose Tomcat's accesslog requestAttributesEnabled
This commit adds an extra property to the `server.tomcat.accesslog` to
control the `reqestAttributesEnabled` flag. This flag sets request
attributes for IP address, Hostname, protocol and port used for the
request.

Closes gh-7367
8 years ago
Andy Wilkinson b0d0ddfcb6 Merge branch '1.5.x' 8 years ago
Andy Wilkinson cd3f951d35 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 5dea4c5a03 Wait for server port to be written in a more robust manner
Previously, we just waited for the file to exist before trying to read
the port from it. This left a window where the file existed but its
contents had not be written which could result in a
NumberFormatException.

This commit now waits for the file to have a length that is greater
than zero.

See gh-7379
8 years ago
Andy Wilkinson 8c80722a70 Merge branch '1.5.x' 8 years ago
Andy Wilkinson bed5155676 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 5857010dde Polishing: fix Checkstyle warning 8 years ago
Andy Wilkinson 6361a6728a Add support for new PATCH methods to TestRestTemplate
Closes gh-7412
8 years ago