Commit Graph

18552 Commits

Author SHA1 Message Date
Phillip Webb 0f653e69cd Start building against Spring Framework SNAPSHOTs
See gh-14481
2018-09-15 18:03:52 -07:00
Madhura Bhave d5a197fe66 Support random actuator port in SpringBootTest
This commit changes @SpringBootTest(randomPort = true) to
generate a random port for the actuator endpoints if the
management server runs on a different port from the main
server.

Closes gh-4424
2018-09-14 15:42:08 -07:00
Madhura Bhave 01e61d88e7 Merge branch '2.0.x' 2018-09-14 11:48:37 -07:00
Madhura Bhave 5708792d82 Merge branch '1.5.x' into 2.0.x 2018-09-14 11:43:33 -07:00
Madhura Bhave b5815b71d5 Fix formatting 2018-09-14 11:39:30 -07:00
Madhura Bhave d9efca146e Merge branch '2.0.x' 2018-09-14 11:21:31 -07:00
Madhura Bhave 09ccf875b7 Merge branch '1.5.x' into 2.0.x 2018-09-14 11:17:59 -07:00
Madhura Bhave 5a3d3c105b Fix javadoc 2018-09-14 11:10:16 -07:00
Madhura Bhave 1113c356dc ReactiveOAuth2ClientAutoConfiguration backs off for servlet env
Fixes gh-14463
2018-09-13 12:39:18 -07:00
Phillip Webb d4b11c8fa6 Attempt to fix test failures on Java 9+
See gh-14453
2018-09-12 18:31:50 -07:00
Phillip Webb cef635d86c Reinstate devtools debug logging with opt-out
Reinstate `web` logging when devtools is in use, making use of the new
logging groups support. Devtools now also logs an `INFO` message
informing that properties defaults are offers an easy way to disable
them.

Closes gh-14450
2018-09-12 16:25:14 -07:00
Phillip Webb c4caf2705a Defer devtools logging
Defer logging from devtools classes until the context is prepared.

Closes gh-14453
2018-09-12 16:25:14 -07:00
Phillip Webb bc92becfd8 Allow DeferredLogger to replay and switch loggers
Add additional `switchTo` methods to allow a `DeferredLogger` to behave
like a regular logger once it has been replayed.

This commit also improves thread thread safety within the implementation.

Closes gh-14452
2018-09-12 16:25:14 -07:00
Phillip Webb b32887b8eb Add support for logging groups
Provide a way for users to quickly group related loggers together for
easier configuration. The `loggers.group` property can be used to define
a group that can then be configured in the usual `loggers.level.<group>`
way.

Additionally, provide pre-defined groups for `web` and `sql.

Closes gh-14421
2018-09-12 16:25:14 -07:00
Madhura Bhave 3ed9730b86 Merge branch '2.0.x' 2018-09-12 16:20:57 -07:00
Madhura Bhave dfda247972 Fix warnings for params defined in pipeline but not in task
Closes gh-14445
2018-09-12 16:19:58 -07:00
Andy Wilkinson 5bc56671cb Upgrade to Jest 6.3.1
Closes gh-14429
2018-09-12 17:48:54 +01:00
Andy Wilkinson a2cf2cd87f Raise the minimum supported version of Gradle to 4.4
Closes gh-14418
2018-09-12 17:06:03 +01:00
Andy Wilkinson 576cc79350 Merge branch '2.0.x' 2018-09-12 12:58:43 +01:00
Andy Wilkinson 25b758ac24 Merge branch '2.0.x' 2018-09-12 12:58:25 +01:00
Andy Wilkinson ae4e1d0372 Test the Gradle plugin against Gradle 4.10
Closes gh-14417
2018-09-12 12:57:27 +01:00
Andy Wilkinson 630e2d0b41 Correct the permissions of scripts in archives of boot distribution
Closes gh-14158
2018-09-12 12:57:27 +01:00
Spring Buildmaster e84d6cd95b Next development version (v2.0.6.BUILD-SNAPSHOT) 2018-09-12 09:37:32 +00:00
Phillip Webb f99df98588 Unify maven-shade-plugin version in parent POM
Closes gh-14440
2018-09-11 22:49:36 -07:00
Phillip Webb 670d9bd6f8 Upgrade to classmate 1.4.0
Closes gh-14424
2018-09-11 22:49:35 -07:00
Phillip Webb b41e135713 Upgrade to mockito-kotlin 1.6.0
Closes gh-14426
2018-09-11 22:49:35 -07:00
Phillip Webb f0bfcd8947 Drop okhttp 2.x managed dependency
Closes gh-14442
2018-09-11 22:49:35 -07:00
Phillip Webb 9beab013f9 Upgrade to okhttp 3.11.0
Closes gh-14427
2018-09-11 22:49:35 -07:00
Phillip Webb 372fee11f5 Upgrade to JOpt Simple 5.0.4
Closes gh-14430
2018-09-11 22:49:34 -07:00
Phillip Webb 83a2031934 Upgrade to Commons Compress 1.18
Closes gh-14431
2018-09-11 22:36:13 -07:00
Phillip Webb 4adceec45f Upgrade to Ivy 2.4.0
Closes gh-14432
2018-09-11 22:36:13 -07:00
Phillip Webb 6e64ae0921 Upgrade to maven-archiver 3.2.0
Closes gh-14433
2018-09-11 22:36:12 -07:00
Phillip Webb e00a254729 Upgrade to maven-plugin-annotations 3.5.2
Closes gh-14434
2018-09-11 22:36:11 -07:00
Phillip Webb 8b16630a49 Upgrade to sisu-inject-plexus 2.6.0
Closes gh-14435
2018-09-11 22:36:11 -07:00
Phillip Webb abd08418c0 Upgrade to testcontainers 1.8.3
Closes gh-14436
2018-09-11 22:36:11 -07:00
Phillip Webb 3f8a5fd2e3 Upgrade to zt-zip 1.13
Closes gh-14437
2018-09-11 22:36:10 -07:00
Phillip Webb 869e8bba62 Upgrade to checkstyle 8.12
Closes gh-14439
2018-09-11 22:36:10 -07:00
Phillip Webb d5ba03c2ae Upgrade to maven-common-artifact-filters 3.0.1
Closes gh-14441
2018-09-11 22:36:10 -07:00
Phillip Webb c6398d3eef Polish 2018-09-11 22:36:06 -07:00
Phillip Webb bb19d5690c Fix spring-boot-actuator-autoconfigure test logs
Add log4j to `spring-boot-actuator-autoconfigure` test scope so that
we get valid log output.

See gh-14148
2018-09-11 20:13:27 -07:00
Phillip Webb 894e0e11d4 Switch from Aether to Maven Resolver
Replace Aether dependencies with Maven Resolver following the Eclipse
EOL announcement for Aether.

Closes gh-7627
2018-09-11 18:08:59 -07:00
Phillip Webb 1f9754fc81 Upgrade to plexus-archiver to 3.6.0
Closes gh-14411
2018-09-11 18:08:59 -07:00
Phillip Webb 59e210642b Upgrade plexus-utils to 3.1.0
Closes gh-14422
2018-09-11 18:08:59 -07:00
Madhura Bhave 6c1915e81f Merge branch '2.0.x' 2018-09-11 17:03:38 -07:00
Madhura Bhave 7af6665a0e Ignore management.server.port for war
Fixes gh-14148
2018-09-11 16:56:03 -07:00
Phillip Webb 8ed516e9ae Polish 2018-09-11 15:10:25 -07:00
Phillip Webb aa2da0bb0d Remove logging level changes from devtools
Update `DevToolsPropertyDefaultsPostProcessor` to remove custom logging
level configuration. Unfortunately it's not easy to back-off logging
overrides when the user has a custom logback/log4j configuration.

Closes gh-14310
2018-09-11 15:07:34 -07:00
Phillip Webb 84b6fff8c0 Update copyright year for changed files 2018-09-11 14:28:28 -07:00
Phillip Webb 57ec09a55f Polish 2018-09-11 14:27:10 -07:00
Phillip Webb 0c00508b3c Register ApplicationConversionService for context
Update `SpringApplication` to automatically register the shared
`ApplicationConversionService` instance with the `BeanFactory` and
`Environment`.

Closes gh-12148
2018-09-11 14:24:27 -07:00