Skip to content

Use ReleaseVersion instead of no-longer-populated vcsTag #7542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-susanh merged 5 commits into from
Apr 3, 2026
Merged

Use ReleaseVersion instead of no-longer-populated vcsTag #7542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b0d8afa
Use ReleaseVersion instead of no-longer-populated vcsTag
labkey-jeckels Apr 2, 2026
6efd1d2
Remove defunct code
labkey-jeckels Apr 2, 2026
548a1eb
Restore setter while Gradle still populates value
labkey-jeckels Apr 3, 2026
0bbd45d
Remove setVcsTag again now that gradle plugin no longer populates it
labkey-susanh Apr 3, 2026
25495dd
Restore setVcsTag() on an interim basis
labkey-jeckels Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions api/src/org/labkey/api/module/DefaultModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -974,7 +966,6 @@ public final Map<String, String> 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());
Expand Down Expand Up @@ -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());
}
Expand Down
6 changes: 0 additions & 6 deletions api/src/org/labkey/api/module/MockModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,12 +331,6 @@ public String getVcsBranch()
return null;
}

@Override
public String getVcsTag()
{
return null;
}

@Override
public boolean shouldManageVersion()
{
Expand Down
1 change: 0 additions & 1 deletion api/src/org/labkey/api/module/Module.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ default void startBackgroundThreads()
String getVcsRevision();
String getVcsUrl();
String getVcsBranch();
String getVcsTag();
String getBuildNumber();

default String getBuildTime()
Expand Down
6 changes: 4 additions & 2 deletions api/src/org/labkey/api/util/UsageReportingLevel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,11 @@ public static void putModulesBuildInfo(Map<String, Map<String, Object>> 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);
Expand Down
Loading