Commit Graph

9497 Commits (d9e2368512c2bc972f752618994781bb07bcd265)
 

Author SHA1 Message Date
Phillip Webb 74670cb20f Allow WebDriver beans to define their own scope
Update `WebDriverScope` so that only `WebDriver` beans with no explicit
scope are moved.

Fixes gh-7454
8 years ago
Phillip Webb 88c84ce234 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb b6b8bef009 Polish 8 years ago
Phillip Webb 7e2d0fd1c0 Check for Spring Data before configuring Couchbase
Add guard to `CouchbaseAutoConfiguration` so ensure that Spring Data
Couchbase is on the classpath.

Fixes gh-7453
8 years ago
Phillip Webb 288398b8b7 Merge pull request #7425 from PostalBear/1.4.x
* pr/7425:
  Add additional Tomcat timeout test
  Fix connector used to configure connection timeout
8 years ago
Phillip Webb ce58e16860 Add additional Tomcat timeout test
Update the Tomcat sample to also test that the connection timeout is
set.

See gh-7425
8 years ago
Grigory Fadeev 1ea829e003 Fix connector used to configure connection timeout
Fix Tomcat customization so that the main connection is configured with
any timeout.

Closes gh-7425
8 years ago
Phillip Webb a3b79be6b3 Support @MockBean on FactoryBeans
Update @MockBean support so that FactoryBean classes can be mocked.

Fixes gh-7439
8 years ago
Phillip Webb 1452d3cd51 Ensure withBasicAuth keeps error handler
Fix `TestRestTemplate` so that any custom `ErrorHandler` isn't lost
when calling `withBasicAuth`.

Fixes gh-7441
8 years ago
Andy Wilkinson af67decab6 Merge pull request #6957 from Vedran Pavić
* gh-6957:
  Update Docker images used by launch script integration tests
8 years ago
Vedran Pavic 8bd2e69915 Update Docker images used by launch script integration tests 8 years ago
Andy Wilkinson 617a8259b4 Merge pull request #6782 from sangwook
* gh-6782:
  Make it easier to override FILE_LOG_PATTERN
8 years ago
sangwook 7e46f8e2e3 Make it easier to override FILE_LOG_PATTERN
Closes gh-6782
8 years ago
Andy Wilkinson 112ec53baa Merge pull request #7407 from Madhura Bhave
* gh-7407:
  Polish "Validate excluded autoconfiguration classes"
  Validate excluded autoconfiguration classes
8 years ago
Andy Wilkinson 65d0c07fd6 Polish "Validate excluded autoconfiguration classes"
- Apply code formatting
- Move configuration of excepted exception to immediately before line
  that will throw the exception
- Use String.format with %n to produce platform-specific new lines

See gh-7407
8 years ago
Madhura Bhave a9ffdca6f2 Validate excluded autoconfiguration classes
Closes gh-7407
See gh-6865
8 years ago
Andy Wilkinson c7a566fd24 Merge pull request #7234 from Christian Koops
* gh-7234:
  Make launch script's logFilename and pidFilename configurable via properties
8 years ago
Christian Koops 5c11059e1d Make launch script's logFilename and pidFilename configurable via properties
Closes gh-7234
8 years ago
Andy Wilkinson 09a235b1e8 Upgrade to Neo4j OGM 2.1.0-M01
Closes gh-7448
8 years ago
Andy Wilkinson d12c21ae2f Add spring-kafka dependency to spring-boot-docs for Javadoc links
See gh-6961
8 years ago
Andy Wilkinson ff4bbd9291 Fix javadoc and apply code formatting to Kafka contribution
See gh-6961
8 years ago
Andy Wilkinson f5dd90815b Polishing: fix some compiler warnings 8 years ago
Andy Wilkinson 29f0ae3fa8 Use a random port in new tests in SpringBootWebSecurityConfigurationTests
See gh-7373
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 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 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 2c856124e1 Polish ModifiedClassPathRunner 8 years ago
Andy Wilkinson f4b119cb53 Tidy up spring-boot-junit-runners' dependencies 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 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 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 f35fa87366 Fix problems in SpringBootMockUtil reported by Checkstyle 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 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 b1ba484d0c Add dependency management for SQL Server's JDBC driver
Closes gh-7413
8 years ago
Andy Wilkinson 5527e3fdad Fix SpringApplicationHierarchyTests following latest Neo4j changes
See gh-7391
8 years ago
Andy Wilkinson af4ca7cf6e Align Spring Data Neo4j auto-configuration with latest Ingalls snapshots
Closes gh-7391
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