You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2022/07/14 02:51:35 UTC

[openmeetings] 16/17: [OPENMEETINGS-2732] checkstyle is updated and enabled

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

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

commit 22e38484bb7b8c3d6198284a7433fb7c2a1c76a7
Author: Maxim Solodovnik <so...@gmail.com>
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 3509a304c..7bdd0a15d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1211,17 +1211,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>
@@ -1237,7 +1241,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>
@@ -1668,7 +1672,7 @@
 					</reportSet>
 				</reportSets>
 			</plugin>
-			<!-- plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
 				<version>${maven-checkstyle-plugin.version}</version>
@@ -1683,7 +1687,7 @@
 						</reports>
 					</reportSet>
 				</reportSets>
-			</plugin-->
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>