Merge branch '2.0.x'

2022-01-12 12:36:42 +00:00
parent 2bac639fa3 87e9b58201
commit 0a8c2b1b1f
22 changed files with 665 additions and 208 deletions
--- a/samples/web-test-client/src/main/java/com/example/webtestclient/SampleWebTestClientApplication.java
+++ b/samples/web-test-client/src/main/java/com/example/webtestclient/SampleWebTestClientApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.