Skip to content

Commit 15574c2

Browse files
CalixteCalixte
committed
Issue #920: update to Checkstyle 13.0.0
1 parent 32c5c68 commit 15574c2

19 files changed

Lines changed: 206 additions & 110 deletions

File tree

‎.github/workflows/maven.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
matrix:
1111
platform: [ubuntu-latest, macos-latest, windows-latest]
12-
jdk: [17, 21]
12+
jdk: [21, 25]
1313
runs-on: ${{ matrix.platform }}
1414
permissions:
1515
checks: write
@@ -29,10 +29,8 @@ jobs:
2929
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
3030
with:
3131
distribution: temurin
32-
# have Java 17 for Tycho last, as it will be in JAVA_HOME that way
3332
java-version: |
3433
${{ matrix.jdk }}
35-
17
3634
3735
- name: Build with Maven
3836
run: ./mvnw --errors --no-transfer-progress install
@@ -43,6 +41,6 @@ jobs:
4341
- name: Publish Test Results
4442
uses: EnricoMi/publish-unit-test-result-action@c950f6fb443cb5af20a377fd0dfaa78838901040 # v2.23.0
4543
# we only want to attach test results one time, not for every matrix combination
46-
if: startsWith(matrix.platform, 'ubuntu') && (matrix.jdk == 17)
44+
if: startsWith(matrix.platform, 'ubuntu') && (matrix.jdk == 21)
4745
with:
4846
files: '**/target/surefire-reports/*.xml'

‎net.sf.eclipsecs.checkstyle/.classpath‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry exported="true" kind="lib" path="checkstyle-12.3.1-all.jar" sourcepath="checkstyle-checkstyle-12.3.1.zip"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
3+
<classpathentry exported="true" kind="lib" path="checkstyle-13.0.0-all.jar" sourcepath="checkstyle-checkstyle-13.0.0.zip"/>
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
55
<attributes>
6+
<attribute name="module" value="true"/>
67
<attribute name="maven.pomderived" value="true"/>
78
</attributes>
89
</classpathentry>

‎net.sf.eclipsecs.checkstyle/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin
2424
org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
2525
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
2626
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
27-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
27+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
2828
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
29-
org.eclipse.jdt.core.compiler.compliance=17
29+
org.eclipse.jdt.core.compiler.compliance=21
3030
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
3131
org.eclipse.jdt.core.compiler.debug.localVariable=generate
3232
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -131,7 +131,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
131131
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
132132
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
133133
org.eclipse.jdt.core.compiler.release=enabled
134-
org.eclipse.jdt.core.compiler.source=17
134+
org.eclipse.jdt.core.compiler.source=21
135135
org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
136136
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
137137
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647

‎net.sf.eclipsecs.checkstyle/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bundle-SymbolicName: net.sf.eclipsecs.checkstyle
55
Bundle-Version: 12.3.1.qualifier
66
Bundle-Vendor: %Bundle-Vendor
77
Bundle-ActivationPolicy: lazy
8-
Bundle-RequiredExecutionEnvironment: JavaSE-17
8+
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Export-Package: .,
1010
com.google.common.base,
1111
com.google.common.cache,
@@ -40,5 +40,5 @@ Export-Package: .,
4040
org.codehaus.plexus.util
4141
Require-Bundle: org.eclipse.core.runtime
4242
Bundle-ClassPath: .,
43-
checkstyle-12.3.1-all.jar
43+
checkstyle-13.0.0-all.jar
4444
Automatic-Module-Name: net.sf.eclipsecs.checkstyle

‎net.sf.eclipsecs.checkstyle/build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
bin.includes = META-INF/,\
22
.,\
33
license/,\
4-
checkstyle-12.3.1-all.jar,\
4+
checkstyle-13.0.0-all.jar,\
55
OSGI-INF/
66
jars.compile.order = .
77
source.. = metadata/

net.sf.eclipsecs.checkstyle/checkstyle-12.3.1-all.jar renamed to net.sf.eclipsecs.checkstyle/checkstyle-13.0.0-all.jar

16.7 MB
Binary file not shown.

‎net.sf.eclipsecs.checkstyle/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<name>Checkstyle Core Library Plugin</name>
1212

1313
<properties>
14-
<checkstyle.version>12.3.1</checkstyle.version>
14+
<checkstyle.version>13.0.0</checkstyle.version>
1515
</properties>
1616
<build>
1717
<plugins>

‎net.sf.eclipsecs.core/.classpath‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21">
44
<attributes>
55
<attribute name="module" value="true"/>
66
</attributes>

‎net.sf.eclipsecs.core/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ org.eclipse.jdt.core.compiler.annotation.owning=org.eclipse.jdt.annotation.Ownin
2424
org.eclipse.jdt.core.compiler.annotation.resourceanalysis=disabled
2525
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
2626
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
27-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
27+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
2828
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
29-
org.eclipse.jdt.core.compiler.compliance=17
29+
org.eclipse.jdt.core.compiler.compliance=21
3030
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
3131
org.eclipse.jdt.core.compiler.debug.localVariable=generate
3232
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -130,8 +130,8 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
130130
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=error
131131
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=error
132132
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
133-
org.eclipse.jdt.core.compiler.release=disabled
134-
org.eclipse.jdt.core.compiler.source=17
133+
org.eclipse.jdt.core.compiler.release=enabled
134+
org.eclipse.jdt.core.compiler.source=21
135135
org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false
136136
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
137137
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
@@ -155,7 +155,6 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
155155
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
156156
org.eclipse.jdt.core.formatter.alignment_for_assertion_message=0
157157
org.eclipse.jdt.core.formatter.alignment_for_assignment=0
158-
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
159158
org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16
160159
org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
161160
org.eclipse.jdt.core.formatter.alignment_for_compact_loops=16
@@ -292,7 +291,6 @@ org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default=insert
292291
org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
293292
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
294293
org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
295-
org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
296294
org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert
297295
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
298296
org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
@@ -367,7 +365,6 @@ org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case=insert
367365
org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default=insert
368366
org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
369367
org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
370-
org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
371368
org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert
372369
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
373370
org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
@@ -531,7 +528,6 @@ org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
531528
org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true
532529
org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator=true
533530
org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
534-
org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
535531
org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true
536532
org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
537533
org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true

‎net.sf.eclipsecs.core/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-Name: %Bundle-Name
33
Bundle-ManifestVersion: 2
44
Bundle-SymbolicName: net.sf.eclipsecs.core;singleton:=true
55
Bundle-Version: 12.3.1.qualifier
6-
Bundle-RequiredExecutionEnvironment: JavaSE-17
6+
Bundle-RequiredExecutionEnvironment: JavaSE-21
77
Bundle-ClassPath: .
88
Bundle-Activator: net.sf.eclipsecs.core.CheckstylePlugin
99
Bundle-ActivationPolicy: lazy

0 commit comments

Comments
 (0)