Merge remote-tracking branch 'upstream/master' into jackson-databind

TheSnoozer · TheSnoozer · commit 3d4e6e71b34a · 2020-08-08T01:42:12.000+02:00
diff --git a/.github/workflows/default-tests.yml b/.github/workflows/default-tests.yml
@@ -120,7 +120,7 @@ jobs:
     name: Deploy snapshot
     runs-on: ubuntu-latest
     needs: integration-test
-    if: ${{ github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/') || github.ref == 'refs/heads/master') }}
+    if: ${{ github.event_name != 'pull_request' && !startsWith(github.ref, 'refs/tags/') && github.ref == 'refs/heads/master' }}
 
     steps:
       - uses: actions/checkout@v1
@@ -136,3 +136,6 @@ jobs:
           restore-keys: ${{ runner.os }}-m2
       - name: Deploy snapshot with Maven
         run: mvn clean deploy -B --settings=./.buildscript/settings.xml
+        env:
+          CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
+          CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
diff --git a/README.md b/README.md
@@ -32,7 +32,7 @@ For more advanced users we also prepared a [guide to provide a brief overview of
 
 Versions
 --------
-The current version is **4.0.1** ([changelist](https://github.com/git-commit-id/git-commit-id-maven-plugin/issues?q=milestone%3A4.0.1)).
+The current version is **4.0.2** ([changelist](https://github.com/git-commit-id/git-commit-id-maven-plugin/issues?q=milestone%3A4.0.2)).
 
 You can check the available versions by visiting [search.maven.org](https://search.maven.org/artifact/pl.project13.maven/git-commit-id-plugin), though using the newest is obviously the best choice.
 
diff --git a/core/pom.xml b/core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>pl.project13.maven</groupId>
         <artifactId>git-commit-id-plugin-parent</artifactId>
-        <version>4.0.2-SNAPSHOT</version>
+        <version>4.0.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.target>1.8</java.target>
 
-        <jgit.version>5.2.2.201904231744-r</jgit.version>
+        <jgit.version>5.8.1.202007141445-r</jgit.version>
         <junit.version>4.12</junit.version>
     </properties>
 
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
-            <version>2.10.3</version>
+            <version>2.10.6</version>
         </dependency>
         <!-- plexus build -->
         <dependency>
diff --git a/core/src/main/java/pl/project13/core/GitDataProvider.java b/core/src/main/java/pl/project13/core/GitDataProvider.java
@@ -245,7 +245,7 @@ protected SimpleDateFormat getSimpleDateFormatWithTimeZone() {
   protected void maybePut(@Nonnull Properties properties, String key, SupplierEx<String> value)
           throws GitCommitIdExecutionException {
     String keyWithPrefix = prefixDot + key;
-    if (properties.containsKey(keyWithPrefix)) {
+    if (properties.stringPropertyNames().contains(keyWithPrefix)) {
       String propertyValue = properties.getProperty(keyWithPrefix);
       log.info("Using cached {} with value {}", keyWithPrefix, propertyValue);
     } else if (PropertiesFilterer.isIncluded(keyWithPrefix, includeOnlyProperties, excludeProperties)) {
diff --git a/core/src/main/java/pl/project13/core/PropertiesFileGenerator.java b/core/src/main/java/pl/project13/core/PropertiesFileGenerator.java
@@ -68,8 +68,8 @@ public void maybeGeneratePropertiesFile(@Nonnull Properties localProperties, Fil
 
           final String buildTimeProperty = prefixDot + GitCommitPropertyConstant.BUILD_TIME;
 
-          propertiesCopy.remove(buildTimeProperty);
-          persistedProperties.remove(buildTimeProperty);
+          propertiesCopy.setProperty(buildTimeProperty, "");
+          persistedProperties.setProperty(buildTimeProperty, "");
 
           shouldGenerate = !propertiesCopy.equals(persistedProperties);
         } catch (CannotReadFileException ex) {
diff --git a/core/src/main/java/pl/project13/core/cibuild/AwsCodeBuildBuildServerData.java b/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
diff --git a/core/src/main/java/pl/project13/core/cibuild/AzureDevOpsBuildServerData.java b/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
diff --git a/core/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java b/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
diff --git a/core/src/main/java/pl/project13/core/cibuild/BuildServerDataProvider.java b/core/src/main/java/pl/project13/core/cibuild/BuildServerDataProvider.java
@@ -23,6 +23,7 @@
 import pl.project13.core.util.PropertyManager;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.text.SimpleDateFormat;
@@ -112,8 +113,8 @@ public static BuildServerDataProvider getBuildServerProvider(@Nonnull Map<String
     return new UnknownBuildServerData(log, env);
   }
 
-  public void loadBuildData(@Nonnull Properties properties) {
-    loadBuildVersionAndTimeData(properties);
+  public void loadBuildData(@Nonnull Properties properties, @Nullable Date reproducibleBuildOutputTimestamp) {
+    loadBuildVersionAndTimeData(properties, reproducibleBuildOutputTimestamp);
     loadBuildHostData(properties);
     loadBuildNumber(properties);
   }
@@ -132,9 +133,9 @@ public void loadBuildData(@Nonnull Properties properties) {
    */
   public abstract String getBuildBranch();
 
-  private void loadBuildVersionAndTimeData(@Nonnull Properties properties) {
+  private void loadBuildVersionAndTimeData(@Nonnull Properties properties, @Nullable Date reproducibleBuildOutputTimestamp) {
     Supplier<String> buildTimeSupplier = () -> {
-      Date buildDate = new Date();
+      Date buildDate = (reproducibleBuildOutputTimestamp == null) ? new Date() : reproducibleBuildOutputTimestamp;
       SimpleDateFormat smf = new SimpleDateFormat(dateFormat);
       if (dateFormatTimeZone != null) {
         smf.setTimeZone(TimeZone.getTimeZone(dateFormatTimeZone));
@@ -166,15 +167,9 @@ 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)) {
+    if (properties.stringPropertyNames().contains(keyWithPrefix)) {
       String propertyValue = properties.getProperty(keyWithPrefix);
       log.info("Using cached {} with value {}", keyWithPrefix, propertyValue);
     } else if (PropertiesFilterer.isIncluded(keyWithPrefix, includeOnlyProperties, excludeProperties)) {
diff --git a/core/src/main/java/pl/project13/core/cibuild/CircleCiBuildServerData.java b/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
diff --git a/core/src/main/java/pl/project13/core/cibuild/GitlabBuildServerData.java b/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
diff --git a/core/src/main/java/pl/project13/core/cibuild/HudsonJenkinsBuildServerData.java b/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
diff --git a/core/src/main/java/pl/project13/core/cibuild/TeamCityBuildServerData.java b/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
diff --git a/core/src/main/java/pl/project13/core/cibuild/TravisBuildServerData.java b/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
diff --git a/core/src/main/java/pl/project13/core/util/PropertyManager.java b/core/src/main/java/pl/project13/core/util/PropertyManager.java
@@ -30,7 +30,7 @@ public static void putWithoutPrefix(@Nonnull Properties properties, String key,
     if (!isNotEmpty(value)) {
       value = "Unknown";
     }
-    properties.put(key, value);
+    properties.setProperty(key, value);
   }
 
   private static boolean isNotEmpty(@Nullable String value) {
diff --git a/maven/pom.xml b/maven/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>pl.project13.maven</groupId>
     <artifactId>git-commit-id-plugin-parent</artifactId>
-    <version>4.0.2-SNAPSHOT</version>
+    <version>4.0.3-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>git-commit-id-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>4.0.2-SNAPSHOT</version>
+  <version>4.0.3-SNAPSHOT</version>
   <name>Git Commit Id Maven Plugin</name>
   <description>
     This plugin makes basic repository information available through maven resources. This can be used to display
@@ -32,7 +32,7 @@
     <maven-plugin-api.version>3.0</maven-plugin-api.version>
     <maven-plugin-plugin.version>3.6.0</maven-plugin-plugin.version>
 
-    <junit.version>4.12</junit.version>
+    <junit.version>4.13</junit.version>
     <mockito.version>3.1.0</mockito.version>
 
     <fest-assert.version>1.4</fest-assert.version>
diff --git a/maven/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java b/maven/src/main/java/pl/project13/maven/git/GitCommitIdMojo.java
@@ -21,6 +21,8 @@
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
+import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.function.Supplier;
@@ -372,6 +374,18 @@ public class GitCommitIdMojo extends AbstractMojo {
   @Parameter(defaultValue = "false")
   boolean offline;
 
+  /**
+   * Timestamp for reproducible output archive entries
+   * (https://maven.apache.org/guides/mini/guide-reproducible-builds.html).
+   * The value from <code>${project.build.outputTimestamp}</code> is either formatted as ISO 8601
+   * <code>yyyy-MM-dd'T'HH:mm:ssXXX</code> or as an int representing seconds since the epoch (like
+   * <a href="https://reproducible-builds.org/docs/source-date-epoch/">SOURCE_DATE_EPOCH</a>.
+   *
+   * @since 4.0.2
+   */
+  @Parameter(defaultValue = "${project.build.outputTimestamp}")
+  private String projectBuildOutputTimestamp;
+
   /**
    * Injected {@link BuildContext} to recognize incremental builds.
    */
@@ -548,7 +562,7 @@ private Properties getContextProperties(MavenProject project) {
     return null;
   }
 
-  private void loadBuildData(Properties properties) {
+  private void loadBuildData(Properties properties) throws GitCommitIdExecutionException {
     Map<String, Supplier<String>> additionalProperties = Collections.singletonMap(
             GitCommitPropertyConstant.BUILD_VERSION, () -> project.getVersion());
     BuildServerDataProvider buildServerDataProvider = BuildServerDataProvider.getBuildServerProvider(System.getenv(),log);
@@ -560,11 +574,46 @@ private void loadBuildData(Properties properties) {
         .setExcludeProperties(excludeProperties)
         .setIncludeOnlyProperties(includeOnlyProperties);
 
-    buildServerDataProvider.loadBuildData(properties);
+    buildServerDataProvider.loadBuildData(properties, parseOutputTimestamp(projectBuildOutputTimestamp));
+  }
+
+  /**
+   * Parse output timestamp configured for Reproducible Builds' archive entries
+   * (https://maven.apache.org/guides/mini/guide-reproducible-builds.html).
+   * The value from <code>${project.build.outputTimestamp}</code> is either formatted as ISO 8601
+   * <code>yyyy-MM-dd'T'HH:mm:ssXXX</code> or as an int representing seconds since the epoch (like
+   * <a href="https://reproducible-builds.org/docs/source-date-epoch/">SOURCE_DATE_EPOCH</a>.
+   *
+   * Inspired by https://github.com/apache/maven-archiver/blob/a3103d99396cd8d3440b907ef932a33563225265/src/main/java/org/apache/maven/archiver/MavenArchiver.java#L765
+   *
+   * @param outputTimestamp the value of <code>${project.build.outputTimestamp}</code> (may be <code>null</code>)
+   * @return the parsed timestamp, may be <code>null</code> if <code>null</code> input or input contains only 1
+   *         character
+   */
+  private Date parseOutputTimestamp(String outputTimestamp) throws GitCommitIdExecutionException {
+    if (outputTimestamp != null && !outputTimestamp.trim().isEmpty() && outputTimestamp.chars().allMatch(Character::isDigit)) {
+      return new Date(Long.parseLong(outputTimestamp) * 1000);
+    }
+
+    if ((outputTimestamp == null) || (outputTimestamp.length() < 2)) {
+      // no timestamp configured
+      return null;
+    }
+
+    DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+    try {
+      return df.parse(outputTimestamp);
+    } catch (ParseException pe) {
+      throw new GitCommitIdExecutionException(
+              "Invalid 'project.build.outputTimestamp' value '" + outputTimestamp + "'",
+              pe);
+    }
   }
 
   private void publishPropertiesInto(Properties p) {
-    p.putAll(properties);
+    for (String propertyName : properties.stringPropertyNames()) {
+      p.setProperty(propertyName, properties.getProperty(propertyName));
+    }
   }
 
   /**
@@ -603,9 +652,8 @@ private File lookupGitDirectory() throws GitCommitIdExecutionException {
   }
 
   private void logProperties() {
-    for (Object key : properties.keySet()) {
-      String keyString = key.toString();
-      log.info("including property {} in results", keyString);
+    for (String propertyName : properties.stringPropertyNames()) {
+      log.info("including property {} in results", propertyName);
     }
   }
 
diff --git a/maven/src/main/java/pl/project13/maven/git/PropertiesReplacer.java b/maven/src/main/java/pl/project13/maven/git/PropertiesReplacer.java
@@ -50,21 +50,18 @@ public void performReplacement(Properties properties, List<ReplacementProperty>
   }
 
   private void performReplacementOnAllGeneratedProperties(Properties properties, ReplacementProperty replacementProperty) {
-    Map<Object, Object> propertiesToBeAdded = new HashMap<>();
-    for (Map.Entry<Object, Object> entry : properties.entrySet()) {
-      String key = (String)entry.getKey();
-      String content = (String)entry.getValue();
+    for (String propertyName : properties.stringPropertyNames()) {
+      String content = properties.getProperty(propertyName);
       String result = performReplacement(replacementProperty, content);
       if ((replacementProperty.getPropertyOutputSuffix() != null) && (!replacementProperty.getPropertyOutputSuffix().isEmpty())) {
-        String newPropertyKey = key + "." + replacementProperty.getPropertyOutputSuffix();
-        propertiesToBeAdded.put(newPropertyKey, result);
-        log.info("apply replace on property " + key + " and save to " + newPropertyKey + ": original value '" + content + "' with '" + result + "'");
+        String newPropertyKey = propertyName + "." + replacementProperty.getPropertyOutputSuffix();
+        properties.setProperty(newPropertyKey, result);
+        log.info("apply replace on property " + propertyName + " and save to " + newPropertyKey + ": original value '" + content + "' with '" + result + "'");
       } else {
-        entry.setValue(result);
-        log.info("apply replace on property " + key + ": original value '" + content + "' with '" + result + "'");
+        properties.setProperty(propertyName, result);
+        log.info("apply replace on property " + propertyName + ": original value '" + content + "' with '" + result + "'");
       }
     }
-    properties.putAll(propertiesToBeAdded);
   }
 
   private void performReplacementOnSingleProperty(Properties properties, ReplacementProperty replacementProperty, String propertyKey) {
diff --git a/maven/src/test/java/pl/project13/core/GitDataProviderTest.java b/maven/src/test/java/pl/project13/core/GitDataProviderTest.java
@@ -18,9 +18,6 @@
 package pl.project13.core;
 
 import org.junit.Test;
-import pl.project13.core.GitCommitIdExecutionException;
-import pl.project13.core.GitCommitPropertyConstant;
-import pl.project13.core.GitDataProvider;
 import pl.project13.core.log.LoggerBridge;
 
 import java.util.Properties;
diff --git a/maven/src/test/java/pl/project13/core/JgitProviderAheadBehindTest.java b/maven/src/test/java/pl/project13/core/JgitProviderAheadBehindTest.java
@@ -17,7 +17,6 @@
 
 package pl.project13.core;
 
-import pl.project13.core.JGitProvider;
 import pl.project13.maven.git.AheadBehindTest;
 
 import java.nio.file.Paths;
diff --git a/maven/src/test/java/pl/project13/core/NativeProviderAheadBehindTest.java b/maven/src/test/java/pl/project13/core/NativeProviderAheadBehindTest.java
@@ -17,7 +17,6 @@
 
 package pl.project13.core;
 
-import pl.project13.core.NativeGitProvider;
 import pl.project13.maven.git.AheadBehindTest;
 
 public class NativeProviderAheadBehindTest extends AheadBehindTest<NativeGitProvider> {
diff --git a/maven/src/test/java/pl/project13/core/PropertiesFileGeneratorTest.java b/maven/src/test/java/pl/project13/core/PropertiesFileGeneratorTest.java
diff --git a/maven/src/test/java/pl/project13/core/UriUserInfoRemoverTest.java b/maven/src/test/java/pl/project13/core/UriUserInfoRemoverTest.java
diff --git a/maven/src/test/java/pl/project13/maven/git/AheadBehindTest.java b/maven/src/test/java/pl/project13/maven/git/AheadBehindTest.java
diff --git a/maven/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java b/maven/src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static boolean isActiveServer(@Nonnull Map<String, String> env) {`
`41`	`41`	`void loadBuildNumber(@Nonnull Properties properties) {`
`42`	`42`	`String buildNumber = env.getOrDefault("BUILD_BUILDNUMBER", "");`
`43`	`43`
`44`		`- put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);`
	`44`	`+ maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ void loadBuildNumber(@Nonnull Properties properties) {`
`40`	`40`	`String buildNumber = Optional.ofNullable(env.get("bamboo.buildNumber"))`
`41`	`41`	`.orElseGet(() -> env.getOrDefault("BAMBOO_BUILDNUMBER", ""));`
`42`	`42`
`43`		`- put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);`
	`43`	`+ maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static boolean isActiveServer(Map<String, String> env) {`
`40`	`40`	`@Override`
`41`	`41`	`void loadBuildNumber(@Nonnull Properties properties) {`
`42`	`42`	`String buildNumber = env.getOrDefault("CIRCLE_BUILD_NUM", "");`
`43`		`- put(properties, GitCommitPropertyConstant.BUILD_NUMBER, buildNumber);`
	`43`	`+ maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`