Upgrade checkstyle to 10.8.1 for j11 and 8.45.1 for j8

Patch by Maxim Muzafarov; reviewed by brandonwilliams and smiklosovic
for CASSANDRA-18262
This commit is contained in:
Maxim Muzafarov 2023-03-29 13:30:53 +02:00 committed by Brandon Williams
parent 549bf38a07
commit e98258a132
5 changed files with 14 additions and 16 deletions

View File

@ -126,6 +126,12 @@
</dependencies>
<path refid="jflex.classpath" classpath="runtime"/>
</resolve>
<resolve>
<dependencies>
<dependency groupId="com.puppycrawl.tools" artifactId="checkstyle" version="${checkstyle.version}" />
</dependencies>
<path refid="checkstyle.classpath" classpath="runtime"/>
</resolve>
<macrodef name="install">
<attribute name="pomFile"/>

View File

@ -62,10 +62,6 @@
<groupId>com.google.jimfs</groupId>
<artifactId>jimfs</artifactId>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
</dependency>
<dependency>
<groupId>org.quicktheories</groupId>
<artifactId>quicktheories</artifactId>

View File

@ -497,12 +497,6 @@
<version>0.0.13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>8.40</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>

View File

@ -1,4 +1,5 @@
5.0
* Use jdk-dependent checkstyle version to check the source code (CASSANDRA-18262)
* Provide summary of failed SessionInfo's in StreamResultFuture (CASSANDRA-17199)
* CEP-20: Dynamic Data Masking (CASSANDRA-17940)
* Add system_views.snapshots virtual table (CASSANDRA-18102)

View File

@ -311,6 +311,9 @@
<equals arg1="${ant.java.version}" arg2="1.8"/>
</not>
</condition>
<condition property="checkstyle.version" value="8.45.1" else="10.8.1">
<equals arg1="${ant.java.version}" arg2="1.8"/>
</condition>
<!--
Add all the dependencies.
@ -1939,16 +1942,14 @@
</target>
<target name="init-checkstyle" depends="resolver-retrieve-build,build-project" unless="no-checkstyle">
<path id="checkstyle.lib.path">
<fileset dir="${test.lib}/jars" includes="*.jar"/>
</path>
<echo message="checkstyle.version=${checkstyle.version}"/>
<!-- Sevntu custom checks are retrieved by Ivy into lib folder
and will be accessible to checkstyle-->
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
classpathref="checkstyle.lib.path"/>
classpathref="checkstyle.classpath"/>
</target>
<target name="checkstyle" depends="init-checkstyle,build-project" description="Run custom checkstyle code analysis" if="java.version.8" unless="no-checkstyle">
<target name="checkstyle" depends="init-checkstyle,build-project" description="Run custom checkstyle code analysis" unless="no-checkstyle">
<property name="checkstyle.log.dir" value="${build.dir}/checkstyle" />
<property name="checkstyle.report.file" value="${checkstyle.log.dir}/checkstyle_report.xml"/>
<mkdir dir="${checkstyle.log.dir}" />
@ -1964,7 +1965,7 @@
</checkstyle>
</target>
<target name="checkstyle-test" depends="init-checkstyle,resolver-retrieve-build,build-project" description="Run custom checkstyle code analysis on tests" if="java.version.8" unless="no-checkstyle">
<target name="checkstyle-test" depends="init-checkstyle,resolver-retrieve-build,build-project" description="Run custom checkstyle code analysis on tests" unless="no-checkstyle">
<property name="checkstyle.log.dir" value="${build.dir}/checkstyle" />
<property name="checkstyle_test.report.file" value="${checkstyle.log.dir}/checkstyle_report_test.xml"/>
<mkdir dir="${checkstyle.log.dir}" />