Commit Graph

24465 Commits

Author SHA1 Message Date
Madhura Bhave
4ac12660c6 Explicitly enable config properties scan in java release scripts
This commit also upgrades the Spring Boot version used by the scripts
to 2.2.4 which is why the explicit annotation is required.

Closes gh-20174
2020-02-14 13:46:56 -08:00
Andy Wilkinson
e065ee7be2 Merge branch '2.1.x' into 2.2.x
Closes gh-20183
2020-02-14 14:47:03 +00:00
Stephane Nicoll
7a114995b3 Merge pull request #20169 from juzerali
* pr/20169:
  Polish "Document sanitized keys and uri sanitization behavior"
  Document sanitized keys and uri sanitization behavior

Closes gh-20169
2020-02-14 15:30:05 +01:00
Stephane Nicoll
40d1727cc5 Polish "Document sanitized keys and uri sanitization behavior"
See gh-20169
2020-02-14 15:29:47 +01:00
Juzer Ali
30f7f9c9c4 Document sanitized keys and uri sanitization behavior
See gh-20169
2020-02-14 15:28:36 +01:00
Andy Wilkinson
c8907d46b4 Fix up-to-date checking of build info properties
Closes gh-20135
2020-02-14 11:56:19 +00:00
Stephane Nicoll
fc410f0572 Merge pull request #20168 from dsyer
* pr/20168:
  Remove duplicate auto-configuration class

Closes gh-20168
2020-02-14 10:26:03 +01:00
Dave Syer
dcaaf9785f Remove duplicate auto-configuration class
See gh-20168
2020-02-14 10:25:19 +01:00
Stephane Nicoll
2ede9e63b9 Merge branch '2.1.x' into 2.2.x
Closes gh-20117
2020-02-14 10:20:33 +01:00
Stephane Nicoll
32c1dd45a9 Revert "Merge pull request #19926 from xak2000"
Closes gh-19926
2020-02-14 10:18:02 +01:00
Stephane Nicoll
06c85e96c3 Merge branch '2.1.x' into 2.2.x
Closes gh-20159
2020-02-13 13:13:17 +01:00
Stephane Nicoll
41b054460b Merge pull request #20157 from dreis2211
* pr/20157:
  Upgrade CI to Docker 19.03.5

Closes gh-20157
2020-02-13 10:25:02 +01:00
dreis2211
e1f743a21b Upgrade CI to Docker 19.03.5
See gh-20157
2020-02-13 10:24:33 +01:00
dreis2211
92b4ba6367 Fix structuring your code link in multi-page HTML documentation
Closes gh-19953
2020-02-12 17:43:08 +00:00
Madhura Bhave
4eb71fc424 Merge branch '2.1.x' into 2.2.x 2020-02-11 19:43:19 -08:00
Madhura Bhave
97ac6c9de7 Polish 2020-02-11 19:41:54 -08:00
Madhura Bhave
98a657fedb Merge branch '2.1.x' into 2.2.x
Closes gh-20132
2020-02-11 19:02:19 -08:00
Madhura Bhave
8bce270445 Merge pull request #19202 from bono007
* pr/19202:
  Polish "Verify ssl key alias on server startup"
  Verify ssl key alias on server startup

Closes gh-19202
2020-02-11 17:09:05 -08:00
Madhura Bhave
ac91f14f05 Polish "Verify ssl key alias on server startup"
See gh-19202
2020-02-11 17:08:59 -08:00
cbono
e351605962 Verify ssl key alias on server startup
See gh-19202
2020-02-11 17:04:31 -08:00
Madhura Bhave
3bdd91a119 Merge branch '2.1.x' into 2.2.x 2020-02-11 14:57:49 -08:00
Madhura Bhave
747eab020d Update copyright of changed files 2020-02-11 14:57:17 -08:00
Madhura Bhave
d1c7699539 Merge branch '2.1.x' into 2.2.x
Closes gh-20129
2020-02-11 14:53:30 -08:00
Madhura Bhave
3917968d2a Merge pull request #18915 from schulzh
* pr/18915:
  Polish contribution
  Handle JSON keys containing a dot from CF environment as a single path segment

Closes gh-18915
2020-02-11 14:51:37 -08:00
Madhura Bhave
544dca7f1b Polish contribution
Along with surrounding map keys with dot from VCAP_SERVICES with `[ ]`,
this commit also does that for non-alphanumeric and `-` characters so that
they are not stripped off later.

See gh-18915
2020-02-11 14:50:55 -08:00
Hans Schulz
6828a15d31 Handle JSON keys containing a dot from CF environment as a single path segment
See gh-18915
2020-02-11 14:50:04 -08:00
Stephane Nicoll
8f06d819e4 Harmonize JMS connection factory bean names
This commit restores consistent naming for the auto-configured
connection factory.

Closes gh-19565
2020-02-11 16:23:56 +01:00
Stephane Nicoll
d1f4a1821c Merge branch '2.1.x' into 2.2.x
Closes gh-20123
2020-02-11 14:26:57 +01:00
Stephane Nicoll
b0aba9ed67 Document how to register a blocking health contributor with reactive
Closes gh-19707
2020-02-11 14:22:16 +01:00
Stephane Nicoll
fe6b96174e Merge branch '2.1.x' into 2.2.x
Closes gh-20122
2020-02-11 14:00:30 +01:00
Stephane Nicoll
06e5b0e912 Upgrade CI to Artifactory Resource 0.0.11
Closes gh-19629
2020-02-11 13:59:37 +01:00
Stephane Nicoll
765b2178d1 Document spring-boot.run.arguments behaviour with multiple arguments
Closes gh-19998
2020-02-11 13:39:10 +01:00
Stephane Nicoll
5f584101c6 Merge branch '2.1.x' into 2.2.x 2020-02-11 13:38:05 +01:00
Stephane Nicoll
2a90c3dea4 Fix broken smoke test
See gh-19926
2020-02-11 13:32:31 +01:00
Stephane Nicoll
1e43537212 Fix broken smoke test
See gh-19926
2020-02-11 11:56:52 +01:00
Stephane Nicoll
a425cc1b46 Merge branch '2.1.x' into 2.2.x
Closes gh-20117
2020-02-11 10:30:19 +01:00
Stephane Nicoll
4c0c0aeb42 Merge pull request #19926 from xak2000
* pr/19926:
  Polish "Remove unnecessary leading slash in changelog locations"
  Remove unnecessary leading slash in changelog locations

Closes gh-19926
2020-02-11 10:29:50 +01:00
Stephane Nicoll
ec14e82312 Polish "Remove unnecessary leading slash in changelog locations"
See gh-19926
2020-02-11 10:29:34 +01:00
Ruslan Stelmachenko
5f7e1ac4f2 Remove unnecessary leading slash in changelog locations
See gh-19926
2020-02-11 10:14:49 +01:00
Stephane Nicoll
b4d118e041 Merge pull request #19948 from jcordoba95
* pr/19948:
  Polish "Fix condition source in OnBeanCondition"
  Fix condition source in OnBeanCondition

Closes gh-19948
2020-02-11 09:29:54 +01:00
Stephane Nicoll
66809c6c1e Polish "Fix condition source in OnBeanCondition"
See gh-19948
2020-02-11 09:27:59 +01:00
Jorge Cordoba
547fc30ead Fix condition source in OnBeanCondition
See gh-19948
2020-02-11 09:10:07 +01:00
Madhura Bhave
d485708f68 Fix 404 when composite contributor is added to a group
Fixes gh-19974
2020-02-10 17:09:01 -08:00
Stephane Nicoll
76c21571b4 Remove unnecessary dependency on sendgrid
Closes gh-20099
2020-02-08 09:11:03 +01:00
Stephane Nicoll
ab72237b1b Merge pull request #19002 from medamines1
* pr/19002:
  Polish "Make Kubernetes detection slightly more efficient"
  Make Kubernetes detection slightly more efficient

Closes gh-19002
2020-02-07 14:28:43 +01:00
Stephane Nicoll
ddb5cc3f99 Polish "Make Kubernetes detection slightly more efficient"
See gh-19002
2020-02-07 14:24:39 +01:00
med-amine.dahmen
aee22bfb51 Make Kubernetes detection slightly more efficient
See gh-19002
2020-02-07 13:45:50 +01:00
Madhura Bhave
37575d78bf Merge pull request #19999 from bono007
* pr/19999:
  Polish contribution
  Add 'uris', 'address' and 'addresses' to keys to sanitize.

Closes gh-19999
2020-02-06 17:41:02 -08:00
Madhura Bhave
acc453db4a Polish contribution
See gh-19999
2020-02-06 17:36:05 -08:00
cbono
badc83d368 Add 'uris', 'address' and 'addresses' to keys to sanitize.
See gh-19999
2020-02-06 17:23:23 -08:00