Commit Graph

279 Commits

Author SHA1 Message Date
Madhura Bhave 8088e79f48 Merge branch '2.1.x'
Closes gh-18355
2019-09-25 09:45:23 -07:00
dreis2211 de6c38398e Fix checkstyle errors in SampleReactiveOAuth2ClientApplicationTests
See gh-18351
2019-09-25 13:55:34 +01:00
Phillip Webb f1ec810caf Polish 2019-09-24 19:53:50 -07:00
Phillip Webb 323a78c4b9 Add property to migrate deprecated endoint IDs
Allow legacy actuator endpoint IDs that contain dots to be transparently
migrated to the new format. This update will allow Spring Cloud users
to proactively migrate from endpoints such as `hystrix.stream` to
`hystrixstream`.

Closes gh-18148
2019-09-24 19:53:50 -07:00
Madhura Bhave 0a70e33009 Merge branch '2.1.x'
Closes gh-18345
2019-09-24 10:28:54 -07:00
Phillip Webb 303974fde9 Add block pixel mode support for image banners
Add support for a `spring.banner.image.pixelmode` property which can
be set to `block` to use unicode block characters when rendering image
banners.

Closes gh-18301
2019-09-22 00:18:54 -07:00
Phillip Webb 4ef1e18216 Add ANSI 8-bit color image banner support
Update `ImageBanner` and `AnsiColors` to optionally support 8-bit
color output.

See gh-18264
2019-09-21 23:30:05 -07:00
Andy Wilkinson 79b5fd9d73 Polish "Allow the user that runs the app to be specified via an env var"
See gh-16973
2019-09-21 20:14:49 +01:00
Wagner Macedo b57f35893c Allow the user that runs the app to be specified via an env var
See gh-16973
2019-09-21 17:57:20 +01:00
Andy Wilkinson 1b237de5f5 Use Awaitility in our own tests
Closes gh-18227
2019-09-13 20:50:14 +01:00
Vedran Pavic 479b4be5f5 Update Quartz smoke test to use JDBC job store
See gh-18196
2019-09-11 10:00:22 +02:00
Andy Wilkinson 3e56e00ca0 Align with repackaging of Neo4j's ServiceUnavailableException
See gh-18162
2019-09-06 13:03:40 +01:00
Andy Wilkinson 9ed6b92ecc Merge branch '2.1.x' 2019-09-02 17:22:09 +01:00
Andy Wilkinson b8070a8339 Skip tests on Windows that exceed its file system's limitations 2019-09-02 17:18:20 +01:00
Andy Wilkinson bbec7b0f37 Merge branch '2.1.x'
Closes gh-17994
2019-08-29 12:30:06 +01:00
Andy Wilkinson 9961647c7f Improve handling of reserved characters in MetaInfResourceManager
Previously, MetaInfResourceManager that we use with Undertow to serve
static resources from jar's META-INF/resources did not correctly
handle characters in the path that should be percent-encoded when
used in a URL.

This commit updates MetaInfResourceManager to encode the path before
it is used to create a URL. Prior to this encoding, encoded slashes
(%2F) are decoded as, unlike other encoded characters in the request's
URL, encoded slashes are not decoded prior to calling the
ResourceManager.

Fixes gh-17853
2019-08-29 12:13:40 +01:00
Madhura Bhave 2726540e76 Merge branch '2.1.x'
Closes gh-17980
2019-08-28 13:13:48 +05:30
Phillip Webb e03f822c6d Add support for health indicator groups
Update the `HealthEndpoint` to support health groups. The
`HealthEndpointSettings` interface has been replaced with
`HealthEndpointGroups` which provides access to the primary group
as well as an optional set of additional groups.

Groups can be configured via properties and may have custom
`StatusAggregator` and `HttpCodeStatusMapper` settings.

Closes gh-14022

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
2019-08-21 18:43:25 -07:00
Stephane Nicoll 4d21efcc0a Remove outdated comment in smoke tests
Closes gh-17741
2019-08-01 10:36:08 +02:00
Stephane Nicoll 78d2578c78 Polish "Add WebFlux Coroutines smoke test"
See gh-17701
2019-07-31 10:00:22 +02:00
Sebastien Deleuze 3dfb69841f Add WebFlux Coroutines smoke test
See gh-17701
2019-07-31 09:46:53 +02:00
Madhura Bhave 1b10ecbe1b Merge branch '2.1.x' 2019-07-29 11:08:38 -07:00
Johnny Lim 77a262c542 Polish
See gh-17691
2019-07-29 11:01:23 -07:00
Phillip Webb 6675f49334 Switch to multi-line security configuration
Now that we have lambda style security configuration we can further
improve readability by switching to one statement per line.

See gh-17525
2019-07-29 11:28:51 +01:00
Madhura Bhave 39a7b9da38 Switch to lambda style security configuration
Closes gh-17525
2019-07-26 14:41:49 -07:00
Madhura Bhave 4a309ed491 Merge branch '2.1.x' 2019-07-24 16:27:49 -07:00
Madhura Bhave f13f96d705 Fix customizer for windows tests
JettyServerCustomizers beans do not get picked up automatically in 2.1.x

See gh-15553
2019-07-24 16:11:18 -07:00
Madhura Bhave 9bd1187f40 Merge branch '2.1.x'
Closes gh-17628
2019-07-24 13:39:45 -07:00
Madhura Bhave bb85612723 Add concourse pipeline for Windows
Closes gh-15553
2019-07-24 13:25:54 -07:00
Phillip Webb 8bc780762a Merge branch '2.1.x' 2019-07-24 11:42:48 +01:00
Phillip Webb fb1dd8fe93 Merge branch '2.0.x' into 2.1.x 2019-07-24 11:41:32 +01:00
Phillip Webb 913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Andy Wilkinson cc85746942 Merge branch '2.1.x'
Closes gh-17575
2019-07-18 17:17:05 +01:00
Andy Wilkinson 591250f75e Polish "Hide loader classes from Tomcat's ServletContext resource paths"
See gh-17538
2019-07-18 17:05:31 +01:00
Phillip Webb a9ba7080ce Merge branch '2.1.x' 2019-07-17 21:48:42 +01:00
dreis2211 1c3031e4db Fix formatting in Couchbase smoke tests
See gh-17519
2019-07-15 15:04:48 +02:00
Phillip Webb 0cb6a7f47d Polish 2019-07-15 00:24:19 +01:00
Phillip Webb 01933f9b06 Merge previously split strings
Merge some string lines that were previously split because of the
90 chars wide formatting.
2019-07-15 00:24:19 +01:00
Phillip Webb c3816bfe7b Polish output capture names 2019-07-15 00:24:18 +01:00
Madhura Bhave 6164e3efe8 Merge branch '2.1.x' 2019-07-10 18:26:25 -07:00
Madhura Bhave d590c3ed10 Merge branch '2.1.x'
Closes gh-17486
2019-07-10 15:32:22 -07:00
Phillip Webb 2208dc1bc2 Refine smoke-tests setup for Eclipse 2019-07-10 13:02:02 +01:00
dreis2211 5051916f6f Polish Base64 usages
See gh-17459
2019-07-09 15:21:04 +01:00
Andy Wilkinson 4b2a116fa7 Use String indexOf(char) and lastIndexOf(char) where possible
Closes gh-11416
2019-07-04 17:44:40 +01:00
Madhura Bhave 39b15af5d6 Polish "Provide links / when using a separate management port"
See gh-17418
2019-07-03 16:19:40 -07:00
HaiTao Zhang c108629311 Provide links for actuators at / when using a separate management port
See gh-17418
2019-07-03 16:19:40 -07:00
Phillip Webb a66c4d3096 Unify method visibility of private classes
Apply checkstyle rule to ensure that private and package private
classes do not have unnecessary public methods. Test classes have
also been unified as much as possible to use default scoped
inner-classes.

Closes gh-7316
2019-07-03 11:39:47 -07:00
Madhura Bhave 0a02a3a19c Move Hibernate52 tests under smoke tests
Closes gh-17393
2019-07-02 16:06:06 -07:00
Madhura Bhave d9466f5659 Move smoke tests under spring-boot-test
See gh-17393
2019-07-02 15:55:58 -07:00
Phillip Webb 605599138e Merge branch '2.1.x' 2019-06-28 23:56:02 -07:00
Phillip Webb 92bff3c328 Merge branch '2.0.x' into 2.1.x 2019-06-28 23:42:28 -07:00
Phillip Webb cfeb0239b7 Merge branch '1.5.x' into 2.0.x 2019-06-28 23:28:34 -07:00
Phillip Webb 8edf88a08b Polish M2Eclipse ignore configuration
Pull all M2Eclipse ignore configuration up to the parent POM and
increase the version ranges covered.
2019-06-27 09:42:14 -07:00
Andy Wilkinson 66f1344f7c Merge branch '2.1.x'
Closes gh-17335
Closes gh-17292
2019-06-27 12:00:34 +01:00
Stephane Nicoll e560b7f6ba Remove public modifier on JUnit5 lifecycle methods
See gh-17292
2019-06-21 18:09:05 +02:00
Issam El-atif 35dc7982d2 Fix deployment tests JUnit 5 checkstyle issues
See gh-17106
2019-06-11 09:02:04 -07:00
Phillip Webb b3d5cd538d Add JUnit 5 checkstyle rules
Add a rule to enforce JUnit 5 usage and conventions.

Closes gh-17093
2019-06-10 16:16:45 -07:00
Phillip Webb 266d6334b2 Fix checkstyle RedundantModifier test violations 2019-06-07 20:46:33 -07:00
Phillip Webb cde4f0d688 Fix checkstyle violations 2019-06-07 13:27:14 -07:00
Phillip Webb 866e2b712e Merge branch '2.0.x' into 2.1.x 2019-06-07 12:35:28 -07:00
Phillip Webb 2c8881a908 Merge branch '1.5.x' into 2.0.x 2019-06-07 12:34:13 -07:00
Andy Wilkinson b18fffaf14 Move tests to JUnit 5 wherever possible 2019-06-07 12:25:54 +01:00
Andy Wilkinson 36f56d034a Merge branch '2.1.x' 2019-06-07 12:25:19 +01:00
Andy Wilkinson 612a929c19 Merge branch '2.0.x' into 2.1.x 2019-06-07 12:24:18 +01:00
Andy Wilkinson 5c21c68146 Merge branch '1.5.x' into 2.0.x 2019-06-07 12:23:34 +01:00
Andy Wilkinson aef92b9295 Merge branch '2.1.x'
Closes gh-17079
2019-06-07 11:00:44 +01:00
Andy Wilkinson 24925c3dae Merge branch '2.0.x' into 2.1.x
Closes gh-17078
2019-06-07 10:50:34 +01:00
Andy Wilkinson c6c139d980 Merge branch '1.5.x' into 2.0.x 2019-06-07 10:46:31 +01:00
Phillip Webb db75347eb6 Merge branch '2.1.x' 2019-06-04 14:41:20 -07:00
Phillip Webb 0ef331018e Merge branch '2.0.x' into 2.1.x 2019-06-04 14:30:52 -07:00
Phillip Webb 7fc01971ed Merge branch '1.5.x' into 2.0.x 2019-06-04 14:20:25 -07:00
Phillip Webb d306b31ce9 Merge branch '2.1.x' 2019-06-04 02:08:00 -07:00
Phillip Webb ccfbd03482 Merge branch '2.0.x' into 2.1.x 2019-06-04 02:07:14 -07:00
Phillip Webb b442d3b906 Merge branch '1.5.x' into 2.0.x 2019-06-04 01:49:03 -07:00
Phillip Webb 5fba43aa31 Merge branch '1.5.x' into 2.0.x 2019-06-04 00:05:57 -07:00
Phillip Webb 1e44aba772 Fix compiler warnings and polish
Fix various compiler warnings and apply a little polish.
2019-04-24 19:37:42 -07:00
Andy Wilkinson d182ee2246 Merge branch '2.1.x'
Closes gh-16637
2019-04-24 10:19:31 +01:00
Andy Wilkinson ed85735822 Merge branch '2.0.x' into 2.1.x
Closes gh-16636
2019-04-24 10:10:01 +01:00
Andy Wilkinson 3e3d7545cc Merge branch '1.5.x' into 2.0.x 2019-04-24 10:01:50 +01:00
Andy Wilkinson 27990180ab Merge branch '2.1.x'
Closes gh-16626
2019-04-23 14:30:21 +01:00
Andy Wilkinson 73704c84e1 Use latest Docker Java and a compatible version of Jersey
Closes gh-16625
2019-04-23 14:29:32 +01:00
Phillip Webb 5f1bbf8c72 Update copyright header of changed files 2019-04-15 17:51:08 -07:00
Madhura Bhave 3c203e9b0d Update devtools to use @Lazy(false)
Fixes gh-16184
2019-04-05 18:02:27 -07:00
Andy Wilkinson 4900505425 Merge branch '2.0.x' into 2.1.x 2019-03-26 13:53:57 +00:00
Andy Wilkinson fedb40a2bf Merge branch '1.5.x' into 2.0.x 2019-03-26 13:48:32 +00:00
Andy Wilkinson 36c1c051b8 Merge branch '2.1.x' 2019-03-20 16:55:10 +00:00
Andy Wilkinson e23f72c8b0 Merge branch '2.0.x' into 2.1.x 2019-03-20 16:53:48 +00:00
Andy Wilkinson 9fbd38ab3c Merge branch '1.5.x' into 2.0.x 2019-03-20 16:45:26 +00:00
Spring Operator 00ab30362c Use HTTPS for external links in XML files
See gh-16270
2019-03-20 14:33:25 +00:00
Andy Wilkinson b828b398b5 Merge branch '2.1.x' 2019-03-19 17:11:45 +00:00
Spring Operator b32c0080c3 Update build and setup configuration to use HTTPS
See gh-16247
2019-03-19 17:06:45 +00:00
Andy Wilkinson a36aa67b52 Merge branch '2.0.x' into 2.1.x 2019-03-19 17:04:41 +00:00
Spring Operator 3e2b6ac8ed Update build and setup configuration to use HTTPS
See gh-16246
2019-03-19 16:58:31 +00:00
Andy Wilkinson 28cf63354a Merge pull request #16106 from Spring Operator
* gh-16106:
  Drop AnyEdit from Eclipse setup as it is not available over HTTPS
  Update build and setup configuration to use HTTPS

Closes gh-16106
2019-03-12 10:05:06 +00:00
Spring Operator c9c554b834 Update build and setup configuration to use HTTPS
See gh-16106
2019-03-12 10:02:44 +00:00
Stephane Nicoll 8ff0a9c5a9 Merge branch '2.1.x' 2019-03-12 10:51:08 +01:00
Johnny Lim bcfbabe6cd Polish
Closes gh-16193
2019-03-12 10:50:32 +01:00
Andy Wilkinson d6a869fa98 Switch to Jakarta EE API dependencies where possible
Closes gh-16113
Closes gh-16112
Closes gh-16111
Closes gh-15916
Closes gh-15689
2019-03-06 11:20:51 +00:00
Andy Wilkinson 61d04db0d7 Minimize and centralize assumptions about build output
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson bbf0932f0f Exclude jcl-over-slf4j in favour of spring-jcl
Closes gh-15392
2018-12-07 15:37:24 +00:00
Phillip Webb ba1ef52e39 Merge branch '2.0.x' 2018-11-29 15:32:48 -08:00
Phillip Webb 893d5666be Update copyright year for changed files 2018-11-29 15:30:51 -08:00
Madhura Bhave 1bb788f5c2 Merge branch '2.0.x' 2018-11-15 14:17:05 -08:00
Phillip Webb 657a5347be Use random port for Devtools integration tests
Closes gh-15013
2018-11-15 14:02:21 -08:00
Andy Wilkinson bfb0886495 Tolerate Hibernate 5.2
Closes gh-15100
2018-11-08 12:24:22 +00:00
Phillip Webb 80685f81bf Merge branch '2.0.x' 2018-10-29 22:33:21 -07:00
Phillip Webb 744cdf43e9 Revert "Use random port for DevTools tests"
This reverts commit 4630c2292f.
2018-10-29 22:33:00 -07:00
Phillip Webb 2d305341a4 Merge branch '2.0.x' 2018-10-29 17:43:43 -07:00
Phillip Webb 4630c2292f Use random port for DevTools tests
Change the `RemoteApplicationLauncher` to use a random port and also
protect against an NPE if the launch fails.
2018-10-29 17:42:47 -07:00
Phillip Webb f3fa20b2d1 Polish 2018-10-29 14:25:45 -07:00
Andy Wilkinson eafee8be58 Merge branch '2.0.x' 2018-10-29 11:00:30 +00:00
Andy Wilkinson 974f90cefe Merge branch '1.5.x' into 2.0.x 2018-10-29 11:00:20 +00:00
Phillip Webb 6aedb69443 Update copyright year for changed files 2018-10-05 13:31:33 -07:00
Andy Wilkinson 4a222cb4e5 Polish "Log a warning when using fallback for pid and log locations"
Closes gh-14519
2018-10-04 15:21:05 +01:00
Stephane Nicoll 0eae32371f Polish contribution
Closes gh-14667
2018-10-03 13:59:32 +02:00
Johnny Lim 335775892b Polish
See gh-14667
2018-10-03 13:57:18 +02:00
Andy Wilkinson 65295e0e14 Merge branch '2.0.x' 2018-09-19 19:52:19 +01:00
Andy Wilkinson bff93a67ce Fix remote DevTools restart when a previously added class is then changed
Previously, if a class was added and then changed, a restart would be triggered
and things would behave as if the class had been deleted. This occurred
because, when looking for additional classes that were not on the original
classpath, only files that had been added were considered. The subsequent
change to the class was noticed as a modified rather than an addition,
resulting in the class being skipped.

This commit updates the resource resolver to only ignore deleted files and
consider both added files and modified files when looking for additional
resources.

Closes gh-14205
2018-09-19 18:02:01 +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
Stephane Nicoll 13f08e4c89 Polish 2018-08-16 17:38:26 +02:00
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb 7fc455654a Fix checkstyle ternary issues
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
2018-07-28 01:11:52 +01:00
Stephane Nicoll bc47bf44a9 Merge branch '2.0.x' 2018-06-01 09:26:29 +02:00
Johnny Lim 6b0ce46491 Polish
Closes gh-13320
2018-06-01 09:22:20 +02:00
Andy Wilkinson 76ea2d9dd4 Ensure that the server tests app can resolve milestone poms 2018-05-16 20:23:04 +01:00
Andy Wilkinson 7a27882d62 Restrict Liberty deployment tests to Java 8
OpenLiberty does not yet support Java 9 or 10 and stopping the server
currently hangs when using Java 10.

Closes gh-13141
2018-05-11 10:02:50 +01:00
Phillip Webb 6e09e497f2 Formatting 2018-05-04 12:06:19 -07:00
Phillip Webb e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Andy Wilkinson 49089546f8 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:57:29 +01:00
Johnny Lim b941c5f1a6 Polish
Closes gh-12981
2018-04-27 09:29:16 +02:00
Andy Wilkinson 8b1a101cb6 Merge branch '1.5.x' 2018-04-09 17:39:26 +01:00
Andy Wilkinson aa27334671 Run deployment tests on JDK 9 and 10 where possible
Closes gh-10414
2018-04-04 14:48:58 +01:00
Phillip Webb 69cbf1318c Second attempt to fix server test CI failures
Switch process redirection off and instead consume streams
and copy to System.out/System.err.

See gh-12689
2018-03-29 19:54:41 -07:00
Phillip Webb 7498e7f2cd Revert "Attempt to fix server test CI failures"
This reverts commit 32782429af.
2018-03-29 19:23:11 -07:00
Phillip Webb 32782429af Attempt to fix server test CI failures
Switch surefire configuration so that forking isn't used. This seems to
prevent the "Corrupted STDOUT by directly writing to native stream"
errors and will hopefully reduce failures on the CI server.

See gh-12689
2018-03-29 18:05:34 -07:00
Phillip Webb a4b0be089d Polish 2018-03-14 14:05:26 -07:00
Andy Wilkinson a809e8f316 Polish usage of settings.xml to configure repository
See gh-12293
2018-03-01 15:02:01 +00:00
Andy Wilkinson d0b8a84821 Use settings.xml to pass repository into server integration tests
Closes gh-12293
2018-03-01 12:11:54 +00:00
Andy Wilkinson 35b7a16917 Merge branch '1.5.x' 2018-02-28 11:24:08 +00:00
Stephane Nicoll 306c79f0de Merge branch '1.5.x' 2018-02-26 18:03:32 +01:00
Phillip Webb 4b9c3c137e Polish Collection.toArray
Consistently use `StringUtils.toStringArray`, `ClassUtils.toClassArray`
or zero length when converting collections to arrays.

Fixes gh-12160
2018-02-22 21:11:30 -08:00
Andy Wilkinson e1ab62668f Merge branch '1.5.x' 2018-02-13 15:05:28 +00:00
Andy Wilkinson 76a450dfba Format with Eclipse Oxygen SR2 2018-02-08 10:53:53 +00:00
Andy Wilkinson 5cb38804b4 Polish "Update deployment tests to include Actuator"
Closes gh-11886
2018-02-07 11:51:31 +00:00
Vedran Pavic fc9036a3d9 Update deployment tests to include Actuator
See gh-11886
2018-02-07 11:51:22 +00:00
Phillip Webb c3ec316890 Move Application* and *FileWriter classes
Move `ApplicationHome`, `ApplicationPid` and `ApplicationTemp` to the
`system` package. Since `system` package is now much lower level, the
existing `FileWriter` implementations also needed to move to prevent
package tangles.

Fixes gh-8614
2018-02-01 16:44:42 -08:00
Phillip Webb 3ff772957b Add WebServerApplicationContext abstraction
Add a new `WebServerApplicationContext` interface that provides a common
abstraction for all application contexts that create and manage the
lifecycle of an embedded `WebServer`.

Allows server namespaces to become a first-class concept (rather
subverting `ConfigurableWebApplicationContext.getNamespace()`) and
allow us to drop `getServerId()` from `WebServerInitializedEvent`.

Also helps to improve `ManagementContextAutoConfiguration` and
`ManagementContextFactory`.

Fixes gh-11881
2018-02-01 16:38:15 -08:00
Andy Wilkinson 9542f5182c Move scripts for new launch script tests to correct location
See gh-11397
2018-02-01 09:26:16 +00:00
Phillip Webb 886b39293c Merge branch '1.5.x' 2018-01-30 12:51:45 -08:00
Phillip Webb b234501af3 Polish 2018-01-26 11:39:41 -08:00