From 5b0207b74ec82112ea02b076b4bd806f2ce206e4 Mon Sep 17 00:00:00 2001
From: "Donald F. Coffin" <dcoffin@greenbuttonalliance.org>
Date: Wed, 24 Dec 2025 00:10:12 -0500
Subject: [PATCH 1/3]   refactor: remove redundant TestContainers BOM from
 openespi-common
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Spring Boot 3.5 dependency management already includes TestContainers BOM,
  making the explicit version declaration redundant.

  Verified with MySQL and PostgreSQL integration tests - all 21 tests pass.

  🤖 Generated with [Claude Code](https://claude.com/claude-code)

  Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 openespi-common/pom.xml | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/openespi-common/pom.xml b/openespi-common/pom.xml
index 06948dcf..3ff6d16b 100644
--- a/openespi-common/pom.xml
+++ b/openespi-common/pom.xml
@@ -82,7 +82,6 @@
         <!-- Modern Dependencies for Spring Boot 3.5.0 -->
         <lombok.version>1.18.34</lombok.version>
         <mapstruct.version>1.6.0</mapstruct.version>
-        <testcontainers.version>1.20.1</testcontainers.version>
 
         <!-- Legacy support for compatibility -->
         <commons-lang.version>2.6</commons-lang.version>
@@ -296,20 +295,6 @@
         </repository>
     </repositories>
 
-    <!-- Dependency Management for version consistency -->
-    <dependencyManagement>
-        <dependencies>
-            <!-- Testcontainers BOM for version management -->
-            <dependency>
-                <groupId>org.testcontainers</groupId>
-                <artifactId>testcontainers-bom</artifactId>
-                <version>${testcontainers.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <!-- Spring Boot Starters for Common Library -->
         <dependency>

From af95ce2701341d03c127df56f0fb1fb76169b03d Mon Sep 17 00:00:00 2001
From: "Donald F. Coffin" <dcoffin@greenbuttonalliance.org>
Date: Wed, 24 Dec 2025 01:20:06 -0500
Subject: [PATCH 2/3]   fix: add SonarCloud Maven plugin to active plugins
 section
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  The sonar-maven-plugin was only defined in <pluginManagement> but not
  in the active <plugins> section, causing CI/CD failures when running
  mvn sonar:sonar.

  Maven requires plugins to be in the active <plugins> section to be
  executable via the prefix:goal syntax.

  Fixes SonarCloud Analysis and SonarCloud PR Analysis CI/CD failures.

  🤖 Generated with [Claude Code](https://claude.com/claude-code)

  Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index b49e229c..86f19f5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,6 +142,12 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- SonarCloud Maven Plugin -->
+            <plugin>
+                <groupId>org.sonarsource.scanner.maven</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file

From 74a2c92b596b14f8dda08aeb6d17fa682e81894a Mon Sep 17 00:00:00 2001
From: "Donald F. Coffin" <dcoffin@greenbuttonalliance.org>
Date: Wed, 24 Dec 2025 13:37:59 -0500
Subject: [PATCH 3/3]  fix: use full Maven coordinates for SonarCloud plugin
 invocation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  Maven's plugin prefix resolver doesn't recognize 'sonar' prefix by default.
  Changed from 'mvn sonar:sonar' to 'mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar'
  in both CI/CD and PR checks workflows.

  This ensures the plugin can be resolved without requiring additional Maven
  settings.xml configuration for plugin groups.

  Fixes "No plugin found for prefix 'sonar'" CI/CD error.

  🤖 Generated with [Claude Code](https://claude.com/claude-code)

  Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
---
 .github/workflows/ci.yml        | 2 +-
 .github/workflows/pr-checks.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5dc6a0e3..cc5d069d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -159,7 +159,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn sonar:sonar \
+          mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
             -Dsonar.projectKey=GreenButtonAlliance_OpenESPI-GreenButton-Java \
             -Dsonar.organization=greenbuttonalliance \
             -Dsonar.host.url=https://sonarcloud.io \
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index f8afd234..61810825 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -88,7 +88,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         run: |
-          mvn sonar:sonar \
+          mvn org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
             -Dsonar.projectKey=GreenButtonAlliance_OpenESPI-GreenButton-Java \
             -Dsonar.organization=greenbuttonalliance \
             -Dsonar.host.url=https://sonarcloud.io \