diff --git a/.github/actions/reviewdog-setup b/.github/actions/reviewdog-setup new file mode 160000 index 0000000000..2fc905b187 --- /dev/null +++ b/.github/actions/reviewdog-setup @@ -0,0 +1 @@ +Subproject commit 2fc905b1875f2e6b91c4201a4dc6eaa21b86547e diff --git a/.github/actions/sanity-check/action.yml b/.github/actions/sanity-check/action.yml new file mode 100644 index 0000000000..a1d03a33c3 --- /dev/null +++ b/.github/actions/sanity-check/action.yml @@ -0,0 +1,53 @@ +# +# 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. +# + +name: "Sanity Check" + +description: | + Action to perform some very basic lightweight checks, like code styles, license headers, etc., + and fail fast to avoid wasting resources running heavyweight checks, like unit tests, e2e tests. + +inputs: + token: + description: 'The GitHub API token' + required: false + +runs: + using: "composite" + steps: + - name: Check License Header + uses: apache/skywalking-eyes@a63f4afcc287dfb3727ecc45a4afc55a5e69c15f + + - uses: ./.github/actions/reviewdog-setup + with: + reviewdog_version: v0.10.2 + + - shell: bash + run: ./mvnw -B -q checkstyle:checkstyle-aggregate + + - shell: bash + env: + REVIEWDOG_GITHUB_API_TOKEN: ${{ inputs.token }} + run: | + if [[ -n "${{ inputs.token }}" ]]; then + reviewdog -f=checkstyle \ + -reporter="github-pr-check" \ + -filter-mode="added" \ + -fail-on-error="true" < target/checkstyle-result.xml + fi diff --git a/.github/workflows/ci_backend.yml b/.github/workflows/backend.yml similarity index 63% rename from .github/workflows/ci_backend.yml rename to .github/workflows/backend.yml index bc8845b030..55475b2fe4 100644 --- a/.github/workflows/ci_backend.yml +++ b/.github/workflows/backend.yml @@ -19,8 +19,10 @@ name: Backend on: push: + branches: + - dev paths: - - '.github/workflows/ci_backend.yml' + - '.github/workflows/backend.yml' - 'package.xml' - 'pom.xml' - 'dolphinscheduler-alert/**' @@ -31,7 +33,7 @@ on: - 'dolphinscheduler-server/**' pull_request: paths: - - '.github/workflows/ci_backend.yml' + - '.github/workflows/backend.yml' - 'package.xml' - 'pom.xml' - 'dolphinscheduler-alert/**' @@ -41,20 +43,34 @@ on: - 'dolphinscheduler-rpc/**' - 'dolphinscheduler-server/**' +concurrency: + group: backend-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: - Compile-check: + build: + name: Build runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: - submodule: true - - name: Check License Header - uses: apache/skywalking-eyes@ec88b7d850018c8983f87729ea88549e100c5c82 - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 + submodules: true + - name: Sanity Check + uses: ./.github/actions/sanity-check + with: + token: ${{ secrets.GITHUB_TOKEN }} # We only need to pass this token in one workflow + - uses: actions/cache@v2 with: - java-version: 1.8 - - name: Compile - run: mvn -B clean install -Prelease -Dmaven.test.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 + path: ~/.m2/repository + key: ${{ runner.os }}-maven + - name: Build and Package + run: | + ./mvnw -B clean install \ + -Prelease \ + -Dmaven.test.skip=true \ + -Dcheckstyle.skip=true \ + -Dhttp.keepAlive=false \ + -Dmaven.wagon.http.pool=false \ + -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 - name: Check dependency license run: tools/dependencies/check-LICENSE.sh diff --git a/.github/workflows/ci_e2e.yml b/.github/workflows/e2e.yml similarity index 89% rename from .github/workflows/ci_e2e.yml rename to .github/workflows/e2e.yml index 009b3fb151..2fbbffa8bd 100644 --- a/.github/workflows/ci_e2e.yml +++ b/.github/workflows/e2e.yml @@ -20,26 +20,26 @@ env: DOCKER_DIR: ./docker LOG_DIR: /tmp/dolphinscheduler -name: e2e Test +name: Test -jobs: +concurrency: + group: e2e-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true - build: - name: Test +jobs: + test: + name: E2E runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 with: - submodule: true - - name: Check License Header - uses: apache/skywalking-eyes@ec88b7d850018c8983f87729ea88549e100c5c82 + submodules: true + - name: Sanity Check + uses: ./.github/actions/sanity-check - uses: actions/cache@v1 with: path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- + key: ${{ runner.os }}-maven - name: Build Image run: | sh ./docker/build/hooks/build diff --git a/.github/workflows/ci_frontend.yml b/.github/workflows/frontend.yml similarity index 67% rename from .github/workflows/ci_frontend.yml rename to .github/workflows/frontend.yml index afa0c8d672..4ab1e0d6c5 100644 --- a/.github/workflows/ci_frontend.yml +++ b/.github/workflows/frontend.yml @@ -19,31 +19,44 @@ name: Frontend on: push: + branches: + - dev paths: - - '.github/workflows/ci_frontend.yml' + - '.github/workflows/frontend.yml' - 'dolphinscheduler-ui/**' pull_request: paths: - - '.github/workflows/ci_frontend.yml' + - '.github/workflows/frontend.yml' - 'dolphinscheduler-ui/**' +defaults: + run: + working-directory: dolphinscheduler-ui + +concurrency: + group: frontend-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: - Compile-check: + build: + name: Build runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v2 with: - submodule: true + submodules: true + - if: matrix.os == 'ubuntu-latest' + name: Sanity Check + uses: ./.github/actions/sanity-check - name: Set up Node.js - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: - version: 8 - - name: Compile + node-version: 8 + - name: Compile and Build run: | - cd dolphinscheduler-ui npm install node-sass --unsafe-perm npm install npm run lint diff --git a/.github/workflows/ci_ut.yml b/.github/workflows/unit-test.yml similarity index 52% rename from .github/workflows/ci_ut.yml rename to .github/workflows/unit-test.yml index 2ff190489e..3087806894 100644 --- a/.github/workflows/ci_ut.yml +++ b/.github/workflows/unit-test.yml @@ -15,69 +15,71 @@ # limitations under the License. # +name: Test + on: pull_request: + paths-ignore: + - '**/*.md' + - 'dolphinscheduler-ui' push: + paths-ignore: + - '**/*.md' + - 'dolphinscheduler-ui' branches: - dev + env: LOG_DIR: /tmp/dolphinscheduler -name: Unit Test +concurrency: + group: unit-test-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: - - build: - name: Build + unit-test: + name: Unit Test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 with: - submodule: true - - name: Check License Header - uses: apache/skywalking-eyes@ec88b7d850018c8983f87729ea88549e100c5c82 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Only enable review / suggestion here - - uses: actions/cache@v1 + submodules: true + - name: Sanity Check + uses: ./.github/actions/sanity-check + - name: Set up JDK 1.8 + uses: actions/setup-java@v2 + with: + java-version: 8 + distribution: 'adopt' + - uses: actions/cache@v2 with: path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- + key: ${{ runner.os }}-maven - name: Bootstrap database run: | sed -i "/image: bitnami\/postgresql/a\ ports:\n - 5432:5432" $(pwd)/docker/docker-swarm/docker-compose.yml sed -i "/image: bitnami\/zookeeper/a\ ports:\n - 2181:2181" $(pwd)/docker/docker-swarm/docker-compose.yml docker-compose -f $(pwd)/docker/docker-swarm/docker-compose.yml up -d dolphinscheduler-zookeeper dolphinscheduler-postgresql until docker logs docker-swarm_dolphinscheduler-postgresql_1 2>&1 | grep 'listening on IPv4 address'; do echo "waiting for postgresql ready ..."; sleep 1; done - docker run --rm --network docker-swarm_dolphinscheduler -v $(pwd)/sql/dolphinscheduler_postgre.sql:/docker-entrypoint-initdb.d/dolphinscheduler_postgre.sql bitnami/postgresql:latest bash -c "PGPASSWORD=root psql -h docker-swarm_dolphinscheduler-postgresql_1 -U root -d dolphinscheduler -v ON_ERROR_STOP=1 -f /docker-entrypoint-initdb.d/dolphinscheduler_postgre.sql" - - name: Set up JDK 1.8 - uses: actions/setup-java@v1 - with: - java-version: 1.8 - - name: Git fetch unshallow - run: | - git fetch --unshallow - git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" - git fetch origin - - name: Compile - run: | - export MAVEN_OPTS='-Dmaven.repo.local=.m2/repository -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx5g' - mvn clean verify -B -Dmaven.test.skip=false + docker run --rm --network docker-swarm_dolphinscheduler -v $(pwd)/sql/dolphinscheduler_postgre.sql:/docker-entrypoint-initdb.d/dolphinscheduler_postgre.sql bitnami/postgresql:11.11.0 bash -c "PGPASSWORD=root psql -h docker-swarm_dolphinscheduler-postgresql_1 -U root -d dolphinscheduler -v ON_ERROR_STOP=1 -f /docker-entrypoint-initdb.d/dolphinscheduler_postgre.sql" + + - name: Run Unit tests + run: ./mvnw clean verify -B -Dmaven.test.skip=false - name: Upload coverage report to codecov - run: | - CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash) + run: CODECOV_TOKEN="09c2663f-b091-4258-8a47-c981827eb29a" bash <(curl -s https://codecov.io/bash) + # Set up JDK 11 for SonarCloud. - - name: Set up JDK 1.11 - uses: actions/setup-java@v1 + - name: Set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.11 + java-version: 11 + distribution: 'adopt' - name: Run SonarCloud Analysis run: > - mvn --batch-mode verify sonar:sonar + ./mvnw --batch-mode verify sonar:sonar -Dsonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml -Dmaven.test.skip=true + -Dcheckstyle.skip=true -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.core.codeCoveragePlugin=jacoco @@ -88,31 +90,16 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: Collect logs + continue-on-error: true run: | mkdir -p ${LOG_DIR} docker-compose -f $(pwd)/docker/docker-swarm/docker-compose.yml logs dolphinscheduler-postgresql > ${LOG_DIR}/db.txt - continue-on-error: true - Checkstyle: - name: Check code style - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 + - name: Upload logs + uses: actions/upload-artifact@v2 + continue-on-error: true with: - submodule: true - - name: check code style - env: - WORKDIR: ./ - REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CHECKSTYLE_CONFIG: style/checkstyle.xml - REVIEWDOG_VERSION: v0.10.2 - run: | - wget -O - -q https://github.com/checkstyle/checkstyle/releases/download/checkstyle-8.43/checkstyle-8.43-all.jar > /opt/checkstyle.jar - wget -O - -q https://raw.githubusercontent.com/reviewdog/reviewdog/master/install.sh | sh -s -- -b /opt ${REVIEWDOG_VERSION} - java -jar /opt/checkstyle.jar "${WORKDIR}" -c "${CHECKSTYLE_CONFIG}" -f xml \ - | /opt/reviewdog -f=checkstyle \ - -reporter="${INPUT_REPORTER:-github-pr-check}" \ - -filter-mode="${INPUT_FILTER_MODE:-added}" \ - -fail-on-error="${INPUT_FAIL_ON_ERROR:-false}" + name: unit-test-logs + path: ${LOG_DIR} diff --git a/.gitmodules b/.gitmodules index d5c455f6da..64a562af13 100644 --- a/.gitmodules +++ b/.gitmodules @@ -24,3 +24,6 @@ [submodule ".github/actions/translate-on-issue"] path = .github/actions/translate-on-issue url = https://github.com/xingchun-chen/translation-helper.git +[submodule ".github/actions/reviewdog-setup"] + path = .github/actions/reviewdog-setup + url = https://github.com/reviewdog/action-setup diff --git a/.licenserc.yaml b/.licenserc.yaml index 8f69da5608..44a776ee59 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -40,5 +40,10 @@ header: - '**/.gitignore' - '**/LICENSE' - '**/NOTICE' + - '**/node_modules/**' + - '.github/actions/comment-on-issue/**' + - '.github/actions/lable-on-issue/**' + - '.github/actions/reviewdog-setup/**' + - '.github/actions/translate-on-issue/**' comment: on-failure diff --git a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml index 74dedf4e0f..079185cf0c 100644 --- a/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml +++ b/dolphinscheduler-alert-plugin/dolphinscheduler-alert-email/pom.xml @@ -31,17 +31,6 @@ dolphinscheduler-plugin - - - com.fasterxml.jackson.core - jackson-annotations - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - org.apache.commons commons-collections4 @@ -131,4 +120,4 @@ dolphinscheduler-alert-email-${project.version} - \ No newline at end of file + diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTaskTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTaskTest.java index f0d5d79d00..04b2a0ddcf 100644 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTaskTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTaskTest.java @@ -55,8 +55,6 @@ import org.springframework.context.ApplicationContext; public class HttpTaskTest { private static final Logger logger = LoggerFactory.getLogger(HttpTaskTest.class); - - private HttpTask httpTask; private ProcessService processService; @@ -168,7 +166,7 @@ public class HttpTaskTest { } catch (IOException e) { e.printStackTrace(); - }; + } } @Test diff --git a/install.sh b/install.sh deleted file mode 100755 index 5b0ed74e6c..0000000000 --- a/install.sh +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh -# -# 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. -# - -workDir=`dirname $0` -workDir=`cd ${workDir};pwd` - -source ${workDir}/conf/config/install_config.conf - -# 1.replace file -echo "1.replace file" - -txt="" -if [[ "$OSTYPE" == "darwin"* ]]; then - # Mac OSX - txt="''" -fi - -datasourceDriverClassname="com.mysql.jdbc.Driver" -if [ $dbtype == "postgresql" ];then - datasourceDriverClassname="org.postgresql.Driver" -fi -sed -i ${txt} "s@^spring.datasource.driver-class-name=.*@spring.datasource.driver-class-name=${datasourceDriverClassname}@g" conf/datasource.properties -sed -i ${txt} "s@^spring.datasource.url=.*@spring.datasource.url=jdbc:${dbtype}://${dbhost}/${dbname}?characterEncoding=UTF-8\&allowMultiQueries=true@g" conf/datasource.properties -sed -i ${txt} "s@^spring.datasource.username=.*@spring.datasource.username=${username}@g" conf/datasource.properties -sed -i ${txt} "s@^spring.datasource.password=.*@spring.datasource.password=${password}@g" conf/datasource.properties - -sed -i ${txt} "s@^data.basedir.path=.*@data.basedir.path=${dataBasedirPath}@g" conf/common.properties -sed -i ${txt} "s@^resource.storage.type=.*@resource.storage.type=${resourceStorageType}@g" conf/common.properties -sed -i ${txt} "s@^resource.upload.path=.*@resource.upload.path=${resourceUploadPath}@g" conf/common.properties -sed -i ${txt} "s@^hadoop.security.authentication.startup.state=.*@hadoop.security.authentication.startup.state=${kerberosStartUp}@g" conf/common.properties -sed -i ${txt} "s@^java.security.krb5.conf.path=.*@java.security.krb5.conf.path=${krb5ConfPath}@g" conf/common.properties -sed -i ${txt} "s@^login.user.keytab.username=.*@login.user.keytab.username=${keytabUserName}@g" conf/common.properties -sed -i ${txt} "s@^login.user.keytab.path=.*@login.user.keytab.path=${keytabPath}@g" conf/common.properties -sed -i ${txt} "s@^kerberos.expire.time=.*@kerberos.expire.time=${kerberosExpireTime}@g" conf/common.properties -sed -i ${txt} "s@^hdfs.root.user=.*@hdfs.root.user=${hdfsRootUser}@g" conf/common.properties -sed -i ${txt} "s@^fs.defaultFS=.*@fs.defaultFS=${defaultFS}@g" conf/common.properties -sed -i ${txt} "s@^fs.s3a.endpoint=.*@fs.s3a.endpoint=${s3Endpoint}@g" conf/common.properties -sed -i ${txt} "s@^fs.s3a.access.key=.*@fs.s3a.access.key=${s3AccessKey}@g" conf/common.properties -sed -i ${txt} "s@^fs.s3a.secret.key=.*@fs.s3a.secret.key=${s3SecretKey}@g" conf/common.properties -sed -i ${txt} "s@^resource.manager.httpaddress.port=.*@resource.manager.httpaddress.port=${resourceManagerHttpAddressPort}@g" conf/common.properties -sed -i ${txt} "s@^yarn.resourcemanager.ha.rm.ids=.*@yarn.resourcemanager.ha.rm.ids=${yarnHaIps}@g" conf/common.properties -sed -i ${txt} "s@^yarn.application.status.address=.*@yarn.application.status.address=http://${singleYarnIp}:%s/ws/v1/cluster/apps/%s@g" conf/common.properties -sed -i ${txt} "s@^yarn.job.history.status.address=.*@yarn.job.history.status.address=http://${singleYarnIp}:19888/ws/v1/history/mapreduce/jobs/%s@g" conf/common.properties -sed -i ${txt} "s@^sudo.enable=.*@sudo.enable=${sudoEnable}@g" conf/common.properties - -# the following configurations may be commented, so ddd #\? to ensure successful sed -sed -i ${txt} "s@^#\?worker.tenant.auto.create=.*@worker.tenant.auto.create=${workerTenantAutoCreate}@g" conf/worker.properties -sed -i ${txt} "s@^#\?alert.listen.host=.*@alert.listen.host=${alertServer}@g" conf/worker.properties -sed -i ${txt} "s@^#\?alert.plugin.dir=.*@alert.plugin.dir=${alertPluginDir}@g" conf/alert.properties -sed -i ${txt} "s@^#\?server.port=.*@server.port=${apiServerPort}@g" conf/application-api.properties - -sed -i ${txt} "s@^#\?registry.plugin.dir=.*@registry.plugin.dir=${registryPluginDir}@g" conf/registry.properties -sed -i ${txt} "s@^#\?registry.plugin.name=.*@registry.plugin.name=${registryPluginName}@g" conf/registry.properties -sed -i ${txt} "s@^#\?registry.servers=.*@registry.servers=${registryServers}@g" conf/registry.properties - -# 2.create directory -echo "2.create directory" - -if [ ! -d $installPath ];then - sudo mkdir -p $installPath - sudo chown -R $deployUser:$deployUser $installPath -fi - -# 3.scp resources -echo "3.scp resources" -sh ${workDir}/script/scp-hosts.sh -if [ $? -eq 0 ] -then - echo 'scp copy completed' -else - echo 'scp copy failed to exit' - exit 1 -fi - - -# 4.stop server -echo "4.stop server" -sh ${workDir}/script/stop-all.sh - - -# 5.delete zk node -echo "5.delete zk node" - -sh ${workDir}/script/remove-zk-node.sh $zkRoot - - -# 6.startup -echo "6.startup" -sh ${workDir}/script/start-all.sh diff --git a/pom.xml b/pom.xml index 37524d1977..ab518003f3 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ 6.1.0.jre8 0.238.1 3.1.12 - 3.0.0 + 3.1.2 3.4.14 2.12.0 1.6 @@ -899,7 +899,6 @@ **/api/utils/ResultTest.java **/common/graph/DAGTest.java **/common/os/OshiTest.java - **/common/os/OSUtilsTest.java **/common/shell/ShellExecutorTest.java **/common/task/DataxParametersTest.java **/common/task/EntityTestUtils.java @@ -919,7 +918,6 @@ **/common/utils/JSONUtilsTest.java **/common/utils/LoggerUtilsTest.java **/common/utils/NetUtilsTest.java - **/common/utils/OSUtilsTest.java **/common/utils/ParameterUtilsTest.java **/common/utils/TimePlaceholderUtilsTest.java **/common/utils/PreconditionsTest.java @@ -1065,7 +1063,6 @@ **/plugin/alert/email/EmailAlertChannelFactoryTest.java **/plugin/alert/email/EmailAlertChannelTest.java **/plugin/alert/email/ExcelUtilsTest.java - **/plugin/alert/email/MailUtilsTest.java **/plugin/alert/email/template/DefaultHTMLTemplateTest.java **/plugin/alert/dingtalk/DingTalkSenderTest.java **/plugin/alert/dingtalk/DingTalkAlertChannelFactoryTest.java @@ -1153,15 +1150,13 @@ com.puppycrawl.tools checkstyle - 8.18 + 8.45 true UTF-8 style/checkstyle.xml - style/checkstyle-suppressions.xml - checkstyle.suppressions.file true warning true @@ -1169,7 +1164,6 @@ ${project.build.sourceDirectory} **\/generated-sources\/ - true diff --git a/style/checkstyle-suppressions.xml b/style/checkstyle-suppressions.xml deleted file mode 100644 index 50cf91015e..0000000000 --- a/style/checkstyle-suppressions.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/style/checkstyle.xml b/style/checkstyle.xml index 2dba3b9a75..6cfccedc1a 100644 --- a/style/checkstyle.xml +++ b/style/checkstyle.xml @@ -29,11 +29,6 @@ - - - - - @@ -282,4 +277,4 @@ - \ No newline at end of file +