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

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new b1204d0c8 [OPENMEETINGS-2732] checkstyle is updated and enabled
b1204d0c8 is described below

commit b1204d0c8cd0e58e14cf627eef02ddaefe076225
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Jul 12 08:37:26 2022 +0700

    [OPENMEETINGS-2732] checkstyle is updated and enabled
---
 pom.xml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index bdfb9a083..45c44b780 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1201,17 +1201,21 @@
                                                                <module 
name="NewlineAtEndOfFile">
                                                                        
<property name="fileExtensions" value="java"/>
                                                                </module>
+                                                               <module 
name="SuppressWithPlainTextCommentFilter">
+                                                                       
<property name="offCommentFormat" 
value="[=+](\s+)&amp;quot;&amp;quot;&amp;quot;"/>
+                                                                       
<property name="onCommentFormat" value="^\s+.*&amp;quot;&amp;quot;&amp;quot;;"/>
+                                                               </module>
                                                                <module 
name="TreeWalker">
                                                                        <module 
name="UnusedImports"></module>
-                                                                       <!-- 
FIXME TODO commented out due to it is unclear what to do with text blocks :(((
-                                                                               
https://github.com/checkstyle/checkstyle/issues/1405#issuecomment-1129608815 -->
-                                                                       
<!--module name="RegexpSinglelineJava">
+                                                                       <module 
name="RegexpSinglelineJava">
+                                                                               
<property name="id" value="tabs-only"/>
                                                                                
<property name="format" value="^\t* "/>
                                                                                
<property name="message" value="Indent must use tab characters"/>
                                                                                
<property name="ignoreComments" value="true"/>
-                                                                       
</module-->
+                                                                       
</module>
                                                                </module>
                                                                <module 
name="RegexpSingleline">
+                                                                       
<property name="id" value="trailing-spaces"/>
                                                                        
<property name="format" value="\s+$"/>
                                                                        
<property name="message" value="Line has trailing spaces."/>
                                                                </module>
@@ -1227,7 +1231,7 @@
                                                <dependency>
                                                        
<groupId>com.puppycrawl.tools</groupId>
                                                        
<artifactId>checkstyle</artifactId>
-                                                       <version>10.2</version> 
<!-- FIXME TODO: should be removed after checkstyle plugin will be updated -->
+                                                       
<version>10.3.1</version> <!-- FIXME TODO: should be removed after checkstyle 
plugin will be updated -->
                                                </dependency>
                                        </dependencies>
                                </plugin>
@@ -1658,7 +1662,7 @@
                                        </reportSet>
                                </reportSets>
                        </plugin>
-                       <!-- plugin>
+                       <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-checkstyle-plugin</artifactId>
                                
<version>${maven-checkstyle-plugin.version}</version>
@@ -1673,7 +1677,7 @@
                                                </reports>
                                        </reportSet>
                                </reportSets>
-                       </plugin-->
+                       </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                
<artifactId>maven-surefire-report-plugin</artifactId>

Reply via email to