Commit Graph

27490 Commits

Author SHA1 Message Date
Andy Wilkinson
46e03529fb Remove redundant bean declarations from some of the security samples
Closes gh-6740
2016-08-24 17:34:29 +01:00
Stephane Nicoll
d6e9ccecec Upgrade to Spring Security 4.1.3.RELEASE
Closes gh-6738
2016-08-24 09:04:42 +02:00
Stephane Nicoll
2c61064d93 Fix property prefix
This commit fixes the prefix for the WebClient and WebDriver auto-config
so that it complies with the prefix set on `AutoconfigureWebMvc`

Closes gh-6727
2016-08-23 17:11:14 +02:00
Andy Wilkinson
5a1741e2e8 Improve documentation of when TestRestTemplate is auto-configured
Closes gh-6729
2016-08-23 15:48:40 +01:00
Andy Wilkinson
9e2dcbbe96 Merge pull request #6721 from Mark Paluch
* gh-6721:
  Include netty-handler as transient dependency of cassandra-driver-dse
2016-08-23 14:57:26 +01:00
Mark Paluch
84234858db Include netty-handler as transient dependency of cassandra-driver-dse
Previously, Spring Data Cassandra excluded Netty from the Cassandra
Driver's dependencies. This was an error that we replicated in
our dependency management. The exclusion has been removed from
Spring Data Cassandra's pom. This commit makes the equivalent update
to our dependency management.

Fixes gh-6616
Closes gh-6721
2016-08-23 14:56:45 +01:00
Stephane Nicoll
3d04fbc0d4 Merge pull request #6728 from izeye:polish-20160823
* pr/6728:
  Polish
2016-08-23 15:13:48 +02:00
Johnny Lim
524edaea51 Polish
Closes gh-6728
2016-08-23 15:13:33 +02:00
Andy Wilkinson
742657983b Improve the error message when additional build-info prop has null value
Closes gh-6724
2016-08-23 11:30:23 +01:00
Andy Wilkinson
f41e629760 Provide M2E lifecycle mapping metadata for Maven plugin’s build-info goal
Previously, configuring the build-info goal in a pom would result in 
Eclipse reporting an error for the pom as it didn’t know if/when to
execute the build-info goal.

This commit adds lifecycle mapping metadata so that the goal is executed
on incremental builds. This ensures that the contents of the generated
file are kept up-to-date, reflecting the latest build time, etc.

Closes gh-6723
2016-08-23 11:30:23 +01:00
Stephane Nicoll
6c1b46e162 Mark auto-configured JdbcTemplate as primary
This commit marks the auto-configured `JdbcTemplate` as `Primary`. Spring
session creates its own so we could end up with two in a fully auto
configured context.

Closes gh-6717
2016-08-23 10:42:55 +02:00
Andy Wilkinson
e465368f54 Ensure that access log is flushed periodically
Previously, Tomcat’s background processing was only enabled on the
context but access logging was configured on the engine. This means that
the access log valve’s background processing method was never called
and, therefore, that it wasn’t flushed periodically.

This commit moves the enablement of background processing up to the
engine, thereby ensuring that the access log is flushed periodically.
Background processing cascades down the container hierarchy so, after
this change, background processing will still be performed on the
context as well.

Closes gh-6646
2016-08-22 23:01:44 +01:00
Andy Wilkinson
a16aa767dc Tweak performance of RelaxedNames.separatedToCamelCase
Closes gh-6661
2016-08-22 22:09:24 +01:00
Andy Wilkinson
53374ec51d Merge pull request #6706 from Maciej Walkowiak
* gh-6706:
  Polish “Add constructor to TestRestTemplate that takes a RestTemplateBuilder”
  Add constructor to TestRestTemplate that takes a RestTemplateBuilder
2016-08-22 20:52:04 +01:00
Andy Wilkinson
f117b93d49 Polish “Add constructor to TestRestTemplate that takes a RestTemplateBuilder”
Closes gh-6702
2016-08-22 20:51:54 +01:00
Maciej Walkowiak
53d7fd5aab Add constructor to TestRestTemplate that takes a RestTemplateBuilder
Closes gh-6706
See gh-6702
2016-08-22 20:51:54 +01:00
Andy Wilkinson
6cb18835b9 Reorder javadoc at-clauses to appease the Checkstyle gods 2016-08-22 20:51:00 +01:00
Andy Wilkinson
269bb9148c Add methods to RestTemplateBuilder for configuring interceptors
Closes gh-6701
2016-08-22 20:37:28 +01:00
Andy Wilkinson
32d0021eec Merge branch '1.3.x' 2016-08-22 15:49:52 +01:00
Andy Wilkinson
1dc231f771 Use Hamcrest's containsString matcher rather than Mockito's 2016-08-22 15:48:44 +01:00
Andy Wilkinson
d4c9a2b271 Merge branch '1.3.x' 2016-08-22 15:07:03 +01:00
Andy Wilkinson
ba51dc5c4a Make configuration of Liquibase’s logging more robust
We make Liquibase aware of our custom Commons Logging-based logger by
adding its package to the Liquibase ServiceLocator’s packages to scan.
Previously, this was happening too late so Liquibase may have already
initialized and cached a particular logger.

This commit moves the registration of the extra package from the
Liquibase auto-configuration to the application listener that customises
Liquibase’s ServiceLocator. This ensures that the package is added
before Liquibase is used. Unfortunately, configuring Liquibase’s
ServiceLocator and its packages to scan causes it to try to perform
some logging, resulting in it caching the wrong type of logger. We
work around this problem by resetting Liquibase’s LogFactory once we’ve
finished setting everything up.

Closes gh-6713
2016-08-22 14:58:34 +01:00
Stephane Nicoll
c9a3880f27 Remove hard-coded property values
As of Spring Boot 1.4, IDEs are supposed to provide auto-completion for
hints and enum values. This commit removes the hard-coded copy of
allowed values for enum-based properties. This was mostly the case
already and this commit fixes the few ones remaining.

Closes gh-6654
2016-08-22 15:39:41 +02:00
Andy Wilkinson
98d81110f2 Write management and main server access logs to separate files
Previously, when access logging was enabled and the management server
was running on a separate port, both the main server and the management
server would write their access logs to the same file. Having two
separate containers writing to the same file could cause problems such
as causing log rotation to break.

This commit updates the actuator so that when the management server is
running on a separate port (and therefore using a separate container)
it prepends management_ to the access log prefix so that the main
server and the management server write their access logs to separate
files in the same directory.

Closes gh-6618
2016-08-22 11:57:51 +01:00
Andy Wilkinson
81275887e4 Polishing 2016-08-22 11:54:18 +01:00
Stephane Nicoll
54a3ce8827 Restore support for spring.datasource.type
This commit restores the support of "spring.datasource.type". If this
property is set to an unsupported `DataSource` implementation, we now
properly create it again, rather than ignoring it because its value did
not match any value we support.

Since Spring Boot 1.4 now redirects `DataSource` implementation settings
to dedicated namespaces, the documentation has been updated to explicitly
mention how one can create such arrangement for an unsupported
implementation.

As a convenience, `DataSourceProperties` can initialize a
`DataSourceBuilder` based on its internal state, making it very easy for
anyone to create a `DataSource` from a `DataSourceProperties` instance.

Closes gh-6695
2016-08-22 11:49:32 +02:00
Stephane Nicoll
a6ef3741ef Configure Undertow's access log prefix and suffix
This commit adds two properties that can be used to customize the prefix
and suffix of the Undertow's access log.

Closes gh-6652
2016-08-22 10:12:26 +02:00
Andy Wilkinson
9420daf001 Downgrade Jedis to 2.8.1
Closes gh-6677
2016-08-18 21:36:34 +01:00
Andy Wilkinson
9ba12f1ad9 Update Jackson customization docs to mention new builder customizer
Closes gh-6678
2016-08-18 21:35:40 +01:00
Stephane Nicoll
62867685ed Fix reference to @EntityScan in the doc
Closes gh-6687
2016-08-18 17:00:12 +02:00
Andy Wilkinson
dd465b7f79 Fix configuration of session ID generator on Tomcat 7
See gh-6679
2016-08-18 14:23:33 +01:00
Andy Wilkinson
984a6da262 Polising
Fix botched merge
2016-08-18 13:44:36 +01:00
Andy Wilkinson
e2ceece525 Merge branch '1.3.x' 2016-08-18 13:30:56 +01:00
Andy Wilkinson
9300c6d422 Merge pull request #6683 from hengyunab
* gh-6683:
  Test that LaunchedURLClassLoader works when thread is interrupted
  Ensure that LaunchedURLClassLoader works when thread is interrupted
2016-08-18 13:30:21 +01:00
Andy Wilkinson
85c0b44dcb Test that LaunchedURLClassLoader works when thread is interrupted
Previously, RandomAccessDataFile used a semaphore and acquired it
interruptibly. This meant that an interrupted thread was unable to
access the file. Notably, this would prevent LaunchedURLClassLoader from
loading classes or resources on an interrupted thread.

The previous commit (937f857) updates RandomAccessDataFile to acquire
the semaphore uninterruptibly. This commit adds a test to
LaunchedURLClassLoader to verify that it can now load a resource from
an interrupted thread.

Closes gh-6683
2016-08-18 12:03:05 +01:00
hengyunabc
937f85765c Ensure that LaunchedURLClassLoader works when thread is interrupted
See gh-6683
2016-08-18 11:59:45 +01:00
Andy Wilkinson
e16c9d4e76 Polishing 2016-08-18 11:44:43 +01:00
Andy Wilkinson
70b5c97c7f Set original, possibly wrapped request factory on built RestTemplate
Previously, RestTemplateBuilder unwrapped the request factory to allow
the actual factory to be customised but then set this unwrapped factory
on the template that is being built. This meant that any wrappers were
lost.

This commit updates the build to unwrap the factory prior to it being
customised, but to the set the original, possibly wrapped factory on
the template that is being built.

Closes gh-6685
2016-08-18 11:40:23 +01:00
Andy Wilkinson
a2420bacfb Honour @MultipartConfig on servlets registered via @ServletComponentScan
Closes gh-6680
2016-08-18 11:32:06 +01:00
Andy Wilkinson
a6f777e941 Ensure that lazy session id generator is initialized by manager
Closes gh-6679
2016-08-18 10:00:38 +01:00
Stephane Nicoll
60697561aa Start building against Spring Framework 4.3.3 snapshots
See gh-6561
2016-08-17 17:57:21 +02:00
Stephane Nicoll
5c5eafe595 Merge pull request #6671 from izeye:polish-20160817
* pr/6671:
  Polish
2016-08-17 10:49:27 +02:00
Johnny Lim
37c8c3669b Polish
Closes gh-6671
2016-08-17 10:49:04 +02:00
Stephane Nicoll
96d5def17d Add reference to Caffeine in cache sample 2016-08-17 10:13:46 +02:00
Andy Wilkinson
c451eb1d19 Remove dependency management for jackson-datatype-jaxrs
We've downgraded to 2.7.x so we need to remove the dependency
management for jackson-datatype-jaxrs which is new in Jackson 2.8

Closes gh-6508
See gh-6369
2016-08-16 19:32:21 +01:00
Andy Wilkinson
87cc274344 Try to improve the stability of the build on Travis
- Bump Travis wait time to 45 minutes
- Use fast profile for first build
2016-08-16 16:57:01 +01:00
Stephane Nicoll
919d6b4b2e Avoid extending from RepositoryRestMvcConfiguration
This commit moves Spring Boot's customizations for Spring Data Rest to
the existing SpringBootRepositoryRestConfigurer.

Closes gh-6581
2016-08-16 17:54:51 +02:00
Andy Wilkinson
6c0d32550e Merge pull request #6539 from Ben Ooms
* gh-6539:
  Polish “Improve documentation for testing with Spock”
  Improve documentation for testing with Spock
2016-08-16 16:07:53 +01:00
Andy Wilkinson
a1e3dcebd4 Polish “Improve documentation for testing with Spock”
Closes gh-6539
2016-08-16 16:07:02 +01:00
Ben Ooms
894d86de12 Improve documentation for testing with Spock 2016-08-16 16:06:52 +01:00