You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by an...@apache.org on 2019/07/01 13:16:09 UTC
[zookeeper] branch master updated: ZOOKEEPER-3370: Remove SVN
specific revision generation
This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 44c9d56 ZOOKEEPER-3370: Remove SVN specific revision generation
44c9d56 is described below
commit 44c9d56f22195223250765f2138336b903e960c0
Author: tison <wa...@gmail.com>
AuthorDate: Mon Jul 1 15:16:01 2019 +0200
ZOOKEEPER-3370: Remove SVN specific revision generation
As we don't maintain the SVN repo any more.
ref 8771ffdaacb87126a485ae740558f6a288ab980b
Author: tison <wa...@gmail.com>
Reviewers: eolivelli@apache.org, andor@apache.org
Closes #915 from TisonKun/ZOOKEEPER-3370
---
.../src/main/java/org/apache/zookeeper/Version.java | 15 ++-------------
.../java/org/apache/zookeeper/version/util/VerGen.java | 1 -
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java b/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java
index 99a29e4..70f2e92 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/Version.java
@@ -23,17 +23,6 @@ import org.apache.zookeeper.server.ExitCode;
public class Version implements org.apache.zookeeper.version.Info {
- /*
- * Since the SVN to Git port this field doesn't return the revision anymore
- * TODO: remove this method and associated field declaration in VerGen
- * @see {@link #getHashRevision()}
- * @return the default value -1
- */
- @Deprecated
- public static int getRevision() {
- return REVISION;
- }
-
public static String getRevisionHash() {
return REVISION_HASH;
}
@@ -71,8 +60,8 @@ public class Version implements org.apache.zookeeper.version.Info {
* @param args
* <ul>
* <li> --short - prints a short version string "1.2.3"
- * <li> --revision - prints a short version string with the SVN
- * repository revision "1.2.3-94"
+ * <li> --revision - prints a short version string with the Git
+ * repository revision "1.2.3-${revision_hash}"
* <li> --full - prints the revision and the build date
* </ul>
*/
diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/version/util/VerGen.java b/zookeeper-server/src/main/java/org/apache/zookeeper/version/util/VerGen.java
index f843ac9..46d46ab 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/version/util/VerGen.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/version/util/VerGen.java
@@ -87,7 +87,6 @@ public class VerGen {
if (rev.equals("-1")) {
System.out.println("Unknown REVISION number, using " + rev);
}
- w.write(" int REVISION=-1; //TODO: remove as related to SVN VCS\n");
w.write(" String REVISION_HASH=\"" + rev + "\";\n");
w.write(" String BUILD_DATE=\"" + buildDate
+ "\";\n");