Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 12 deletions storm-client/src/jvm/org/apache/storm/utils/IVersionInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,6 @@ public interface IVersionInfo {
*/
String getDate();

/**
* Get the name of the user that did the build.
* @return the name of the user that did the build.
*/
String getUser();

/**
* Get the full SCM URL for the build.
* @return the SCM URL of the build.
*/
String getUrl();

/**
* Get the checksum of the source.
* @return the checksum of the source.
Expand Down
10 changes: 0 additions & 10 deletions storm-client/src/jvm/org/apache/storm/utils/Utils.java
Original file line number Diff line number Diff line change
Expand Up @@ -1600,16 +1600,6 @@ public String getDate() {
return "Unknown";
}

@Override
public String getUser() {
return "Unknown";
}

@Override
public String getUrl() {
return "Unknown";
}

@Override
public String getSrcChecksum() {
return "Unknown";
Expand Down
29 changes: 0 additions & 29 deletions storm-client/src/jvm/org/apache/storm/utils/VersionInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,16 +85,6 @@ public String getDate() {
return info.getProperty("date", "Unknown");
}

@Override
public String getUser() {
return info.getProperty("user", "Unknown");
}

@Override
public String getUrl() {
return info.getProperty("url", "Unknown");
}

@Override
public String getSrcChecksum() {
return info.getProperty("srcChecksum", "Unknown");
Expand All @@ -104,7 +94,6 @@ public String getSrcChecksum() {
public String getBuildVersion() {
return this.getVersion()
+ " from " + getRevision()
+ " by " + getUser()
+ " source checksum " + getSrcChecksum();
}
}
Expand Down Expand Up @@ -223,22 +212,6 @@ public static String getDate() {
return OUR_FULL_VERSION.getDate();
}

/**
* Get the name of the user that did the build.
* @return the name of the user that did the build.
*/
public static String getUser() {
return OUR_FULL_VERSION.getUser();
}

/**
* Get the full SCM URL for the build.
* @return the SCM URL of the build.
*/
public static String getUrl() {
return OUR_FULL_VERSION.getUrl();
}

/**
* Get the checksum of the source.
* @return the checksum of the source.
Expand All @@ -257,9 +230,7 @@ public static String getBuildVersion() {

public static void main(String[] args) {
System.out.println("Storm " + getVersion());
System.out.println("URL " + getUrl() + " -r " + getRevision());
System.out.println("Branch " + getBranch());
System.out.println("Compiled by " + getUser() + " on " + getDate());
System.out.println("From source with checksum " + getSrcChecksum());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@
version=${pom.version}
revision=${version-info.scm.commit}
branch=${version-info.scm.branch}
user=${user.name}
date=${version-info.build.time}
url=${version-info.scm.uri}
srcChecksum=${version-info.source.md5}
2 changes: 0 additions & 2 deletions storm-core/src/resources/storm-core-version-info.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,5 @@
version=${pom.version}
revision=${version-info.scm.commit}
branch=${version-info.scm.branch}
user=${user.name}
date=${version-info.build.time}
url=${version-info.scm.uri}
srcChecksum=${version-info.source.md5}
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,6 @@ private static Map<String, String> toJsonStruct(IVersionInfo info) {
ret.put("revision", info.getRevision());
ret.put("branch", info.getBranch());
ret.put("date", info.getDate());
ret.put("user", info.getUser());
ret.put("url", info.getUrl());
ret.put("srcChecksum", info.getSrcChecksum());
return ret;
}
Expand Down