Skip to content

Commit 760a592

Browse files
ahornaceVladimir Kotal
authored andcommitted
Fix checkstyle for suggester module
1 parent a734884 commit 760a592

File tree

3 files changed

+34
-27
lines changed

3 files changed

+34
-27
lines changed

checkstyle/style.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<module name="Checker">
66
<module name="NewlineAtEndOfFile"/>
77
<module name="Header">
8-
<property name="headerFile" value="checkstyle/fileheader.txt"/>
8+
<property name="headerFile" value="${checkstyle.header.file}"/>
99
</module>
1010
<module name="FileLength"/>
1111
<module name="FileTabCharacter"/>
@@ -31,7 +31,4 @@
3131
<property name="onCommentFormat" value="&lt;/editor-fold&gt;"/>
3232
</module>
3333
</module>
34-
<module name="SuppressionFilter">
35-
<property name="file" value="checkstyle/suppressions.xml" />
36-
</module>
3734
</module>

pom.xml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,39 @@ Portions Copyright (c) 2018, Chris Fraire <[email protected]>.
225225
<version>2.9</version>
226226
</plugin>
227227
</plugins>
228+
<pluginManagement>
229+
<plugins>
230+
<plugin>
231+
<groupId>org.apache.maven.plugins</groupId>
232+
<artifactId>maven-checkstyle-plugin</artifactId>
233+
<version>3.0.0</version>
234+
<dependencies>
235+
<dependency>
236+
<groupId>com.puppycrawl.tools</groupId>
237+
<artifactId>checkstyle</artifactId>
238+
<version>8.11</version>
239+
</dependency>
240+
</dependencies>
241+
<executions>
242+
<execution>
243+
<id>checkstyle</id>
244+
<phase>validate</phase>
245+
<configuration>
246+
<configLocation>/checkstyle/style.xml</configLocation>
247+
<encoding>UTF-8</encoding>
248+
<consoleOutput>true</consoleOutput>
249+
<failsOnError>true</failsOnError>
250+
<suppressionsLocation>/checkstyle/suppressions.xml</suppressionsLocation>
251+
<headerLocation>/checkstyle/fileheader.txt</headerLocation>
252+
</configuration>
253+
<goals>
254+
<goal>check</goal>
255+
</goals>
256+
</execution>
257+
</executions>
258+
</plugin>
259+
</plugins>
260+
</pluginManagement>
228261
</build>
229262

230263
<reporting>

suggester/pom.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -92,29 +92,6 @@
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-checkstyle-plugin</artifactId>
95-
<version>3.0.0</version>
96-
<dependencies>
97-
<dependency>
98-
<groupId>com.puppycrawl.tools</groupId>
99-
<artifactId>checkstyle</artifactId>
100-
<version>8.11</version>
101-
</dependency>
102-
</dependencies>
103-
<executions>
104-
<execution>
105-
<id>checkstyle</id>
106-
<phase>validate</phase>
107-
<configuration>
108-
<configLocation>../checkstyle/style.xml</configLocation>
109-
<encoding>UTF-8</encoding>
110-
<consoleOutput>true</consoleOutput>
111-
<failsOnError>true</failsOnError>
112-
</configuration>
113-
<goals>
114-
<goal>check</goal>
115-
</goals>
116-
</execution>
117-
</executions>
11895
</plugin>
11996

12097
<plugin>

0 commit comments

Comments
 (0)