From commits-return-24316-archive-asf-public=cust-asf.ponee.io@accumulo.apache.org Tue Nov 3 23:58:43 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mailroute1-lw-us.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id EEB2B18064E for ; Wed, 4 Nov 2020 00:58:42 +0100 (CET) Received: from mail.apache.org (localhost [127.0.0.1]) by mailroute1-lw-us.apache.org (ASF Mail Server at mailroute1-lw-us.apache.org) with SMTP id 301F11216C1 for ; Tue, 3 Nov 2020 23:58:42 +0000 (UTC) Received: (qmail 26378 invoked by uid 500); 3 Nov 2020 23:58:42 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 26369 invoked by uid 99); 3 Nov 2020 23:58:41 -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; Tue, 03 Nov 2020 23:58:41 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id C2D7C820EB; Tue, 3 Nov 2020 23:58:41 +0000 (UTC) Date: Tue, 03 Nov 2020 23:58:41 +0000 To: "commits@accumulo.apache.org" Subject: [accumulo] branch main updated: Validate formatting in CI and releases (#1767) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <160444792162.24003.13779169181840772751@gitbox.apache.org> From: ctubbsii@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: accumulo X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Oldrev: 0168e8f9265696d4f6a00afcc9bd329bb0610a90 X-Git-Newrev: de7b42f1c529b6475eabfbe0516ad652c543fa81 X-Git-Rev: de7b42f1c529b6475eabfbe0516ad652c543fa81 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. ctubbsii pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/main by this push: new de7b42f Validate formatting in CI and releases (#1767) de7b42f is described below commit de7b42f1c529b6475eabfbe0516ad652c543fa81 Author: Christopher Tubbs AuthorDate: Tue Nov 3 18:58:31 2020 -0500 Validate formatting in CI and releases (#1767) * Validate formatting in CI and releases * List files in console output for rat check --- .github/workflows/maven-full-its.yaml | 2 +- .github/workflows/maven-on-demand.yaml | 2 +- .github/workflows/maven.yaml | 6 ++-- pom.xml | 66 +++++++++++++++++++++++++++++++++- 4 files changed, 70 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven-full-its.yaml b/.github/workflows/maven-full-its.yaml index 4e311f4..9a8fa58 100644 --- a/.github/workflows/maven-full-its.yaml +++ b/.github/workflows/maven-full-its.yaml @@ -61,7 +61,7 @@ jobs: - name: Show the first log message run: git log -n1 - name: Build with Maven (Fast Build) - run: mvn -B -V -e -ntp "-Dstyle.color=always" clean package dependency:resolve -PskipQA + run: mvn -B -V -e -ntp "-Dstyle.color=always" clean package dependency:resolve -DskipTests -DskipFormat -DverifyFormat env: MAVEN_OPTS: -Djansi.force=true creatematrix: diff --git a/.github/workflows/maven-on-demand.yaml b/.github/workflows/maven-on-demand.yaml index 0315ed3..e0708c1 100644 --- a/.github/workflows/maven-on-demand.yaml +++ b/.github/workflows/maven-on-demand.yaml @@ -52,7 +52,7 @@ on: addOpts: description: Additional options required: true - default: -Dspotbugs.skip -Dcheckstyle.skip + default: -Dspotbugs.skip -Dcheckstyle.skip -DskipFormat -DverifyFormat jobs: mvn: diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml index c14acb8..2c16fa7 100644 --- a/.github/workflows/maven.yaml +++ b/.github/workflows/maven.yaml @@ -51,7 +51,7 @@ jobs: - name: Show the first log message run: git log -n1 - name: Build with Maven (Fast Build) - run: mvn -B -V -e -ntp "-Dstyle.color=always" clean package dependency:resolve -PskipQA + run: mvn -B -V -e -ntp "-Dstyle.color=always" clean package dependency:resolve -DskipTests -DskipFormat -DverifyFormat env: MAVEN_OPTS: -Djansi.force=true # more complete builds with tests @@ -61,7 +61,7 @@ jobs: matrix: profile: - {name: 'unit-tests', args: 'verify -PskipQA -DskipTests=false'} - - {name: 'qa-checks', args: 'verify javadoc:jar -Psec-bugs -DskipTests=true -Dspotbugs.timeout=3600000'} + - {name: 'qa-checks', args: 'verify javadoc:jar -Psec-bugs -DskipTests -Dspotbugs.timeout=3600000'} - {name: 'hadoop-compat', args: 'package -DskipTests -Dhadoop.version=3.0.3'} fail-fast: false timeout-minutes: 60 @@ -81,7 +81,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Build with Maven (${{ matrix.profile.name }}) - run: mvn -B -V -e -ntp "-Dstyle.color=always" ${{ matrix.profile.args }} + run: mvn -B -V -e -ntp "-Dstyle.color=always" -DskipFormat ${{ matrix.profile.args }} env: MAVEN_OPTS: -Djansi.force=true - name: Upload unit test results diff --git a/pom.xml b/pom.xml index ba39330..59717b6 100644 --- a/pom.xml +++ b/pom.xml @@ -141,6 +141,7 @@ 2.0.7 2020-08-27T15:56:15Z + true false 1.7.30 @@ -939,7 +940,7 @@ org.apache.maven.plugins maven-release-plugin - -P !autoformat,thrift -DskipTests + -P !autoformat,verifyformat,thrift -DskipTests true clean deploy clean package @@ -1506,6 +1507,69 @@ + + verifyformat + + + verifyFormat + + + + + + com.github.ekryd.sortpom + sortpom-maven-plugin + + + sort-pom + + verify + + process-sources + + + + + com.mycila + license-maven-plugin + + + license-headers + + check + + process-test-resources + + + + + net.revelc.code.formatter + formatter-maven-plugin + + + format-java-source + + validate + + + + + + net.revelc.code + impsort-maven-plugin + + + sort-imports + + check + + + + + + + + autoformat