Commit Graph

27490 Commits

Author SHA1 Message Date
Tadaya Tsuyukubo
294267d2e0 Fix typo on ConditionMessage
See gh-19354
2019-12-22 08:40:43 +01:00
Stephane Nicoll
239e1d1c2f Merge branch '2.2.x'
Closes gh-19431
2019-12-21 16:41:22 +01:00
Stephane Nicoll
4caa351aa3 Merge branch '2.1.x' into 2.2.x
Closes gh-19430
2019-12-21 16:40:44 +01:00
Stephane Nicoll
26e320faf8 Merge pull request #19357 from dreis2211
* pr/19357:
  Add missing icon to daily CI build

Closes gh-19357
2019-12-21 16:40:27 +01:00
dreis2211
6f07740a61 Add missing icon to daily CI build
See gh-19357
2019-12-21 16:38:56 +01:00
Stephane Nicoll
e38ef6ef1f Merge branch '2.2.x'
Closes gh-19429
2019-12-21 16:37:32 +01:00
Stephane Nicoll
b15a960670 Merge pull request #19409 from izeye
* pr/19409:
  Polish

Closes gh-19409
2019-12-21 16:37:20 +01:00
Johnny Lim
0bf359f4a2 Polish
See gh-19409
2019-12-21 16:36:06 +01:00
Stephane Nicoll
bd179393ea Merge branch '2.2.x'
Closes gh-19428
2019-12-21 16:34:47 +01:00
Stephane Nicoll
9da62e2384 Merge pull request #19410 from Dark0096
* pr/19410:
  Remove unused import statement

Closes gh-19410
2019-12-21 16:34:26 +01:00
dark
4f99c9f281 Remove unused import statement
See gh-19410
2019-12-21 16:33:53 +01:00
Brian Clozel
813c901905 Merge branch '2.2.x'
Closes gh-19425
2019-12-20 22:12:20 +01:00
Brian Clozel
92aae91482 Merge pull request #19424 from fjacobs
* pr/19424:
  Polish
  Fix typo in RSocket docs

Closes gh-19424
2019-12-20 22:10:56 +01:00
Brian Clozel
82391a406a Polish
See gh-19424
2019-12-20 21:55:59 +01:00
Ferdinand Jacobs
4555123b7d Fix typo in RSocket docs
See gh-19424
2019-12-20 21:50:14 +01:00
Andy Wilkinson
88d76a24d0 Merge pull request #19423 from dreis2211
* gh-19423:
  Fix compilation error

Closes gh-19423
2019-12-20 17:10:58 +00:00
dreis2211
4b10462464 Fix compilation error
See gh-19423
2019-12-20 17:10:39 +00:00
Andy Wilkinson
7551a79e80 Merge branch '2.2.x'
Closes gh-19422
2019-12-20 15:55:16 +00:00
Andy Wilkinson
ea00ab9919 Protect against NoSuchMethodError when deploying to old Tomcats
Fixes gh-19308
2019-12-20 15:53:08 +00:00
Andy Wilkinson
be4c4f9c13 Merge branch '2.2.x'
Closes gh-19420
2019-12-20 15:41:24 +00:00
Andy Wilkinson
0e6932d550 Merge branch '2.1.x' into 2.2.x
Closes gh-19419
2019-12-20 15:41:02 +00:00
Andy Wilkinson
35b74185e4 Fix test ordering problems by always clearing URL stream handler factory
Closes gh-19349
2019-12-20 15:36:39 +00:00
Andy Wilkinson
07857f7f24 Merge branch '2.2.x'
Closes gh-19418
2019-12-20 15:28:40 +00:00
Andy Wilkinson
8ed0b1a231 Merge branch '2.1.x' into 2.2.x
Closes gh-19417
2019-12-20 15:28:11 +00:00
Andy Wilkinson
3cadde0900 Protect against available port actually being unavailable
Closes gh-19355
2019-12-20 15:22:30 +00:00
Andy Wilkinson
6009baa71b Remove plugin management for Maven's site plugin
Closes gh-19085
2019-12-20 14:50:50 +00:00
Andy Wilkinson
eeeeaa5edb Merge branch '2.2.x'
Closes gh-19416
2019-12-20 14:44:34 +00:00
Andy Wilkinson
8b4c6c2cf9 Merge branch '2.1.x' into 2.2.x
Closes gh-19415
2019-12-20 14:43:53 +00:00
Andy Wilkinson
f75c73eb7a Use Testcontainers in the launch script integration tests
Closes gh-19366
2019-12-20 13:15:32 +00:00
Phillip Webb
93d9147864 Add deprecation documentation to Archive.iterator
See gh-16655
2019-12-19 16:52:47 -08:00
Brian Clozel
1e117c704b Merge branch '2.2.x'
Closes gh-19404
2019-12-19 15:24:41 +01:00
Brian Clozel
979437398c Merge branch '2.1.x' into 2.2.x
Closes gh-19403
2019-12-19 15:23:19 +01:00
Brian Clozel
3e48e36e47 Improve docs on running apps behind proxies
Fixes gh-15046
2019-12-19 15:16:13 +01:00
Stephane Nicoll
dabb9b89c7 Merge branch '2.2.x' 2019-12-19 13:45:36 +09:00
Stephane Nicoll
b515d6ba9a Merge pull request #19397 from aklish
* pr/19397:
  Add Elide as 3rd party Spring Boot Starter

Closes gh-19397
2019-12-19 13:45:08 +09:00
Aaron Klish
8b149dcea9 Add Elide as 3rd party Spring Boot Starter
See gh-19397
2019-12-19 13:44:50 +09:00
Stephane Nicoll
ad6859fa39 Merge branch '2.2.x' 2019-12-17 09:44:58 +09:00
Stephane Nicoll
e95c2b215b Merge branch '2.1.x' into 2.2.x 2019-12-17 09:44:44 +09:00
Stephane Nicoll
57e838e526 Merge pull request #19377 from izeye
* pr/19377:
  Remove duplicate entry for Neo4jHealthIndicator

Closes gh-19377
2019-12-17 09:44:28 +09:00
Johnny Lim
8bbc7f7b67 Remove duplicate entry for Neo4jHealthIndicator
See gh-19377
2019-12-17 09:43:09 +09:00
Stephane Nicoll
bb3b6dbd7d Merge branch '2.2.x'
Closes gh-19375
2019-12-15 09:05:27 +09:00
Stephane Nicoll
c076b625da Merge pull request #19369 from dreis2211
* pr/19369:
  Add group property to DynatraceProperties

Closes gh-19369
2019-12-15 09:04:51 +09:00
dreis2211
b6e4c0f012 Add group property to DynatraceProperties
See gh-19369
2019-12-15 08:54:42 +09:00
Andy Wilkinson
ef2eb2f652 Remove accidental usage of Plexus's CollectionUtils
See gh-16655 and 8f5777cf
2019-12-14 17:42:26 +00:00
Phillip Webb
1b1c61a2ed Make processor output fully reproducible
Update `AutoConfigureAnnotationProcessor` to ensure that the generated
properties file is fully repeatable. Properties are now sorted and
written out directly to ensure that the timestamp comment is not
present.

Closes gh-19370
2019-12-13 13:04:49 -08:00
Phillip Webb
695de2c6f5 Polish end-to-end configuration properties tracing
See gh-14880
2019-12-13 12:47:01 -08:00
Phillip Webb
830c2ef7f1 Polish 2019-12-13 11:47:42 -08:00
Phillip Webb
be3b11db48 Merge branch '2.2.x' 2019-12-13 11:47:04 -08:00
Phillip Webb
6d372f60d9 Merge branch '2.1.x' into 2.2.x 2019-12-13 11:46:25 -08:00
Phillip Webb
8e03982bca Fix checkstyle violation 2019-12-13 11:45:56 -08:00