This is an automated email from the ASF dual-hosted git repository.
andor pushed a commit to branch branch-3.4
in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/branch-3.4 by this push:
new f15cdef Fix for license files and contrib folder during release (3.4)
f15cdef is described below
commit f15cdefac1e7e80f86e929c675fd805d6b01e77a
Author: Andor Molnar <[email protected]>
AuthorDate: Wed Feb 27 16:07:15 2019 +0100
Fix for license files and contrib folder during release (3.4)
Fixes for release 3.4.14
Author: Andor Molnar <[email protected]>
Reviewers: [email protected]
Closes #836 from anmolnar/fix_license_contrib_34 and squashes the following
commits:
9c03682b5 [Andor Molnar] Removed redundant jline license file
0d51514b4 [Andor Molnar] Fix for lincese files and contrib folder during
release
---
.gitignore | 2 +-
build.xml | 4 ++-
.../build/check_zk_version.c | 29 ++++++++++++++++++++++
.../build/check_zk_version.h | 27 ++++++++++++++++++++
.../zookeeper-contrib-zooinspector/build.xml | 3 ---
...faultNodeVeiwers.cfg => defaultNodeViewers.cfg} | 0
.../resources/{ => lib}/jline-0.9.94.LICENSE.txt | 0
7 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 25143c4..8d8ddc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,7 +75,7 @@ zookeeper-client/zookeeper-client-c/Makefile.in
zookeeper-client/zookeeper-client-c/aclocal.m4
zookeeper-client/zookeeper-client-c/autom4te.cache/
zookeeper-client/zookeeper-client-c/compile
-szookeeper-client/zookeeper-client-c/config.guess
+zookeeper-client/zookeeper-client-c/config.guess
zookeeper-client/zookeeper-client-c/config.h.in
zookeeper-client/zookeeper-client-c/config.sub
zookeeper-client/zookeeper-client-c/configure
diff --git a/build.xml b/build.xml
index 91f4ee1..c1a1d2e 100644
--- a/build.xml
+++ b/build.xml
@@ -746,7 +746,9 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle">
<fileset dir="${lib.dir}">
<exclude name="**/ivy*.jar" />
</fileset>
- <fileset dir="${ivy.lib}"/>
+ <fileset dir="${ivy.lib}">
+ <exclude name="**/jsr305*.jar" />
+ </fileset>
</copy>
<subant target="package">
diff --git
a/zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.c
b/zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.c
new file mode 100644
index 0000000..b923153
--- /dev/null
+++ b/zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.c
@@ -0,0 +1,29 @@
+/* Net::ZooKeeper - Perl extension for Apache ZooKeeper
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <zookeeper/zookeeper_version.h>
+
+#include "check_zk_version.h"
+
+int main() {
+ printf("%d.%d.%d\n", ZOO_MAJOR_VERSION, ZOO_MINOR_VERSION,
ZOO_PATCH_VERSION);
+ return 0;
+}
+
diff --git
a/zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.h
b/zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.h
new file mode 100644
index 0000000..67a3642
--- /dev/null
+++ b/zookeeper-contrib/zookeeper-contrib-zkperl/build/check_zk_version.h
@@ -0,0 +1,27 @@
+/* Net::ZooKeeper - Perl extension for Apache ZooKeeper
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* keep in sync with Makefile.PL */
+#if !defined(ZOO_MAJOR_VERSION) || ZOO_MAJOR_VERSION != 3 || \
+ !defined(ZOO_MINOR_VERSION) || ZOO_MINOR_VERSION < 1 || \
+ !defined(ZOO_PATCH_VERSION) || \
+ (ZOO_MINOR_VERSION == 1 && ZOO_PATCH_VERSION < 1)
+#error "Net::ZooKeeper requires at least ZooKeeper version 3.1.1"
+#endif
+
diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
index 2bc1448..49718c0 100644
--- a/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
+++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/build.xml
@@ -145,9 +145,6 @@
<copy
todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/lib">
<fileset file="${basedir}/lib/jtoaster-1.0.4.jar" />
</copy>
- <copy
todir="${dist.dir}/zookeeper-contrib/zookeeper-contrib-${name}/lib">
- <fileset file="../../build/zookeeper-${version}.jar" />
- </copy>
</target>
</project>
diff --git
a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/defaultNodeVeiwers.cfg
b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/defaultNodeViewers.cfg
similarity index 100%
rename from
zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/defaultNodeVeiwers.cfg
rename to
zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/resources/defaultNodeViewers.cfg
diff --git a/zookeeper-server/src/main/resources/jline-0.9.94.LICENSE.txt
b/zookeeper-server/src/main/resources/lib/jline-0.9.94.LICENSE.txt
similarity index 100%
rename from zookeeper-server/src/main/resources/jline-0.9.94.LICENSE.txt
rename to zookeeper-server/src/main/resources/lib/jline-0.9.94.LICENSE.txt
