From ad0d5d0b8efb9114fb775069f4f5b4ad265fb4bc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 14:37:43 +0000
Subject: [PATCH] slove conflic (#3888)

Signed-off-by: Matthias Wessendorf <mwessend@redhat.com>
Co-authored-by: Matthias Wessendorf <mwessend@redhat.com>
---
 data-plane/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data-plane/pom.xml b/data-plane/pom.xml
index 95bd89ea68..0248c6b4ef 100644
--- a/data-plane/pom.xml
+++ b/data-plane/pom.xml
@@ -31,7 +31,7 @@
     <java.version>21</java.version>
 
     <!-- Maven plugins -->
-    <maven.compiler.plugin.version>3.12.1</maven.compiler.plugin.version>
+    <maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
     <maven.jar.plugin.version>3.4.2</maven.jar.plugin.version>
     <maven.surefire.plugin.version>3.2.5</maven.surefire.plugin.version>
     <maven.shade.plugin.version>3.5.1</maven.shade.plugin.version>