Commit Graph

10971 Commits

Author SHA1 Message Date
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
Andy Wilkinson
1752773815 Default JSON loading to UTF-8 and provide methods to configure charset
Closes gh-6597
2016-08-16 15:17:30 +01:00
Andy Wilkinson
6d78066a3a Ensure that AWTError from image banner does not prevent app starting
Closes gh-6617
2016-08-16 15:05:00 +01:00
Andy Wilkinson
5f7e966955 Enable MessageSourceAutoConfiguration when using @WebMvcTest
Closes gh-6608
2016-08-16 14:35:06 +01:00
Andy Wilkinson
9d178a1547 Merge pull request #6588 from Nick Pillitteri
* gh-6588:
  Polish “Allow injection of StatsDClient into StatsdMetricWriter”
  Allow injection of StatsDClient into StatsdMetricWriter
2016-08-16 14:09:18 +01:00
Andy Wilkinson
13a9bc0537 Polish “Allow injection of StatsDClient into StatsdMetricWriter”
Closes gh-6588
2016-08-16 13:25:16 +01:00
Nick Pillitteri
63085fb441 Allow injection of StatsDClient into StatsdMetricWriter
Allow an instance of StatsDClient to be injected into the StatsdMetricWriter
which is used for exporting metrics to a Statsd server. This new constructor
allows the client to be injected but does not change the default behavior of
the writer.
2016-08-16 13:23:25 +01:00
Andy Wilkinson
49202570e9 Update SpringApplicationBuilder example in the docs and test it
Closes gh-6488
2016-08-16 13:14:56 +01:00
Andy Wilkinson
05fc967335 Update FilteredClassPathRunner so that JUnit rules work
Previously, the tests class and any JUnit annotations it contained were
loaded by a different class loader to JUnit. This meant that the JUnit
annotations were loaded twice and @Rule-annotated fields were not found.
This commit updates FitleredClassPathRunner to use a custom class loader
that ensures that any org.junit.* classes are only loaded by a single
class loader.
2016-08-16 13:06:57 +01:00
Andy Wilkinson
df4ef3e1cb Merge branch '1.3.x' 2016-08-15 13:47:32 +01:00
Andy Wilkinson
ffc0dc44ed Make Flyway and Liquibase endpoints conditional on a single candidate
Previously, auto-configuration of the Flyway and Liquibase endpoints
would fail if there were multiple Flyway or Spring Liquibase beans
in the application context.

This commit updates them so that they are now conditional on a single
candidate.

Closes gh-6609
2016-08-15 13:43:03 +01:00
Andy Wilkinson
a96af05882 Update Shade Plugin’s spring-boot-maven-plugin dependency during prepare
See gh-6527
2016-08-15 12:25:25 +01:00
Andy Wilkinson
5ad09333f3 Update Shade Plugin’s spring-boot-maven-plugin dependency version 2016-08-15 12:23:01 +01:00
Andy Wilkinson
b3e0b3a542 Consider mvn spring-boot:run that exits with 130 (SIGINT) to be successful
Previously, if mvn spring-boot:run with a forked JVM was killed with 
CTRL+C, the run would be considered unsuccessful. This commits updates
the run mojo to consider a forked JVM that exists with 130 (the exit
code produced when exiting due to SIGINT which is what CTRL+C sends) to
be successful.

Closes gh-6498
2016-08-15 11:23:49 +01:00
Stephane Nicoll
79b0d14504 Fix wrong use of slf4j
Closes gh-6650
2016-08-15 11:44:57 +02:00
Stephane Nicoll
7e09d09355 Merge pull request #6644 from eddumelendez:spring-security-4.1.2
* pr/6644:
  Upgrade to Spring Security 4.1.2.RELEASE
2016-08-14 08:07:38 +02:00
Eddú Meléndez
4e0591a5b0 Upgrade to Spring Security 4.1.2.RELEASE
Closes gh-6644
2016-08-14 08:07:13 +02:00
Stephane Nicoll
2d1e85c2fc Merge pull request #6540 from eddumelendez:health-endpoint-visibility
* pr/6540:
  Polish contribution
  Fix health endpoint security
2016-08-13 08:02:56 +02:00
Stephane Nicoll
4882544c84 Polish contribution
Closes gh-6540
2016-08-13 08:02:04 +02:00
Eddú Meléndez
dced154f71 Fix health endpoint security
Commit b02aba4 has renamed `management.security.role` to
`management.security.roles`. Unfortunately, the `HealthMvcEndpoint`
was still looking at the old property.

This commit makes sure that the proper key is used and any custom
role is applied rather than an unconditional `ADMIN` role.

See gh-6540
2016-08-13 07:26:41 +02:00