You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2020/02/24 06:02:08 UTC
[zookeeper] branch branch-3.6 updated: ZOOKEEPER-3733: Fix issues
reported in 3.6.0rc3
This is an automated email from the ASF dual-hosted git repository.
phunt pushed a commit to branch branch-3.6
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.6 by this push:
new 3c4f24b ZOOKEEPER-3733: Fix issues reported in 3.6.0rc3
3c4f24b is described below
commit 3c4f24bc2a3da998a25ad1e17fcfcd7606519e43
Author: Enrico Olivelli <eo...@apache.org>
AuthorDate: Sun Feb 23 21:14:46 2020 -0800
ZOOKEEPER-3733: Fix issues reported in 3.6.0rc3
- metrics library LICENSE file has wrong file name
- spotbugs is not passing when '-SNAPSHOT' suffix is removed because the Info.java interface sets a null value for "qualifier"
- the name of the directory inside the source tarbal is not consistent with the file name and with 3.5 tradition
Author: Enrico Olivelli <eo...@apache.org>
Reviewers: phunt@apache.org
Closes #1258 from eolivelli/fix/ZOOKEEPER-3733
Change-Id: I70f4bf96fcd3d8371e1251a60199fe5ef1fdd4d4
(cherry picked from commit b2db3918cb2b681e0446cfe3247730deacc0567b)
Signed-off-by: Patrick Hunt <ph...@apache.org>
---
pom.xml | 1 +
.../src/main/java/org/apache/zookeeper/version/util/VerGen.java | 2 +-
...cs-core-5.2.5.jar_LICENSE.txt => metrics-core-3.2.5.jar_LICENSE.txt} | 0
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3d28fa9..7612a0a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -295,6 +295,7 @@
<descriptorRef>${sourceReleaseAssemblyDescriptor}</descriptorRef>
</descriptorRefs>
<finalName>apache-zookeeper-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<formats>
<format>tar.gz</format>
</formats>
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 3e9e62a..25bffd7 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
@@ -80,7 +80,7 @@ public class VerGen {
w.write(" int MAJOR=" + version.maj + ";\n");
w.write(" int MINOR=" + version.min + ";\n");
w.write(" int MICRO=" + version.micro + ";\n");
- w.write(" String QUALIFIER=" + (version.qualifier == null ? null : "\"" + version.qualifier + "\"") + ";\n");
+ w.write(" String QUALIFIER=" + (version.qualifier == null ? "\"\"" : "\"" + version.qualifier + "\"") + ";\n");
if (rev.equals("-1")) {
System.out.println("Unknown REVISION number, using " + rev);
}
diff --git a/zookeeper-server/src/main/resources/lib/metrics-core-5.2.5.jar_LICENSE.txt b/zookeeper-server/src/main/resources/lib/metrics-core-3.2.5.jar_LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/lib/metrics-core-5.2.5.jar_LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/metrics-core-3.2.5.jar_LICENSE.txt