This is an automated email from the ASF dual-hosted git repository.

nielifeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git


The following commit(s) were added to refs/heads/dev by this push:
     new 159eb84  [Improve][checkstyle]Fix checkstyle incompatible upgrades  
(#1490)
159eb84 is described below

commit 159eb8423c99f21f951abe1a37753bafa206c4dc
Author: Kirs <[email protected]>
AuthorDate: Tue Mar 15 15:06:26 2022 +0800

    [Improve][checkstyle]Fix checkstyle incompatible upgrades  (#1490)
    
    * [Improve][checkstyle]remove linelength check
    I removed this check due to an incompatible upgrade situation with 
checkstyle, IMO, it's not very important, but affects the user experience and 
can be problematic in case the user uses mvn checkstyle and manually selects 
plugins.
    
    * [Improve][checkstyle]Fix checkstyle incompatible upgrades
    Restrict checkstyle version to 8.29 and above
    Modify checkstyle according to the syntax of the new version
---
 pom.xml                                                      |  2 +-
 .../java/org/apache/seatunnel/flink/util/SchemaUtil.java     |  2 --
 .../main/java/org/apache/seatunnel/config/ConfigBuilder.java |  1 -
 tools/checkstyle/checkStyle.xml                              | 12 ++++++------
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9618423..2eb978c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
         <maven.deploy.skip>false</maven.deploy.skip>
         <maven.javadoc.skip>false</maven.javadoc.skip>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
-        
<maven-checkstyle-plugin.version>3.1.0</maven-checkstyle-plugin.version>
+        
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
         <checkstyle.fails.on.error>true</checkstyle.fails.on.error>
         
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
diff --git 
a/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/SchemaUtil.java
 
b/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/SchemaUtil.java
index 21eb38d..0c30151 100644
--- 
a/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/SchemaUtil.java
+++ 
b/seatunnel-apis/seatunnel-api-flink/src/main/java/org/apache/seatunnel/flink/util/SchemaUtil.java
@@ -155,7 +155,6 @@ public final class SchemaUtil {
         return typeInformation;
     }
 
-
     /**
      * todo
      *
@@ -166,7 +165,6 @@ public final class SchemaUtil {
 
     }
 
-
     /**
      * todo
      *
diff --git 
a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/config/ConfigBuilder.java
 
b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/config/ConfigBuilder.java
index e224a9d..abf3a3e 100644
--- 
a/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/config/ConfigBuilder.java
+++ 
b/seatunnel-core/seatunnel-core-base/src/main/java/org/apache/seatunnel/config/ConfigBuilder.java
@@ -165,7 +165,6 @@ public class ConfigBuilder {
         throw new ClassNotFoundException("Plugin class not found by name :[" + 
canonicalName + "]");
     }
 
-
     /**
      * check if config is valid.
      **/
diff --git a/tools/checkstyle/checkStyle.xml b/tools/checkstyle/checkStyle.xml
index f68f96d..0135a40 100755
--- a/tools/checkstyle/checkStyle.xml
+++ b/tools/checkstyle/checkStyle.xml
@@ -80,6 +80,11 @@
         <property name="max" value="3000"/>
     </module>
 
+    <module name="LineLength">
+        <property name="max" value="500"/>
+        <property name="ignorePattern" value="^package.*|^import.*|a 
href|href|http://|https://|ftp://"/>
+    </module>
+    
     <module name="TreeWalker">
         <module name="ImportOrder">
             <property name="severity" value="error"/>
@@ -91,12 +96,7 @@
             <property name="tokens" value="STATIC_IMPORT, IMPORT"/>
             <message key="import.ordering" value="Import {0} appears after 
other imports that it should precede"/>
         </module>
-
-        <module name="LineLength">
-            <property name="max" value="500"/>
-            <property name="ignorePattern" value="^package.*|^import.*|a 
href|href|http://|https://|ftp://"/>
-        </module>
-
+        
         <!-- Prohibit T.getT() methods for standard boxed types -->
         <module name="Regexp">
             <property name="format" value="Boolean\.getBoolean"/>

Reply via email to