Repository: flink Updated Branches: refs/heads/master 32bc67e6c -> c376bf136
[FLINK-7305] [checkstyle] Allow imports from org.apache.flink.shaded + add new import block This closes #4425. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c376bf13 Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c376bf13 Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c376bf13 Branch: refs/heads/master Commit: c376bf136d4868c1ba156aa77c9fdf9ee17f2af2 Parents: e83217b Author: zentol <[email protected]> Authored: Tue Jun 13 17:02:03 2017 +0200 Committer: zentol <[email protected]> Committed: Wed Aug 2 14:46:15 2017 +0200 ---------------------------------------------------------------------- tools/maven/checkstyle.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/c376bf13/tools/maven/checkstyle.xml ---------------------------------------------------------------------- diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml index 0c7a24d..897802b 100644 --- a/tools/maven/checkstyle.xml +++ b/tools/maven/checkstyle.xml @@ -197,8 +197,7 @@ This file is based on the checkstyle file of Apache Beam. <module name="ImportOrder"> <!-- Checks for out of order import statements. --> <property name="severity" value="error"/> - <!-- Flink imports first, then other imports, then javax, java and scala imports, then static imports. --> - <property name="groups" value="org.apache.flink,*,javax,java,scala"/> + <property name="groups" value="org.apache.flink,org.apache.flink.shaded,*,javax,java,scala"/> <property name="separated" value="true"/> <property name="sortStaticImportsAlphabetically" value="true"/> <property name="option" value="bottom"/> @@ -212,7 +211,7 @@ This file is based on the checkstyle file of Apache Beam. </module> <module name="IllegalImport"> - <property name="illegalPkgs" value="org.apache.flink.shaded, autovalue.shaded, avro.shaded, com.google.api.client.repackaged, com.google.appengine.repackaged, io.netty.util.internal"/> + <property name="illegalPkgs" value="autovalue.shaded, avro.shaded, com.google.api.client.repackaged, com.google.appengine.repackaged, io.netty.util.internal"/> </module> <module name="RedundantModifier">
