Merge the update_kn_client with the master

xtf-cz · May 9, 2023 · 73d9f1d · 73d9f1d
1 parent ed31b46
commit 73d9f1d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/builder/pom.xml b/builder/pom.xml
@@ -5,15 +5,7 @@
 	<parent>
 		<artifactId>xtf-parent</artifactId>
 		<groupId>cz.xtf</groupId>
-<<<<<<< HEAD
-<<<<<<< HEAD
 		<version>0.30-SNAPSHOT</version>
-=======
-		<version>0.29-kubernetes-client-upgrade-SNAPSHOT</version>
->>>>>>> 49ecc69 (fixes after testing with TS)
-=======
-		<version>0.29-SNAPSHOT</version>
->>>>>>> 2fd8721 (revert version name)
 	</parent>
 
 	<artifactId>builder</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>cz.xtf</groupId>
     <artifactId>xtf-parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.29-kubernetes-client-upgrade-SNAPSHOT</version>
+    <version>0.30-SNAPSHOT</version>
     <name>XTF</name>
     <description>XTF is a framework designed to ease up aspects of testing in OpenShift environment.</description>
     <url>https://github.com/xtf-cz/xtf/</url>

diff --git a/test-helpers/pom.xml b/test-helpers/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>xtf-parent</artifactId>
 		<groupId>cz.xtf</groupId>
-		<version>0.29-SNAPSHOT</version>
+		<version>0.30-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>test-helpers</artifactId>