Build system information should be optionally set

- Changes the build system information to be conditionally set
  within the properties. In multi-threaded builds, without the
  optional put, a ConcurrentModificationException occurs as this
  information is written at the same time the object is being
  iterated over.

Author: ryantse

core/src/main/java/pl/project13/core/cibuild/AwsCodeBuildBuildServerData.java

@@ -40,10 +40,10 @@ public static boolean isActiveServer(Map<String, String> env) {
   @Override
   void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = env.getOrDefault("CODEBUILD_BUILD_NUMBER", "");
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
 
     String buildArn = env.get("CODEBUILD_BUILD_ID");
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, buildArn);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, () -> buildArn);
   }
 
   @Override

core/src/main/java/pl/project13/core/cibuild/AzureDevOpsBuildServerData.java

@@ -41,7 +41,7 @@ public static boolean isActiveServer(@Nonnull Map<String, String> env) {
   void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = env.getOrDefault("BUILD_BUILDNUMBER", "");
 
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
   }
 
   @Override

core/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java

@@ -40,7 +40,7 @@ void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = Optional.ofNullable(env.get("bamboo.buildNumber"))
             .orElseGet(() -> env.getOrDefault("BAMBOO_BUILDNUMBER", ""));
 
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
   }
 
   @Override

core/src/main/java/pl/project13/core/cibuild/BuildServerDataProvider.java

@@ -166,12 +166,6 @@ private void loadBuildHostData(@Nonnull Properties properties) {
     maybePut(properties, GitCommitPropertyConstant.BUILD_HOST, buildHostSupplier);
   }
 
-  protected void put(@Nonnull Properties properties, @Nonnull String key, String value) {
-    String keyWithPrefix = prefixDot + key;
-    log.info("Collected {} with value {}", keyWithPrefix, value);
-    PropertyManager.putWithoutPrefix(properties, keyWithPrefix, value);
-  }
-
   protected void maybePut(@Nonnull Properties properties, @Nonnull String key, Supplier<String> supplier) {
     String keyWithPrefix = prefixDot + key;
     if (properties.containsKey(keyWithPrefix)) {

core/src/main/java/pl/project13/core/cibuild/CircleCiBuildServerData.java

@@ -40,7 +40,7 @@ public static boolean isActiveServer(Map<String, String> env) {
   @Override
   void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = env.getOrDefault("CIRCLE_BUILD_NUM", "");
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
   }
 
   @Override

core/src/main/java/pl/project13/core/cibuild/GitlabBuildServerData.java

@@ -46,8 +46,8 @@ void loadBuildNumber(@Nonnull Properties properties) {
     // CI_PIPELINE_IID will be present if in a Gitlab CI environment (Gitlab >11.0) and contains the project specific build number
     String buildNumber = env.getOrDefault("CI_PIPELINE_IID", "");
 
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, uniqueBuildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, () -> uniqueBuildNumber);
   }
 
   @Override

core/src/main/java/pl/project13/core/cibuild/HudsonJenkinsBuildServerData.java

@@ -42,7 +42,7 @@ public static boolean isActiveServer(@Nonnull Map<String, String> env) {
   void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = env.getOrDefault("BUILD_NUMBER", "");
 
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
   }
 
   @Override

core/src/main/java/pl/project13/core/cibuild/TeamCityBuildServerData.java

@@ -54,8 +54,8 @@ void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = env.getOrDefault("BUILD_NUMBER", "");
     String buildNumberUnique = teamcitySystemProperties.getProperty("teamcity.build.id", "");
 
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, buildNumberUnique);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, () -> buildNumberUnique);
   }
 
   @Override

core/src/main/java/pl/project13/core/cibuild/TravisBuildServerData.java

@@ -42,8 +42,8 @@ void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = env.getOrDefault("TRAVIS_BUILD_NUMBER", "");
     String uniqueBuildNumber = env.getOrDefault("TRAVIS_BUILD_ID", "");
 
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);
-    put(properties, GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, uniqueBuildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
+    maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER_UNIQUE, () -> uniqueBuildNumber);
   }
 
   @Override