Commit Graph

24310 Commits

Author SHA1 Message Date
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
Phillip Webb
2fc12bc36c Merge branch '2.2.x' 2019-12-13 11:30:13 -08:00
Phillip Webb
26ff18f37d Merge branch '2.1.x' into 2.2.x 2019-12-13 11:29:51 -08:00
Phillip Webb
accd830dd5 Update copyright header of changed files 2019-12-13 11:23:24 -08:00
Phillip Webb
9bdad06c10 Polish Netty SSL key alias support
See gh-19197
2019-12-13 11:21:42 -08:00
Madhura Bhave
51e558b08d Merge pull request #19364 from dreis2211
* pr/19364:
  Fix unknown tag in javadoc

Closes gh-19364
2019-12-12 17:05:09 -08:00
dreis2211
3be05f61e1 Fix unknown tag in javadoc
See gh-19364
2019-12-12 17:04:25 -08:00
Madhura Bhave
8dcf1e4033 Provide end-to-end traceability for config properties
Closes gh-14880

Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
2019-12-12 17:02:46 -08:00
Madhura Bhave
8f5777cf9e Optimize JarLauncher when used with exploded jar
- Previously, we would create a JarFileArchive for all nested jars.
This was an additional overhead. We only need to create a JarFileArchive
for jars that can have nested jars in them. For all other jars we only need
the URL to build the classpath.
- While iterating over nested entries in the exploded jar, we only need to
look at BOOT-INF and we can skip any entry that does not match that.

Closes gh-16655

Co-authored-by: Phillip Webb <pwebb@pivotal.io>
2019-12-12 14:33:48 -08:00
Stephane Nicoll
58022d72f5 Merge branch '2.2.x'
Closes gh-19363
2019-12-12 16:59:46 +01:00
Stephane Nicoll
c3ae8bcfdc Merge branch '2.1.x' into 2.2.x
Closes gh-19362
2019-12-12 16:59:21 +01:00
Stephane Nicoll
d93206f5c6 Merge pull request #19340 from dreis2211
* pr/19340:
  Link consistently to Tomcat 9.0 docs

Closes gh-19340
2019-12-12 16:59:01 +01:00
dreis2211
207a5c5022 Link consistently to Tomcat 9.0 docs
See gh-19340
2019-12-12 16:58:37 +01:00
Stephane Nicoll
1d3554de06 Merge branch '2.2.x'
Closes gh-19361
2019-12-12 16:54:31 +01:00
Stephane Nicoll
fc35384b03 Merge branch '2.1.x' into 2.2.x
Closes gh-19360
2019-12-12 16:54:04 +01:00
Stephane Nicoll
283b60d24b Merge pull request #19338 from dreis2211
* pr/19338:
  Fix link to Vaadin Spring Boot starter

Closes gh-19338
2019-12-12 16:53:50 +01:00
dreis2211
29b602d6a0 Fix link to Vaadin Spring Boot starter
See gh-19338
2019-12-12 16:53:21 +01:00
Stephane Nicoll
2c38f09911 Merge branch '2.2.x'
Closes gh-19359
2019-12-12 16:51:08 +01:00
Stephane Nicoll
01753ab5a0 Merge branch '2.1.x' into 2.2.x
Closes gh-19358
2019-12-12 16:50:27 +01:00
Stephane Nicoll
bf397412e6 Merge pull request #19326 from jcordoba95
* pr/19326:
  Polish contribution
  Add missing assertion to SampleTestApplicationWebIntegrationTests.test()

Closes gh-19326
2019-12-12 16:47:09 +01:00
Stephane Nicoll
cd085e0641 Polish contribution
See gh-19326
2019-12-12 16:46:28 +01:00
Jorge Cordoba
f22d0c7d8e Add missing assertion to SampleTestApplicationWebIntegrationTests.test()
See gh-19326
2019-12-12 16:45:03 +01:00
Stephane Nicoll
e2a8017aff Merge pull request #19328 from filiphr
* pr/19328:
  Polish "Detect DirContextAuthenticationStrategy bean"
  Detect DirContextAuthenticationStrategy bean

Closes gh-19328
2019-12-09 16:00:52 +01:00
Stephane Nicoll
aa821151bb Polish "Detect DirContextAuthenticationStrategy bean"
See gh-19328
2019-12-09 15:58:44 +01:00
Filip Hrisafov
c108d2d011 Detect DirContextAuthenticationStrategy bean
This commit improves the LDAP auto-configuration to detect if a
DirContextAuthenticationStrategy bean is defined and, if so, associates
it with the auto-configured `LdapContextSource`.

See gh-19328
2019-12-09 15:58:25 +01:00
Stephane Nicoll
20bebdc07d Merge branch '2.2.x'
Closes gh-19331
2019-12-09 11:58:58 +01:00
Stephane Nicoll
9136f54a5c Merge pull request #19291 from dreis2211
* pr/19291:
  Simplify some Stream API usages

Closes gh-19291
2019-12-09 11:56:03 +01:00
dreis2211
b1158bf35d Simplify some Stream API usages
See gh-19291
2019-12-09 11:52:46 +01:00
Spring Buildmaster
5b92cd841d Next development version (v2.2.3.BUILD-SNAPSHOT) 2019-12-06 07:13:57 +00:00
Phillip Webb
eb0eb492b4 Don't ignore build folders
Closes gh-19318
2019-12-05 21:52:31 -08:00
Phillip Webb
d2ebf5de0e Merge branch '2.2.x'
Closes gh-19317
2019-12-05 20:17:47 -08:00