From 96a5773b1886132422da6bc4c6fd06996fa5334f Mon Sep 17 00:00:00 2001
From: quebim <kevin.ledesma@wazuh.com>
Date: Wed, 16 Oct 2024 14:57:53 -0300
Subject: [PATCH] Update formatter settings

---
 plugins/command-manager/build.gradle             |  6 ------
 plugins/command-manager/gradle/formatting.gradle | 12 ++++++------
 plugins/setup/gradle/formatting.gradle           | 12 ++++++------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/plugins/command-manager/build.gradle b/plugins/command-manager/build.gradle
index 58d2610..2c44b65 100644
--- a/plugins/command-manager/build.gradle
+++ b/plugins/command-manager/build.gradle
@@ -16,12 +16,6 @@ buildscript {
 
     dependencies {
         classpath "org.opensearch.gradle:build-tools:${opensearch_version}"
-        configurations.all {
-            resolutionStrategy {
-                force("org.eclipse.platform:org.eclipse.core.runtime:4.29.0") // CVE for < 4.29
-                force("org.eclipse.platform:org.eclipse.core.resources:4.20.0") // CVE for < 4.20
-            }
-        }
     }
 }
 
diff --git a/plugins/command-manager/gradle/formatting.gradle b/plugins/command-manager/gradle/formatting.gradle
index fd3f607..5b8a0e3 100644
--- a/plugins/command-manager/gradle/formatting.gradle
+++ b/plugins/command-manager/gradle/formatting.gradle
@@ -11,15 +11,15 @@ allprojects {
     project.apply plugin: "com.diffplug.spotless"
     spotless {
         java {
-            target 'src/**/*.java'
+            licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}")
+            googleJavaFormat().aosp()
+            importOrder()
             removeUnusedImports()
-            eclipse().configFile rootProject.file('formatter/formatterConfig.xml')
             trimTrailingWhitespace()
             endWithNewline()
+
+            // add support for spotless:off and spotless:on tags to exclude sections of code
+            toggleOffOn()
         }
-        format("license", {
-            licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package ");
-            target("src/*/java/**/*.java")
-        })
     }
 }
diff --git a/plugins/setup/gradle/formatting.gradle b/plugins/setup/gradle/formatting.gradle
index fd3f607..5b8a0e3 100644
--- a/plugins/setup/gradle/formatting.gradle
+++ b/plugins/setup/gradle/formatting.gradle
@@ -11,15 +11,15 @@ allprojects {
     project.apply plugin: "com.diffplug.spotless"
     spotless {
         java {
-            target 'src/**/*.java'
+            licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}")
+            googleJavaFormat().aosp()
+            importOrder()
             removeUnusedImports()
-            eclipse().configFile rootProject.file('formatter/formatterConfig.xml')
             trimTrailingWhitespace()
             endWithNewline()
+
+            // add support for spotless:off and spotless:on tags to exclude sections of code
+            toggleOffOn()
         }
-        format("license", {
-            licenseHeaderFile("${rootProject.file("formatter/license-header.txt")}", "package ");
-            target("src/*/java/**/*.java")
-        })
     }
 }