diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/BuildAndEnvironmentInfo.java b/common/source/java/ch/systemsx/cisd/common/utilities/BuildAndEnvironmentInfo.java index d45f7c392d785f7a447322c3fe0dee61ed3242ab..5262831fdd6414a263e15cb53c70b0e5220a5fa0 100644 --- a/common/source/java/ch/systemsx/cisd/common/utilities/BuildAndEnvironmentInfo.java +++ b/common/source/java/ch/systemsx/cisd/common/utilities/BuildAndEnvironmentInfo.java @@ -154,9 +154,9 @@ public final class BuildAndEnvironmentInfo } /** - * Returns the build number of the software, + * Returns the version accompanied by the build number of the software (if known). */ - public final String getBuildNumber() + public final String getFullVersion() { final StringBuilder builder = new StringBuilder(); final String rev = getRevision(); @@ -186,8 +186,7 @@ public final class BuildAndEnvironmentInfo public final List<String> getEnvironmentInfo() { final List<String> environmentInfo = new ArrayList<String>(); - environmentInfo.add("Version: " + getVersion()); - environmentInfo.add("Build Number: " + getBuildNumber()); + environmentInfo.add("Version: " + getFullVersion()); environmentInfo.add("Java VM: " + getJavaVM()); environmentInfo.add("CPU Architecture: " + getCPUArchitecture()); environmentInfo.add("OS: " + getOS()); diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java index b13a727974fa71f766236928e63811cfe2bc73f2..7333ba8bc4d478f9b8c7c1765d1d75539825c5cd 100644 --- a/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java +++ b/datamover/source/java/ch/systemsx/cisd/datamover/Parameters.java @@ -266,7 +266,7 @@ public class Parameters implements ITimingParameters, IFileSysParameters @Option(longName = "version", skipForExample = true, usage = "Prints out the version information.") void printVersion(boolean exit) { - System.err.println("Datamover version " + BuildAndEnvironmentInfo.INSTANCE.getBuildNumber()); + System.err.println("Datamover version " + BuildAndEnvironmentInfo.INSTANCE.getFullVersion()); if (exit) { System.exit(0);