You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by sy...@apache.org on 2022/12/14 13:13:57 UTC
[zookeeper] branch branch-3.6 updated: ZOOKEEPER-4651: Fix checkstyle problems on branch-3.6
This is an automated email from the ASF dual-hosted git repository.
symat 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 696ba7bbd ZOOKEEPER-4651: Fix checkstyle problems on branch-3.6
696ba7bbd is described below
commit 696ba7bbd16417a56828d7d6e7f7c3f15a572abe
Author: Mate Szalay-Beko <sy...@apache.com>
AuthorDate: Wed Dec 14 14:13:31 2022 +0100
ZOOKEEPER-4651: Fix checkstyle problems on branch-3.6
Checkstyle was upgraded to 8.39 in ZOOKEEPER-4644 and it doesn't work properly on current branch 3.6. Given that branch 3.6 won't be actively developed in the future, I decided to downgrade checkstyle back to 8.19 instead of fixing the checkstyle config or re-format the code.
But even after downgrading it to 8.19, we still have four checkstyle errors in a license header which I also fix in this commit.
Author: Mate Szalay-Beko <sy...@apache.com>
Reviewers: Andor Molnar <an...@apache.org>
Closes #1965 from symat/ZOOKEEPER-4651
---
pom.xml | 2 +-
.../zookeeper/compatibility/TestApacheCuratorCompatibility.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index fde1814d1..6edb5bce7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -366,7 +366,7 @@
<commons-collections.version>3.2.2</commons-collections.version>
<dropwizard.version>3.2.5</dropwizard.version>
<spotbugsannotations.version>4.0.2</spotbugsannotations.version>
- <checkstyle.version>8.39</checkstyle.version>
+ <checkstyle.version>8.19</checkstyle.version>
<enforcer.version>3.0.0-M3</enforcer.version>
<!-- parameter to pass to C client build -->
diff --git a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/src/test/java/org/apache/zookeeper/compatibility/TestApacheCuratorCompatibility.java b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/src/test/java/org/apache/zookeeper/compatibility/TestApacheCuratorCompatibility.java
index b60a00422..c2d81db27 100644
--- a/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/src/test/java/org/apache/zookeeper/compatibility/TestApacheCuratorCompatibility.java
+++ b/zookeeper-compatibility-tests/zookeeper-compatibility-tests-curator/src/test/java/org/apache/zookeeper/compatibility/TestApacheCuratorCompatibility.java
@@ -1,4 +1,4 @@
-/**
+/*
* 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
@@ -6,9 +6,9 @@
* 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ * 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.