Merge branch 'main' into issue/1327

Author: liran2000

.gitattributes

@@ -3,4 +3,3 @@
 #
 # These are explicitly windows files and should use crlf
 *.bat           text eol=crlf
-

.github/workflows/pullrequest.yml

@@ -29,7 +29,7 @@ jobs:
             cache: maven
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@a8849fbe6341625acb2e18f7f32e53b734d6e1e3
+        uses: github/codeql-action/init@97aac9bb5668e73a3626129e9abc4164b2de3a7a
         with:
           languages: java
 
@@ -55,4 +55,4 @@ jobs:
           verbose: true # optional (default = false)
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@a8849fbe6341625acb2e18f7f32e53b734d6e1e3
+        uses: github/codeql-action/analyze@97aac9bb5668e73a3626129e9abc4164b2de3a7a

.github/workflows/static-code-scanning.yaml

@@ -33,12 +33,12 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@a8849fbe6341625acb2e18f7f32e53b734d6e1e3
+        uses: github/codeql-action/init@97aac9bb5668e73a3626129e9abc4164b2de3a7a
         with:
           languages: java
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@a8849fbe6341625acb2e18f7f32e53b734d6e1e3
+        uses: github/codeql-action/autobuild@97aac9bb5668e73a3626129e9abc4164b2de3a7a
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@a8849fbe6341625acb2e18f7f32e53b734d6e1e3
+        uses: github/codeql-action/analyze@97aac9bb5668e73a3626129e9abc4164b2de3a7a

pom.xml

@@ -69,7 +69,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.16</version>
+            <version>2.0.17</version>
         </dependency>
 
         <!-- test -->
@@ -473,54 +473,7 @@
                     <plugin>
                         <groupId>com.diffplug.spotless</groupId>
                         <artifactId>spotless-maven-plugin</artifactId>
-                        <version>2.30.0</version>
-                        <configuration>
-                            <!-- optional: limit format enforcement to just the files changed by this feature branch -->
-                            <!--                <ratchetFrom>origin/main</ratchetFrom>-->
-                            <formats>
-                                <!-- you can define as many formats as you want, each is independent -->
-                                <format>
-                                    <!-- define the files to apply to -->
-                                    <includes>
-                                        <include>.gitattributes</include>
-                                        <include>.gitignore</include>
-                                    </includes>
-                                    <!-- define the steps to apply to those files -->
-                                    <trimTrailingWhitespace/>
-                                    <endWithNewline/>
-                                    <indent>
-                                        <spaces>true</spaces>
-                                        <spacesPerTab>4</spacesPerTab>
-                                    </indent>
-                                </format>
-                            </formats>
-                            <!-- define a language-specific format -->
-                            <java>
-                                <palantirJavaFormat/>
-
-                                <indent>
-                                    <spaces>true</spaces>
-                                    <spacesPerTab>4</spacesPerTab>
-                                </indent>
-                                <importOrder/>
-
-                                <removeUnusedImports/>
-                                <formatAnnotations/>
-
-                            </java>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.diffplug.spotless</groupId>
-                        <artifactId>spotless-maven-plugin</artifactId>
-                        <version>2.43.0</version>
+                        <version>2.44.3</version>
                         <configuration>
                             <!-- optional: limit format enforcement to just the files changed by this feature branch -->
                             <!--                <ratchetFrom>origin/main</ratchetFrom>-->