From commits-return-7783-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org Wed May 8 15:51:22 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 39410180630 for ; Wed, 8 May 2019 17:51:22 +0200 (CEST) Received: (qmail 19040 invoked by uid 500); 8 May 2019 15:51:21 -0000 Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@zookeeper.apache.org Delivered-To: mailing list commits@zookeeper.apache.org Received: (qmail 19029 invoked by uid 99); 8 May 2019 15:51:21 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 May 2019 15:51:21 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 11F02872B3; Wed, 8 May 2019 15:51:20 +0000 (UTC) Date: Wed, 08 May 2019 15:51:20 +0000 To: "commits@zookeeper.apache.org" Subject: [zookeeper] branch master updated: ZOOKEEPER-3362: Create a simple checkstyle file MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155733068086.12080.6728598201296684020@gitbox.apache.org> From: andor@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: zookeeper X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: c67760523492b8da033c7bc0ea3076ab4acf1a93 X-Git-Newrev: cb36d5a95fca6bc098890bde517ba76901adf43a X-Git-Rev: cb36d5a95fca6bc098890bde517ba76901adf43a X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 cb36d5a ZOOKEEPER-3362: Create a simple checkstyle file cb36d5a is described below commit cb36d5a95fca6bc098890bde517ba76901adf43a Author: Enrico Olivelli AuthorDate: Wed May 8 17:51:13 2019 +0200 ZOOKEEPER-3362: Create a simple checkstyle file Create a basic checkstyle file, in order to cover the minimal check on author tags. This is needed in order to drop old ANT based precommit job (see ZOOKEEPER-3351) We will not remove legacy checkstyle configuration file in zookeeper-server/src/test/resources/checkstyle.xml because it is referred by ANT build.xml files (even if we are not actually using that target). This task won't add a complete checkstyle configuration with usual checks because it would imply almost a change at every .java in the codebase. Author: Enrico Olivelli Reviewers: andor@apache.org Closes #909 from eolivelli/fix/checkstyle and squashes the following commits: fdda1571c [Enrico Olivelli] use a property in order to define checkstyle version 92192981f [Enrico Olivelli] Skip CPP tests when using -DskipTests b816e563e [Enrico Olivelli] Add cppunit for Travis faf37bb37 [Enrico Olivelli] ZOOKEEPER-3362 Create a simple checkstyle file --- .travis.yml | 7 ++- checkstyle.xml | 63 ++++++++++++++++++++++ checkstyleSuppressions.xml | 25 +++++++++ pom.xml | 31 +++++++++++ .../src/main/assembly/source-package.xml | 2 + zookeeper-client/zookeeper-client-c/pom.xml | 2 + .../java/com/nitido/utils/toaster/Toaster.java | 6 --- 7 files changed, 129 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28f8d5b..7880f1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,12 @@ cache: directories: - "$HOME/.m2" -script: mvn clean install -DskipTests spotbugs:check +addons: + apt: + packages: + - libcppunit-dev + +script: mvn clean install -DskipTests spotbugs:check checkstyle:check -Pfull-build branches: only: diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 0000000..2049370 --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/checkstyleSuppressions.xml b/checkstyleSuppressions.xml new file mode 100644 index 0000000..53c96b5 --- /dev/null +++ b/checkstyleSuppressions.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 369c146..f21ecd7 100755 --- a/pom.xml +++ b/pom.xml @@ -289,6 +289,7 @@ 2.6 3.2.5 3.1.9 + 8.17 @@ -557,6 +558,36 @@ dependency-check-maven 4.0.2 + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.0 + + + com.puppycrawl.tools + checkstyle + ${checkstyle.version} + + + + checkstyle.xml + checkstyleSuppressions.xml + UTF-8 + true + true + false + true + + + + checkstyle + validate + + check + + + + diff --git a/zookeeper-assembly/src/main/assembly/source-package.xml b/zookeeper-assembly/src/main/assembly/source-package.xml index f93b4c6..8135e62 100644 --- a/zookeeper-assembly/src/main/assembly/source-package.xml +++ b/zookeeper-assembly/src/main/assembly/source-package.xml @@ -112,6 +112,8 @@ ivysettings.xml excludeFindBugsFilter.xml owaspSuppressions.xml + checktyle.xml + checktyleSuppressions.xml ${rw.file.permission} diff --git a/zookeeper-client/zookeeper-client-c/pom.xml b/zookeeper-client/zookeeper-client-c/pom.xml index 81a1787..8294810 100755 --- a/zookeeper-client/zookeeper-client-c/pom.xml +++ b/zookeeper-client/zookeeper-client-c/pom.xml @@ -55,6 +55,8 @@ test-cppunit test + + ${skipTests} diff --git a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java index cc123ba..0a4fe94 100644 --- a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java +++ b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/com/nitido/utils/toaster/Toaster.java @@ -44,8 +44,6 @@ import javax.swing.border.*; /** * Class to show tosters in multiplatform * - * @author daniele piras - * */ public class Toaster { @@ -97,8 +95,6 @@ public class Toaster /** * Constructor to initialized toaster component... * - * @author daniele piras - * */ public Toaster() { @@ -124,8 +120,6 @@ public class Toaster /** * Class that rappresent a single toaster * - * @author daniele piras - * */ class SingleToaster extends javax.swing.JWindow {