From f644fb87fc01580c16142bbaa63ccbc1cdea99c9 Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Thu, 24 Jul 2025 13:11:02 +0200 Subject: [PATCH 1/3] Drop User & URL from VersionInfo --- .../org/apache/storm/utils/IVersionInfo.java | 12 -------- .../org/apache/storm/utils/VersionInfo.java | 29 ------------------- .../storm-client-version-info.properties | 2 -- .../storm-core-version-info.properties | 2 -- .../org/apache/storm/daemon/ui/UIHelpers.java | 2 -- 5 files changed, 47 deletions(-) diff --git a/storm-client/src/jvm/org/apache/storm/utils/IVersionInfo.java b/storm-client/src/jvm/org/apache/storm/utils/IVersionInfo.java index b25547ff995..35f274117a5 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/IVersionInfo.java +++ b/storm-client/src/jvm/org/apache/storm/utils/IVersionInfo.java @@ -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. diff --git a/storm-client/src/jvm/org/apache/storm/utils/VersionInfo.java b/storm-client/src/jvm/org/apache/storm/utils/VersionInfo.java index 759f347b736..8dad52c3d5c 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/VersionInfo.java +++ b/storm-client/src/jvm/org/apache/storm/utils/VersionInfo.java @@ -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"); @@ -104,7 +94,6 @@ public String getSrcChecksum() { public String getBuildVersion() { return this.getVersion() + " from " + getRevision() - + " by " + getUser() + " source checksum " + getSrcChecksum(); } } @@ -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. @@ -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()); } } diff --git a/storm-client/src/resources/storm-client-version-info.properties b/storm-client/src/resources/storm-client-version-info.properties index 7ae3130b213..b92dfcef6f6 100644 --- a/storm-client/src/resources/storm-client-version-info.properties +++ b/storm-client/src/resources/storm-client-version-info.properties @@ -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} diff --git a/storm-core/src/resources/storm-core-version-info.properties b/storm-core/src/resources/storm-core-version-info.properties index 7ae3130b213..b92dfcef6f6 100644 --- a/storm-core/src/resources/storm-core-version-info.properties +++ b/storm-core/src/resources/storm-core-version-info.properties @@ -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} diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java index b07f015198b..971e5454fdf 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/UIHelpers.java @@ -538,8 +538,6 @@ private static Map 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; } From 14f7dbe85f82eff502365ffe1db25cfb4793bc75 Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Thu, 24 Jul 2025 13:17:33 +0200 Subject: [PATCH 2/3] Drop User & URL from VersionInfo --- .../src/jvm/org/apache/storm/utils/Utils.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java index e8b275a739c..50477c191ea 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java +++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java @@ -1600,17 +1600,7 @@ public String getDate() { return "Unknown"; } - @Override - public String getUser() { - return "Unknown"; - } - - @Override - public String getUrl() { - return "Unknown"; - } - - @Override + @Override public String getSrcChecksum() { return "Unknown"; } From 0ca68367b43e7f452cdd3cc0998072a933b8364b Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Thu, 24 Jul 2025 13:21:13 +0200 Subject: [PATCH 3/3] Drop User & URL from VersionInfo --- storm-client/src/jvm/org/apache/storm/utils/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storm-client/src/jvm/org/apache/storm/utils/Utils.java b/storm-client/src/jvm/org/apache/storm/utils/Utils.java index 50477c191ea..e0b7fbea43a 100644 --- a/storm-client/src/jvm/org/apache/storm/utils/Utils.java +++ b/storm-client/src/jvm/org/apache/storm/utils/Utils.java @@ -1600,7 +1600,7 @@ public String getDate() { return "Unknown"; } - @Override + @Override public String getSrcChecksum() { return "Unknown"; }