Skip to content

Commit 51d57eb

Browse files
committed
checktyle: verify package name matches directory structure
1 parent c591c5a commit 51d57eb

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,8 @@
108108
<cs.target.dir>target</cs.target.dir>
109109
<cs.daemon.version>1.1.0</cs.daemon.version>
110110
<cs.jna.version>4.0.0</cs.jna.version>
111-
<cs.checkstyle.version>2.17</cs.checkstyle.version>
111+
<cs.checkstyle.version>3.0.0</cs.checkstyle.version>
112+
<cs.checkstyle-lib.version>8.7</cs.checkstyle-lib.version>
112113
<cs.mycila.license.version>2.11</cs.mycila.license.version>
113114
<cs.findbugs.version>3.0.3</cs.findbugs.version>
114115
<cs.javadoc.version>2.10.3</cs.javadoc.version>
@@ -619,6 +620,11 @@
619620
<artifactId>checkstyle</artifactId>
620621
<version>${project.version}</version>
621622
</dependency>
623+
<dependency>
624+
<groupId>com.puppycrawl.tools</groupId>
625+
<artifactId>checkstyle</artifactId>
626+
<version>${cs.checkstyle-lib.version}</version>
627+
</dependency>
622628
</dependencies>
623629
<executions>
624630
<execution>
@@ -634,7 +640,6 @@
634640
<configLocation>cloud-style.xml</configLocation>
635641
<consoleOutput>true</consoleOutput>
636642
<includeTestSourceDirectory>true</includeTestSourceDirectory>
637-
<sourceDirectory>${project.basedir}</sourceDirectory>
638643
<includes>**\/*.java</includes>
639644
<excludes>**\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/apidoc\/</excludes>
640645
</configuration>

tools/checkstyle/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<plugin>
3232
<groupId>org.apache.maven.plugins</groupId>
3333
<artifactId>maven-checkstyle-plugin</artifactId>
34-
<version>2.13</version>
34+
<version>3.0.0</version>
3535
<executions>
3636
<execution>
3737
<phase>none</phase>

tools/checkstyle/src/main/resources/cloud-style.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<module name="LineLength">
2222
<property name="max" value="1024" />
2323
</module>
24-
2524
<module name="RedundantImport" />
2625
<module name="UnusedImports" />
2726
<module name="MemberName">
@@ -36,12 +35,13 @@
3635
<module name="ConstantName">
3736
<property name="format" value="^[a-zA-Z][a-zA-Z0-9_]*$"/>
3837
</module>
39-
4038
<module name="PackageName" />
39+
<module name="PackageDeclaration"><property name="matchDirectoryStructure" value="true"/></module>
4140
<module name="ParameterName" />
4241
<module name="TypeName" />
4342
<module name="AvoidStarImport" />
4443
</module>
44+
4545
<module name="RegexpSingleline">
4646
<!-- \s matches whitespace character, $ matches end of line. -->
4747
<property name="format" value="\s+$" />

0 commit comments

Comments
 (0)