From 59d4d4f3351b618e131dd98ae868336976850260 Mon Sep 17 00:00:00 2001
From: Jonas Heintzenberg <Jonas.Heintzenberg@iteratec.de>
Date: Mon, 5 Jul 2021 14:44:38 +0200
Subject: [PATCH] Fix bamboo build number being empty

---
 .../java/pl/project13/core/cibuild/BambooBuildServerData.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java b/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java
index dd2d737..5690b75 100644
--- a/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java
+++ b/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java
@@ -43,7 +43,8 @@ public static boolean isActiveServer(Map<String, String> env) {
   @Override
   void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = Optional.ofNullable(env.get("bamboo.buildNumber"))
-            .orElseGet(() -> env.getOrDefault("BAMBOO_BUILDNUMBER", ""));
+            .or(() -> Optional.ofNullable(env.get("BAMBOO_BUILDNUMBER")))
+            .orElseGet(() -> env.getOrDefault("bamboo_buildNumber", ""));
 
     maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
   }