Skip to content

Commit 2dac82d

Browse files
authored
Merge pull request #365 from hazendaz/master
[pom] Rework checkstyle override to use parent override logic
2 parents 95801d0 + 4e4a878 commit 2dac82d

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

pom.xml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,19 @@
3636
<junit.jupiter.version>5.7.2</junit.jupiter.version>
3737
<junit.platform.version>1.7.2</junit.platform.version>
3838
<spring.batch.version>4.3.3</spring.batch.version>
39+
40+
<checkstyle.config>checkstyle-override.xml</checkstyle.config>
41+
3942
<clirr.comparisonVersion>1.2.0</clirr.comparisonVersion>
43+
4044
<module.name>org.mybatis.dynamic.sql</module.name>
45+
4146
<kotlin.version>1.5.0</kotlin.version>
4247
<kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
48+
4349
<sonar.sources>pom.xml,src/main/java,src/main/kotlin</sonar.sources>
4450
<sonar.tests>src/test/java,src/test/kotlin</sonar.tests>
51+
4552
<kotlin.code.style>official</kotlin.code.style>
4653
<test.containers.version>1.15.3</test.containers.version>
4754
<osgi.export>org.mybatis.dynamic.sql.*;version=${project.version};-noimport:=true</osgi.export>
@@ -188,18 +195,6 @@
188195
</plugins>
189196
</build>
190197

191-
<reporting>
192-
<plugins>
193-
<plugin>
194-
<groupId>org.apache.maven.plugins</groupId>
195-
<artifactId>maven-checkstyle-plugin</artifactId>
196-
<configuration>
197-
<configLocation>checkstyle-override.xml</configLocation>
198-
</configuration>
199-
</plugin>
200-
</plugins>
201-
</reporting>
202-
203198
<dependencies>
204199
<dependency>
205200
<groupId>org.jetbrains.kotlin</groupId>

0 commit comments

Comments
 (0)