Tagging update

FIRO_TSEnsembles/build.gradle

@@ -61,18 +61,16 @@ task showGit () {
 }
 
 def versionLabel(gitInfo) {
-    def verNum = "-SNAPSHOT"
-    def tag = gitInfo.lastTag
+    // A release is published by tagging the master branch with "vX.Y" (e.g. v1.1).
+    // The same tag versions all jars uniformly; the leading "v" is stripped so the
+    // artifact version is just the number (e.g. 1.1). Builds without a matching tag
+    // are published as -SNAPSHOT.
+    def tag = gitInfo.lastTag?.trim()
     println(tag)
-    def prefixes = ["ts-", "dss-", "ev-"]
-    for (prefix in prefixes) {
-        if (tag.contains(prefix)) {
-            def tagArray = tag.trim().split('-')
-            verNum = "ts-" + tagArray[1]
-            break
-        }
+    if (tag && tag ==~ /v\d+(\.\d+)*/) {
+        return tag.substring(1)
     }
-    return verNum
+    return "-SNAPSHOT"
 }
 
 publishing {

README.md

@@ -53,18 +53,14 @@ addjars C:\FIRO_TSEnsembles\libs
 
 ```
 
-## Release Versions and Git Tags 
+## Release Versions and Git Tags
 
-To add versioning to artifacts, the user must add a git tag to the commit.  There are three artifacts created when pushing 
-changes to remote.  To version a specific jar, the following texts are required:
+Versioning is driven by a single git tag on the `master` branch. To cut a release, create a tag of the
+form `vX.Y` (for example, `v1.1`) on the commit in `master` you want to publish. That one tag versions
+all three artifacts (TS-Ensembles, Ensemble-View, and Dss-Ensembles) uniformly: the leading `v` is
+stripped, so a `v1.1` tag publishes every jar as version `1.1`.
 
-TS-Ensembles - prefix with "ts-".  For example, to release version 1.0 the user would create a git tag with the name "ts-v1.0"
-Ensemble-View - prefix with "ev-". For example, to release version 1.0 the user would create a git tag with the name "ev-v1.0"
-Dss-Ensembles - prefix with "dss-". For example, to release version 1.0 the user would create a git tag with the name "dss-v1.0"
-
-Currently, only one version can be committed at a time.  **Tags also must be signed** using GPG, SSH, or S/MIME in order for
-the git tag to be recognized during the remote build process.  Unsigned git tags will not used. more information on 
-signing git tags can be found here: https://docs.github.com/en/authentication/managing-commit-signature-verification
+Any build without a matching `vX.Y` tag is published as a `-SNAPSHOT`.
 
 ## Sample Data
 

ensemble-dss/build.gradle

@@ -96,18 +96,16 @@ task showGit () {
 }
 
 def versionLabel(gitInfo) {
-    def verNum = "-SNAPSHOT"
-    def tag = gitInfo.lastTag
+    // A release is published by tagging the master branch with "vX.Y" (e.g. v1.1).
+    // The same tag versions all jars uniformly; the leading "v" is stripped so the
+    // artifact version is just the number (e.g. 1.1). Builds without a matching tag
+    // are published as -SNAPSHOT.
+    def tag = gitInfo.lastTag?.trim()
     println(tag)
-    def prefixes = ["ts-", "dss-", "ev-"]
-    for (prefix in prefixes) {
-        if (tag.contains(prefix)) {
-            def tagArray = tag.trim().split('-')
-            verNum = "dss-" + tagArray[1]
-            break
-        }
+    if (tag && tag ==~ /v\d+(\.\d+)*/) {
+        return tag.substring(1)
     }
-    return verNum
+    return "-SNAPSHOT"
 }
 
 

ensemble-view/build.gradle

@@ -102,18 +102,16 @@ task showGit () {
 }
 
 def versionLabel(gitInfo) {
-    def verNum = "-SNAPSHOT"
-    def tag = gitInfo.lastTag
+    // A release is published by tagging the master branch with "vX.Y" (e.g. v1.1).
+    // The same tag versions all jars uniformly; the leading "v" is stripped so the
+    // artifact version is just the number (e.g. 1.1). Builds without a matching tag
+    // are published as -SNAPSHOT.
+    def tag = gitInfo.lastTag?.trim()
     println(tag)
-    def prefixes = ["ts-", "dss-", "ev-"]
-    for (prefix in prefixes) {
-        if (tag.contains(prefix)) {
-            def tagArray = tag.trim().split('-')
-            verNum = "ev-" + tagArray[1]
-            break
-        }
+    if (tag && tag ==~ /v\d+(\.\d+)*/) {
+        return tag.substring(1)
     }
-    return verNum
+    return "-SNAPSHOT"
 }