From 4ba3dc6efaef958019bee1003c55fff5f714eeee Mon Sep 17 00:00:00 2001
From: Timo <timo@devplant.ro>
Date: Thu, 6 May 2021 08:52:34 +0300
Subject: [PATCH] branch builds

---
 bamboo-specs/bamboo-specs.iml                 | 19 ++++++++++---------
 bamboo-specs/pom.xml                          |  2 +-
 .../src/main/resources/scripts/build.sh       |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/bamboo-specs/bamboo-specs.iml b/bamboo-specs/bamboo-specs.iml
index 438fa76fc..840c09c04 100644
--- a/bamboo-specs/bamboo-specs.iml
+++ b/bamboo-specs/bamboo-specs.iml
@@ -6,25 +6,26 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.atlassian.bamboo:bamboo-specs-api:7.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.atlassian.bamboo:bamboo-specs-api:7.2.2" level="project" />
     <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
-    <orderEntry type="library" name="Maven: com.atlassian.bamboo:bamboo-specs:7.1.2" level="project" />
+    <orderEntry type="library" name="Maven: com.atlassian.bamboo:bamboo-specs:7.2.2" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8.1" level="project" />
+    <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.7" level="project" />
+    <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.9.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-digester:commons-digester:2.1" level="project" />
     <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
     <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.2" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.4" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.9" level="project" />
+    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
+    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
diff --git a/bamboo-specs/pom.xml b/bamboo-specs/pom.xml
index 83ffd7828..8e3543b0f 100644
--- a/bamboo-specs/pom.xml
+++ b/bamboo-specs/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.atlassian.bamboo</groupId>
     <artifactId>bamboo-specs-parent</artifactId>
-    <version>7.1.2</version>
+    <version>7.2.2</version>
     <relativePath/>
   </parent>
 
diff --git a/bamboo-specs/src/main/resources/scripts/build.sh b/bamboo-specs/src/main/resources/scripts/build.sh
index 8cdb8cf6c..9073dff86 100755
--- a/bamboo-specs/src/main/resources/scripts/build.sh
+++ b/bamboo-specs/src/main/resources/scripts/build.sh
@@ -37,5 +37,5 @@ then
 else
     echo "Not on a relevant branch $BRANCH_NAME ... skipping."
 
-    echo "APP_VERSION=$bamboo_planRepository_branchName" > version.properties
+    echo "APP_VERSION=$bamboo_planRepository_branchName_$bamboo_buildNumber" > version.properties
 fi