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 321f84dfc Fix checkstyle and license issues
321f84dfc is described below
commit 321f84dfcceba572fc79aff794ad196c7762ea23
Author: Andor Molnar <[email protected]>
AuthorDate: Tue Jan 20 18:44:47 2026 -0600
Fix checkstyle and license issues
---
dev/docker/Dockerfile | 2 +-
.../main/java/org/apache/zookeeper/common/ZKConfig.java | 1 -
.../java/org/apache/zookeeper/common/ZKConfigTest.java | 8 +++-----
.../java/org/apache/zookeeper/test/LoggerTestTool.java | 1 -
.../src/test/resources/zookeeper-client.config | 16 +++++++++++++++-
5 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index a1b33569e..4d8a5d08d 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -17,7 +17,7 @@
# under the License.
#
-FROM maven:3.8.4-jdk-8
+FROM maven:3.8.4-jdk-11
RUN apt-get update
RUN apt-get install -y \
diff --git
a/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKConfig.java
b/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKConfig.java
index 8564050d6..2c9e63199 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKConfig.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKConfig.java
@@ -29,7 +29,6 @@
import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
-
import org.apache.zookeeper.Environment;
import org.apache.zookeeper.server.util.VerifyingFileFactory;
import org.slf4j.Logger;
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
index 7b87e2e3e..31af82d34 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java
@@ -22,17 +22,15 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-
+import ch.qos.logback.classic.Level;
+import java.io.File;
+import java.io.IOException;
import org.apache.zookeeper.test.LoggerTestTool;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
-import ch.qos.logback.classic.Level;
-
-import java.io.File;
-import java.io.IOException;
public class ZKConfigTest {
diff --git
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoggerTestTool.java
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoggerTestTool.java
index 5f225ee18..5633c08b0 100644
---
a/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoggerTestTool.java
+++
b/zookeeper-server/src/test/java/org/apache/zookeeper/test/LoggerTestTool.java
@@ -30,7 +30,6 @@
import java.io.IOException;
import java.io.LineNumberReader;
import java.io.StringReader;
-
import org.slf4j.LoggerFactory;
public class LoggerTestTool implements AutoCloseable {
diff --git a/zookeeper-server/src/test/resources/zookeeper-client.config
b/zookeeper-server/src/test/resources/zookeeper-client.config
index 096105ce9..4718f6d9c 100644
--- a/zookeeper-server/src/test/resources/zookeeper-client.config
+++ b/zookeeper-server/src/test/resources/zookeeper-client.config
@@ -1,5 +1,19 @@
+# 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.
+
# Sample secrets
zookeeper.ssl.keyStore.password=FileSecret456!
zookeeper.ssl.keyStore.passwordPath=/home/zookeeper/top_secret.txt
ssl.quorum.keyStore.password=AnotherFileSecret789!
-
