Skip to content

Commit 321f84d

Browse files
committed
Fix checkstyle and license issues
1 parent 6aaffd5 commit 321f84d

File tree

5 files changed

+19
-9
lines changed

5 files changed

+19
-9
lines changed

dev/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818
#
1919

20-
FROM maven:3.8.4-jdk-8
20+
FROM maven:3.8.4-jdk-11
2121

2222
RUN apt-get update
2323
RUN apt-get install -y \

zookeeper-server/src/main/java/org/apache/zookeeper/common/ZKConfig.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.Map;
3030
import java.util.Map.Entry;
3131
import java.util.Properties;
32-
3332
import org.apache.zookeeper.Environment;
3433
import org.apache.zookeeper.server.util.VerifyingFileFactory;
3534
import org.slf4j.Logger;

zookeeper-server/src/test/java/org/apache/zookeeper/common/ZKConfigTest.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,15 @@
2222
import static org.junit.jupiter.api.Assertions.assertFalse;
2323
import static org.junit.jupiter.api.Assertions.assertNotNull;
2424
import static org.junit.jupiter.api.Assertions.assertTrue;
25-
25+
import ch.qos.logback.classic.Level;
26+
import java.io.File;
27+
import java.io.IOException;
2628
import org.apache.zookeeper.test.LoggerTestTool;
2729
import org.junit.jupiter.api.AfterAll;
2830
import org.junit.jupiter.api.AfterEach;
2931
import org.junit.jupiter.api.BeforeAll;
3032
import org.junit.jupiter.api.Test;
3133
import org.junit.jupiter.api.Timeout;
32-
import ch.qos.logback.classic.Level;
33-
34-
import java.io.File;
35-
import java.io.IOException;
3634

3735
public class ZKConfigTest {
3836

zookeeper-server/src/test/java/org/apache/zookeeper/test/LoggerTestTool.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.io.IOException;
3131
import java.io.LineNumberReader;
3232
import java.io.StringReader;
33-
3433
import org.slf4j.LoggerFactory;
3534

3635
public class LoggerTestTool implements AutoCloseable {

zookeeper-server/src/test/resources/zookeeper-client.config

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
116
# Sample secrets
217
zookeeper.ssl.keyStore.password=FileSecret456!
318
zookeeper.ssl.keyStore.passwordPath=/home/zookeeper/top_secret.txt
419
ssl.quorum.keyStore.password=AnotherFileSecret789!
5-

0 commit comments

Comments
 (0)