From b0d8afa102af988ac67f15c500d91a3af428ed45 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Thu, 2 Apr 2026 16:46:22 -0700 Subject: [PATCH 1/5] Use ReleaseVersion instead of no-longer-populated vcsTag --- api/src/org/labkey/api/util/UsageReportingLevel.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/api/src/org/labkey/api/util/UsageReportingLevel.java b/api/src/org/labkey/api/util/UsageReportingLevel.java index 37a7ead98ac..70b1f35e088 100644 --- a/api/src/org/labkey/api/util/UsageReportingLevel.java +++ b/api/src/org/labkey/api/util/UsageReportingLevel.java @@ -327,9 +327,11 @@ public static void putModulesBuildInfo(Map> allModul moduleBuildInfo.put("vcsUrl", module.getVcsUrl()); moduleBuildInfo.put("vcsBranch", module.getVcsBranch()); moduleBuildInfo.put("vcsRevision", module.getVcsRevision()); - moduleBuildInfo.put("vcsTag", module.getVcsTag()); + // We stopped capturing the Git tag in module metadata. The release version property serves + // the same purpose. Continue reporting as vcsTag for backwards compatibility with mothership reporting. + moduleBuildInfo.put("vcsTag", module.getReleaseVersion()); moduleBuildInfo.put("moduleClass", module.getClass().getName()); - moduleBuildInfo.put("version", module.getFormattedSchemaVersion()); // TODO: call this "schemaVersion"? Also send "releaseVersion"? + moduleBuildInfo.put("version", module.getFormattedSchemaVersion()); // TODO: call this "schemaVersion"? // Add to the module's info to be included in the submission moduleStats.put("buildInfo", moduleBuildInfo); From 6efd1d24893adacd370c35405947dd486045ab46 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Thu, 2 Apr 2026 16:51:02 -0700 Subject: [PATCH 2/5] Remove defunct code --- api/src/org/labkey/api/module/DefaultModule.java | 16 ---------------- api/src/org/labkey/api/module/MockModule.java | 6 ------ api/src/org/labkey/api/module/Module.java | 1 - 3 files changed, 23 deletions(-) diff --git a/api/src/org/labkey/api/module/DefaultModule.java b/api/src/org/labkey/api/module/DefaultModule.java index 7ef73cc157a..3ea64b0e05b 100644 --- a/api/src/org/labkey/api/module/DefaultModule.java +++ b/api/src/org/labkey/api/module/DefaultModule.java @@ -137,7 +137,6 @@ public abstract class DefaultModule implements Module, ApplicationContextAware private String _vcsRevision = null; private String _vcsUrl = null; private String _vcsBranch = "Unknown"; - private String _vcsTag = "Unknown"; private String _buildUser = null; private String _buildTime = null; private String _buildOS = null; @@ -818,19 +817,6 @@ public void setVcsBranch(String vcsBranch) _vcsBranch = vcsBranch; } - @Nullable - @Override - public String getVcsTag() - { - return _vcsTag; - } - - @SuppressWarnings({"UnusedDeclaration"}) - public void setVcsTag(String vcsTag) - { - _vcsTag = vcsTag; - } - public final String getBuildUser() { return _buildUser; @@ -974,7 +960,6 @@ public final Map getProperties() props.put("VCS URL", getVcsUrl()); props.put("VCS Revision", getVcsRevision()); props.put("VCS Branch", getVcsBranch()); - props.put("VCS Tag", getVcsTag()); props.put("Build OS", getBuildOS()); props.put("Build Time", getBuildTime()); @@ -1605,7 +1590,6 @@ public void copyPropertiesFrom(DefaultModule from) this.setUrl(from.getUrl()); this.setVcsBranch(from.getVcsBranch()); this.setVcsRevision(from.getVcsRevision()); - this.setVcsTag(from.getVcsTag()); this.setVcsUrl(from.getVcsUrl()); this.setZippedPath(from.getZippedPath()); } diff --git a/api/src/org/labkey/api/module/MockModule.java b/api/src/org/labkey/api/module/MockModule.java index ee2c70dbc23..1d98b34f1e6 100644 --- a/api/src/org/labkey/api/module/MockModule.java +++ b/api/src/org/labkey/api/module/MockModule.java @@ -331,12 +331,6 @@ public String getVcsBranch() return null; } - @Override - public String getVcsTag() - { - return null; - } - @Override public boolean shouldManageVersion() { diff --git a/api/src/org/labkey/api/module/Module.java b/api/src/org/labkey/api/module/Module.java index e72d8e5350e..8785d11d9b4 100644 --- a/api/src/org/labkey/api/module/Module.java +++ b/api/src/org/labkey/api/module/Module.java @@ -311,7 +311,6 @@ default void startBackgroundThreads() String getVcsRevision(); String getVcsUrl(); String getVcsBranch(); - String getVcsTag(); String getBuildNumber(); default String getBuildTime() From 548a1eb9fdfd25cbe9a9fab40ae394f6cccdaa28 Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Thu, 2 Apr 2026 17:14:14 -0700 Subject: [PATCH 3/5] Restore setter while Gradle still populates value --- api/src/org/labkey/api/module/DefaultModule.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/src/org/labkey/api/module/DefaultModule.java b/api/src/org/labkey/api/module/DefaultModule.java index 3ea64b0e05b..4efd224d43c 100644 --- a/api/src/org/labkey/api/module/DefaultModule.java +++ b/api/src/org/labkey/api/module/DefaultModule.java @@ -817,6 +817,12 @@ public void setVcsBranch(String vcsBranch) _vcsBranch = vcsBranch; } + @SuppressWarnings({"UnusedDeclaration"}) + public void setVcsTag(String vcsTag) + { + // Ignored - present in module.xml but not used + } + public final String getBuildUser() { return _buildUser; From 0bbd45db885ffbe2d478c1a3c7a3450f87d6b46a Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 3 Apr 2026 06:36:20 -0700 Subject: [PATCH 4/5] Remove setVcsTag again now that gradle plugin no longer populates it --- api/src/org/labkey/api/module/DefaultModule.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/api/src/org/labkey/api/module/DefaultModule.java b/api/src/org/labkey/api/module/DefaultModule.java index 4efd224d43c..3ea64b0e05b 100644 --- a/api/src/org/labkey/api/module/DefaultModule.java +++ b/api/src/org/labkey/api/module/DefaultModule.java @@ -817,12 +817,6 @@ public void setVcsBranch(String vcsBranch) _vcsBranch = vcsBranch; } - @SuppressWarnings({"UnusedDeclaration"}) - public void setVcsTag(String vcsTag) - { - // Ignored - present in module.xml but not used - } - public final String getBuildUser() { return _buildUser; From 25495dd52799b4c12db0b3e5d71a547a18dbc49e Mon Sep 17 00:00:00 2001 From: labkey-jeckels Date: Fri, 3 Apr 2026 09:29:19 -0700 Subject: [PATCH 5/5] Restore setVcsTag() on an interim basis --- api/src/org/labkey/api/module/DefaultModule.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/api/src/org/labkey/api/module/DefaultModule.java b/api/src/org/labkey/api/module/DefaultModule.java index 3ea64b0e05b..4efd224d43c 100644 --- a/api/src/org/labkey/api/module/DefaultModule.java +++ b/api/src/org/labkey/api/module/DefaultModule.java @@ -817,6 +817,12 @@ public void setVcsBranch(String vcsBranch) _vcsBranch = vcsBranch; } + @SuppressWarnings({"UnusedDeclaration"}) + public void setVcsTag(String vcsTag) + { + // Ignored - present in module.xml but not used + } + public final String getBuildUser() { return _buildUser;