From 0a991a7ec5b92cf6f0bbac1ee6fd6380c7d128a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 20:35:38 +0000
Subject: [PATCH 1/2] Bump com.diffplug.spotless:spotless-maven-plugin from
 2.41.0 to 2.41.1

Bumps [com.diffplug.spotless:spotless-maven-plugin](https://github.com/diffplug/spotless) from 2.41.0 to 2.41.1.
- [Changelog](https://github.com/diffplug/spotless/blob/main/CHANGES.md)
- [Commits](https://github.com/diffplug/spotless/compare/lib/2.41.0...maven/2.41.1)

---
updated-dependencies:
- dependency-name: com.diffplug.spotless:spotless-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4f1c1d82a..2e65e81e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -341,7 +341,7 @@ limitations under the License.
     <plexusDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/plexus-snapshots</plexusDistMgmtSnapshotsUrl>
     <project.build.outputTimestamp>2023-10-03T11:25:00Z</project.build.outputTimestamp>
     <gpg.useagent>true</gpg.useagent>
-    <spotless-maven-plugin.version>2.41.0</spotless-maven-plugin.version>
+    <spotless-maven-plugin.version>2.41.1</spotless-maven-plugin.version>
     <mavenPluginToolsVersion>3.10.2</mavenPluginToolsVersion>
     <mavenFluidoSkinVersion>1.11.2</mavenFluidoSkinVersion>
     <mavenSurefireVersion>3.2.2</mavenSurefireVersion>

From 10719b4ac1276e136bb41fde178cdb54a8873443 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sat, 9 Dec 2023 12:38:29 +0100
Subject: [PATCH 2/2] Use palantirJavaFormat version from plugin

---
 pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2e65e81e9..0d0bba37d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -572,10 +572,7 @@ limitations under the License.
             <java>
               <!-- orders of used formatters are important -->
               <!-- eg. palantir override importOrder, so should be first -->
-              <palantirJavaFormat>
-                <!-- TODO revert it with spotless plugin update with fix for https://github.com/diffplug/spotless/issues/1774 -->
-                <version>2.38.0</version>
-              </palantirJavaFormat>
+              <palantirJavaFormat />
               <removeUnusedImports />
               <importOrder>
                 <order>javax,java,,\#</order>