diff --git a/flink-batch-connectors/flink-hcatalog/pom.xml b/flink-batch-connectors/flink-hcatalog/pom.xml index b0394da1e4a06..f79431d1ab3cb 100644 --- a/flink-batch-connectors/flink-hcatalog/pom.xml +++ b/flink-batch-connectors/flink-hcatalog/pom.xml @@ -150,27 +150,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-contrib/flink-streaming-contrib/pom.xml b/flink-contrib/flink-streaming-contrib/pom.xml index 4da88386e73b3..c85635f093e07 100644 --- a/flink-contrib/flink-streaming-contrib/pom.xml +++ b/flink-contrib/flink-streaming-contrib/pom.xml @@ -191,27 +191,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-examples/flink-examples-batch/pom.xml b/flink-examples/flink-examples-batch/pom.xml index 67b4f309afced..08923ea6211f8 100644 --- a/flink-examples/flink-examples-batch/pom.xml +++ b/flink-examples/flink-examples-batch/pom.xml @@ -138,33 +138,16 @@ under the License. - + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 - - + org.apache.maven.plugins maven-jar-plugin diff --git a/flink-examples/flink-examples-streaming/pom.xml b/flink-examples/flink-examples-streaming/pom.xml index d5166354a9e82..79403c89c8315 100644 --- a/flink-examples/flink-examples-streaming/pom.xml +++ b/flink-examples/flink-examples-streaming/pom.xml @@ -85,28 +85,12 @@ under the License. - + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-libraries/flink-gelly-examples/pom.xml b/flink-libraries/flink-gelly-examples/pom.xml index ab7eacc911c14..5ed0fa4157cac 100644 --- a/flink-libraries/flink-gelly-examples/pom.xml +++ b/flink-libraries/flink-gelly-examples/pom.xml @@ -177,27 +177,12 @@ + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-libraries/flink-gelly-scala/pom.xml b/flink-libraries/flink-gelly-scala/pom.xml index 2a8ca6df744f4..cbcdac132548d 100644 --- a/flink-libraries/flink-gelly-scala/pom.xml +++ b/flink-libraries/flink-gelly-scala/pom.xml @@ -185,29 +185,14 @@ under the License. - - org.scalastyle - scalastyle-maven-plugin - 0.5.0 - - - - check - - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala - ${project.basedir}/../../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 - - + + + org.scalastyle + scalastyle-maven-plugin + + ${project.basedir}/../../tools/maven/scalastyle-config.xml + + diff --git a/flink-libraries/flink-ml/pom.xml b/flink-libraries/flink-ml/pom.xml index 2a26e51592760..986cb0f5640ad 100644 --- a/flink-libraries/flink-ml/pom.xml +++ b/flink-libraries/flink-ml/pom.xml @@ -160,27 +160,12 @@ + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-libraries/flink-table/pom.xml b/flink-libraries/flink-table/pom.xml index 2c278cdb870c5..2d56ec961b702 100644 --- a/flink-libraries/flink-table/pom.xml +++ b/flink-libraries/flink-table/pom.xml @@ -217,27 +217,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml index e77dfc60d7972..7fa967ec53e2c 100644 --- a/flink-runtime/pom.xml +++ b/flink-runtime/pom.xml @@ -289,27 +289,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-scala-shell/pom.xml b/flink-scala-shell/pom.xml index faea206547661..d75c62654b127 100644 --- a/flink-scala-shell/pom.xml +++ b/flink-scala-shell/pom.xml @@ -195,27 +195,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml index e19c3db49bd84..9dc15b46ec100 100644 --- a/flink-scala/pom.xml +++ b/flink-scala/pom.xml @@ -202,27 +202,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml index 81918701692eb..4310852526c89 100644 --- a/flink-streaming-scala/pom.xml +++ b/flink-streaming-scala/pom.xml @@ -207,27 +207,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-test-utils/pom.xml b/flink-test-utils/pom.xml index 3dc298d8bfc9f..5891b17503d3d 100644 --- a/flink-test-utils/pom.xml +++ b/flink-test-utils/pom.xml @@ -198,27 +198,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml index b0b70b9e690af..34b3d668edbbf 100644 --- a/flink-tests/pom.xml +++ b/flink-tests/pom.xml @@ -292,28 +292,13 @@ under the License. - + + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-yarn-tests/pom.xml b/flink-yarn-tests/pom.xml index f01ca3be22279..1d0951d476bf3 100644 --- a/flink-yarn-tests/pom.xml +++ b/flink-yarn-tests/pom.xml @@ -278,27 +278,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/flink-yarn/pom.xml b/flink-yarn/pom.xml index 43b78675eeaad..63869ee48a0fc 100644 --- a/flink-yarn/pom.xml +++ b/flink-yarn/pom.xml @@ -188,27 +188,12 @@ under the License. + org.scalastyle scalastyle-maven-plugin - 0.5.0 - - - - check - - - - false - true - true - false - ${basedir}/src/main/scala - ${basedir}/src/test/scala ${project.basedir}/../tools/maven/scalastyle-config.xml - ${project.basedir}/scalastyle-output.xml - UTF-8 diff --git a/pom.xml b/pom.xml index 9e3e8c7cb9c75..ace4ec6a61f76 100644 --- a/pom.xml +++ b/pom.xml @@ -813,7 +813,7 @@ under the License. flink-runtime-web/web-dashboard/assets/fonts/FontAwesome.otf flink-runtime-web/web-dashboard/assets/fonts/fontawesome* - + flink-runtime-web/web-dashboard/web/** @@ -836,7 +836,7 @@ under the License. **/flink-bin/conf/slaves **/flink-bin/conf/masters **/flink-bin/conf/zoo.cfg - flink-contrib/docker-flink/flink/conf/slaves + flink-contrib/docker-flink/flink/conf/slaves **/README.md CHANGELOG @@ -1117,6 +1117,30 @@ under the License. + + + + org.scalastyle + scalastyle-maven-plugin + 0.5.0 + + + + check + + + + + false + true + true + false + ${basedir}/src/main/scala + ${basedir}/src/test/scala + ${project.basedir}/target/scalastyle-output.xml + UTF-8 + +