Merge remote-tracking branch 'origin/master' into dependencies

Author: ljacqu

.checkstyle.xml

@@ -4,15 +4,17 @@
         "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <!--
  In order to be compatible with CodeClimate, we have to stay in sync with the version of Checkstyle that they are using.
- This is currently: 8.39. Check the links below to get up-to-date version information.
+ It doesn't seem to be updated much by default, but we can specify a channel, which is currently using 10.7.0.
+ Check the links below to get up-to-date version information.
+ https://github.com/codeclimate/codeclimate-checkstyle/branches/all (channel/ branches)
  https://docs.codeclimate.com/docs/checkstyle
  https://github.com/codeclimate/codeclimate-checkstyle/blob/master/bin/install-checkstyle.sh
 -->
 
 <module name="Checker">
     <property name="charset" value="UTF-8" />
     <property name="severity" value="warning" />
-    <property name="fileExtensions" value="java, properties, xml" />
+    <property name="fileExtensions" value="java" />
 
     <module name="SuppressWarningsFilter" />
 
@@ -113,7 +115,7 @@
         <module name="UnnecessarySemicolonAfterTypeMemberDeclaration" />
         <module name="UnnecessarySemicolonInEnumeration" />
         <module name="UnnecessarySemicolonInTryWithResources" />
-        <!-- Checkstyle 9.3: <module name="UnusedLocalVariable" /> -->
+        <module name="UnusedLocalVariable" />
         <module name="VariableDeclarationUsageDistance" />
 
         <!-- Headers -->
@@ -132,7 +134,7 @@
         <module name="JavadocBlockTagLocation" />
         <module name="JavadocContentLocation" />
         <module name="JavadocMethod">
-            <property name="scope" value="package" />
+            <property name="accessModifiers" value="package" />
             <property name="tokens" value="METHOD_DEF, ANNOTATION_FIELD_DEF" />
         </module>
         <module name="JavadocMissingLeadingAsterisk" />
@@ -232,7 +234,7 @@
             <!-- Override to exclude ELLIPSIS and to add METHOD_REF -->
             <property name="tokens" value="COMMA, SEMI, POST_INC, POST_DEC, LABELED_STAT, METHOD_REF" />
         </module>
-        <!-- Checkstyle 8.45: <module name="NoWhitespaceBeforeCaseDefaultColon" /> -->
+        <module name="NoWhitespaceBeforeCaseDefaultColon" />
         <module name="OperatorWrap" />
         <module name="ParenPad" />
         <module name="SeparatorWrap">

.codeclimate.yml

@@ -3,6 +3,7 @@ version: '2' # required to adjust maintainability checks
 plugins:
   checkstyle:
     enabled: true
+    channel: 'checkstyle-10-7-0'
     config:
       file: '.checkstyle.xml'
   sonar-java:

.github/dependabot.yml

@@ -6,6 +6,9 @@ updates:
     interval: daily
   open-pull-requests-limit: 10
   target-branch: dependencies
+  ignore:
+    - dependency-name: "org.junit.jupiter:junit-jupiter"
+      versions: ">= 6"
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:

.github/workflows/maven_build.yml

@@ -11,9 +11,9 @@ jobs:
     name: Java ${{ matrix.java }} build
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: 'adopt'

.gitignore

@@ -1,5 +1,6 @@
-.idea/
+.idea/*
 !.idea/vcs.xml
+!.idea/checkstyle-idea.xml
 *.iml
 *.class
 target/

.idea/checkstyle-idea.xml

@@ -4,7 +4,7 @@
 
     <groupId>ch.jalu</groupId>
     <artifactId>typeresolver</artifactId>
-    <version>0.2.0-SNAPSHOT</version>
+    <version>0.3.0-SNAPSHOT</version>
 
     <name>JavaTypeResolver</name>
     <description>Utility for resolving generic types and for reflective operations on types</description>