Skip to content

Commit 84828de

Browse files
authored
Drop User & URL from VersionInfo (#8189)
* Drop User & URL from VersionInfo
1 parent 9628cd2 commit 84828de

6 files changed

Lines changed: 0 additions & 57 deletions

File tree

storm-client/src/jvm/org/apache/storm/utils/IVersionInfo.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,6 @@ public interface IVersionInfo {
4646
*/
4747
String getDate();
4848

49-
/**
50-
* Get the name of the user that did the build.
51-
* @return the name of the user that did the build.
52-
*/
53-
String getUser();
54-
55-
/**
56-
* Get the full SCM URL for the build.
57-
* @return the SCM URL of the build.
58-
*/
59-
String getUrl();
60-
6149
/**
6250
* Get the checksum of the source.
6351
* @return the checksum of the source.

storm-client/src/jvm/org/apache/storm/utils/Utils.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1600,16 +1600,6 @@ public String getDate() {
16001600
return "Unknown";
16011601
}
16021602

1603-
@Override
1604-
public String getUser() {
1605-
return "Unknown";
1606-
}
1607-
1608-
@Override
1609-
public String getUrl() {
1610-
return "Unknown";
1611-
}
1612-
16131603
@Override
16141604
public String getSrcChecksum() {
16151605
return "Unknown";

storm-client/src/jvm/org/apache/storm/utils/VersionInfo.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -85,16 +85,6 @@ public String getDate() {
8585
return info.getProperty("date", "Unknown");
8686
}
8787

88-
@Override
89-
public String getUser() {
90-
return info.getProperty("user", "Unknown");
91-
}
92-
93-
@Override
94-
public String getUrl() {
95-
return info.getProperty("url", "Unknown");
96-
}
97-
9888
@Override
9989
public String getSrcChecksum() {
10090
return info.getProperty("srcChecksum", "Unknown");
@@ -104,7 +94,6 @@ public String getSrcChecksum() {
10494
public String getBuildVersion() {
10595
return this.getVersion()
10696
+ " from " + getRevision()
107-
+ " by " + getUser()
10897
+ " source checksum " + getSrcChecksum();
10998
}
11099
}
@@ -223,22 +212,6 @@ public static String getDate() {
223212
return OUR_FULL_VERSION.getDate();
224213
}
225214

226-
/**
227-
* Get the name of the user that did the build.
228-
* @return the name of the user that did the build.
229-
*/
230-
public static String getUser() {
231-
return OUR_FULL_VERSION.getUser();
232-
}
233-
234-
/**
235-
* Get the full SCM URL for the build.
236-
* @return the SCM URL of the build.
237-
*/
238-
public static String getUrl() {
239-
return OUR_FULL_VERSION.getUrl();
240-
}
241-
242215
/**
243216
* Get the checksum of the source.
244217
* @return the checksum of the source.
@@ -257,9 +230,7 @@ public static String getBuildVersion() {
257230

258231
public static void main(String[] args) {
259232
System.out.println("Storm " + getVersion());
260-
System.out.println("URL " + getUrl() + " -r " + getRevision());
261233
System.out.println("Branch " + getBranch());
262-
System.out.println("Compiled by " + getUser() + " on " + getDate());
263234
System.out.println("From source with checksum " + getSrcChecksum());
264235
}
265236
}

storm-client/src/resources/storm-client-version-info.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,5 @@
1818
version=${pom.version}
1919
revision=${version-info.scm.commit}
2020
branch=${version-info.scm.branch}
21-
user=${user.name}
2221
date=${version-info.build.time}
23-
url=${version-info.scm.uri}
2422
srcChecksum=${version-info.source.md5}

storm-core/src/resources/storm-core-version-info.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,5 @@
1818
version=${pom.version}
1919
revision=${version-info.scm.commit}
2020
branch=${version-info.scm.branch}
21-
user=${user.name}
2221
date=${version-info.build.time}
23-
url=${version-info.scm.uri}
2422
srcChecksum=${version-info.source.md5}

storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,6 @@ private static Map<String, String> toJsonStruct(IVersionInfo info) {
538538
ret.put("revision", info.getRevision());
539539
ret.put("branch", info.getBranch());
540540
ret.put("date", info.getDate());
541-
ret.put("user", info.getUser());
542-
ret.put("url", info.getUrl());
543541
ret.put("srcChecksum", info.getSrcChecksum());
544542
return ret;
545543
}

0 commit comments

Comments
 (0)