From 0a0897466ccc94214466e63a8c33cb60c2141f91 Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Tue, 9 Apr 2024 10:02:53 +0200
Subject: SDC pipeline fails during docker build

- update the integration-java11 base image from 10.0.0 to 12.0.0
- bump version to 1.13.7-SNAPSHOT
- update tox.ini file since GHA would fail otherwise

Issue-ID: SDC-4683
Change-Id: I9b069bcedc851260cdd590c5da94727402d217d2
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
---
 openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml  | 2 +-
 openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml | 2 +-
 openecomp-be/lib/openecomp-conflict-lib/pom.xml                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'openecomp-be/lib/openecomp-conflict-lib')

diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml
index e95661f1d1..c66c18a9bc 100644
--- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml
+++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-api/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>openecomp-conflict-lib</artifactId>
-    <version>1.13.6-SNAPSHOT</version>
+    <version>1.13.7-SNAPSHOT</version>
   </parent>
 
   <artifactId>openecomp-conflict-api</artifactId>
diff --git a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml
index c30bd646fc..8def7698dc 100644
--- a/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml
+++ b/openecomp-be/lib/openecomp-conflict-lib/openecomp-conflict-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.openecomp.sdc</groupId>
     <artifactId>openecomp-conflict-lib</artifactId>
-    <version>1.13.6-SNAPSHOT</version>
+    <version>1.13.7-SNAPSHOT</version>
   </parent>
 
   <properties>
diff --git a/openecomp-be/lib/openecomp-conflict-lib/pom.xml b/openecomp-be/lib/openecomp-conflict-lib/pom.xml
index cd5598ce7d..0b82f30e46 100644
--- a/openecomp-be/lib/openecomp-conflict-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-conflict-lib/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.openecomp.sdc</groupId>
         <artifactId>openecomp-sdc-lib</artifactId>
-        <version>1.13.6-SNAPSHOT</version>
+        <version>1.13.7-SNAPSHOT</version>
     </parent>
 
     <artifactId>openecomp-conflict-lib</artifactId>
-- 
cgit 1.2.3-korg