diff --git a/api/src/org/labkey/api/module/DefaultModule.java b/api/src/org/labkey/api/module/DefaultModule.java index 7ef73cc157a..4efd224d43c 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,17 +817,10 @@ public void setVcsBranch(String vcsBranch) _vcsBranch = vcsBranch; } - @Nullable - @Override - public String getVcsTag() - { - return _vcsTag; - } - @SuppressWarnings({"UnusedDeclaration"}) public void setVcsTag(String vcsTag) { - _vcsTag = vcsTag; + // Ignored - present in module.xml but not used } public final String getBuildUser() @@ -974,7 +966,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 +1596,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() 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);