Merge branch '2.6.x' into 2.7.x

Closes gh-30671
This commit is contained in:
Andy Wilkinson
2022-04-14 18:38:09 +01:00
2 changed files with 12 additions and 3 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2021 the original author or authors.
* Copyright 2012-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.
@@ -108,7 +108,7 @@ public class BuildInfo extends ConventionTask {
private Map<String, String> coerceToStringValues(Map<String, Object> input) {
Map<String, String> output = new HashMap<>();
input.forEach((key, value) -> output.put(key, value.toString()));
input.forEach((key, value) -> output.put(key, (value != null) ? value.toString() : null));
return output;
}