DOCKER-462 Fixed broken build when adding tag

Author: kpiot123

build.gradle

@@ -34,10 +34,10 @@ def calcTags(version) {
         tags += "${version.major}.${version.minor}.${version.rev}.${version.label}".toString()
     }
     // For non-master/non-release builds, change the tags to contain branch and build number
-    def isTestBuild = ci.isCi() && ci.branch != "master" && ci.branch != "release"
-    if (isTestBuild) {
-        def branch = ci.branch.replace("/", ".") //slashes are not allowed in docker tags
-        tags = tags.stream().map({ it + "-build-${branch}-${ci.buildNumber}" }).collect(Collectors.toList());
+    def isReleaseBuild = ci.isCi() && ((ci.branch != null && (ci.branch.startsWith("master") || ci.branch.startsWith("release"))) || ci.tag != null)
+    if (!isReleaseBuild) {
+        def branch = ci.tag ? ci.tag : ci.branch ? ci.branch.replace("/", ".") : "1.0.0"
+        tags = tags.stream().map({ it + "-build-${branch}-${ci.buildNumber}" }).collect(Collectors.toList())
     }
 
     return tags

tomcat-base/build.gradle

@@ -56,6 +56,8 @@ subprojects {
     }
 
     boolean isRelease = ci.branch?.equals("master")
+            || ci.branch?.equals("release")
+            || (ci.tag != null && ci.tag.toLowerCase().startsWith("v"))
     if (!isRelease) {
         version += "-SNAPSHOT"
     }
@@ -85,6 +87,10 @@ subprojects {
         }
     }
 
+    sourcesJar {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+
     archivesBaseName = 'xenit-tomcat-embedded'
 
     dockerBuild {