Commit Graph

18477 Commits

Author SHA1 Message Date
Andy Wilkinson
eefa7e9f78 Merge branch '2.0.x' 2018-09-18 11:30:44 +01:00
Andy Wilkinson
6020cb67d3 Polish javadoc of status method on WebFluxTags and WebMvcTags 2018-09-18 11:30:35 +01:00
Andy Wilkinson
c1b864c826 Polish 2018-09-18 11:18:28 +01:00
Madhura Bhave
9201e23f67 Revert "Raised the default version of Mongo to 3.6.5 when using Embedded Mongo."
This reverts commit 1a4ad96dd0. Reverting
to see if this fixes CI timeouts.
2018-09-17 15:25:54 -07:00
Madhura Bhave
b2dd162572 Merge branch '2.0.x' 2018-09-17 14:30:38 -07:00
Madhura Bhave
d7d5cbf959 Simplify printing ConditionEvaluationReport when using context runner
Closes gh-13119
2018-09-17 14:23:47 -07:00
Madhura Bhave
7127098f86 Remove call to stop_docker 2018-09-17 13:25:30 -07:00
Madhura Bhave
51f9cdd14a Update pipeline badge configuration 2018-09-17 11:22:01 -07:00
Andy Wilkinson
e1328f05e7 Merge branch '2.0.x' 2018-09-17 15:55:35 +01:00
Andy Wilkinson
fc60d9f6d4 Merge branch '1.5.x' into 2.0.x 2018-09-17 15:50:12 +01:00
Andy Wilkinson
a91f9b6f17 Document that Cassandra policy classes must have a default constructor
Closes gh-14461
2018-09-17 15:46:38 +01:00
Andy Wilkinson
354cc985ee Merge pull request #14420 from Gary Russell
* gh-14420:
  Start building against Spring Kafka 2.2.0 snapshots
2018-09-17 12:35:41 +01:00
Gary Russell
19cea75e74 Start building against Spring Kafka 2.2.0 snapshots
See gh-14491
Closes gh-14420
2018-09-17 12:35:37 +01:00
Andy Wilkinson
1a4ad96dd0 Raised the default version of Mongo to 3.6.5 when using Embedded Mongo.
While MongoDB 3.6.7 has been released, 3.6.5 is the latest version that's supported
by the version of Embedded Mongo that we're currently using.

Closes gh-14476
2018-09-17 12:29:48 +01:00
Andy Wilkinson
0a2d2e6bdb Merge pull request #14471 from Davin Kevin
* gh-14471:
  Polish "Use ExecutorProvider bean if available when auto-configuring jOOQ"
  Use ExecutorProvider bean if available when auto-configuring jOOQ
2018-09-17 11:26:02 +01:00
Andy Wilkinson
a1d1a7392f Polish "Use ExecutorProvider bean if available when auto-configuring jOOQ"
Closes gh-14471
2018-09-17 11:20:45 +01:00
davinkevin
620419f9e4 Use ExecutorProvider bean if available when auto-configuring jOOQ
See gh-14471
2018-09-17 11:15:47 +01:00
Andy Wilkinson
637f6979ba Merge pull request #14483 from durigon
* gh-14483:
  Use Matcher from pre-compiled Pattern rather than String for replaceAll
2018-09-17 11:05:26 +01:00
durigon
7aaeefbc0e Use Matcher from pre-compiled Pattern rather than String for replaceAll
Closes gh-14483
2018-09-17 10:54:54 +01:00
Andy Wilkinson
11016bc7f4 Merge pull request #14478 from Artsiom Yudovin
* gh-14478:
  Polish "Publish ApplicationContextInitializedEvent on contextPrepared"
  Publish ApplicationContextInitializedEvent on contextPrepared
2018-09-17 10:51:54 +01:00
Andy Wilkinson
5e0e941632 Polish "Publish ApplicationContextInitializedEvent on contextPrepared"
Closes gh-14478
2018-09-17 10:50:28 +01:00
artsiom
b4c6cef526 Publish ApplicationContextInitializedEvent on contextPrepared
See gh-14478
2018-09-17 10:43:12 +01:00
Phillip Webb
d127d071fd Ensure classpath resource are also filtered
Update `ExtendedGroovyClassLoader` to also filter resources.

Closes gh-14482
2018-09-15 18:03:53 -07:00
Phillip Webb
99908fdfe7 Polish 2018-09-15 18:03:53 -07:00
Phillip Webb
5cc1a830b2 Fixup abstract configuration following SPR-16839
Spring Framework now requires that all nested configuration classes
are contained within a `@Component` class (see SPR-16839). This means
that our abstract `JpaBaseConfiguration` class should have a
`@Configuration` annotation.

Closes gh-14480
2018-09-15 18:03:53 -07:00
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