From ef938d630d96c623808ff821677a63d2d26858cc Mon Sep 17 00:00:00 2001
From: Ljupcho Palashevski <lpalashevski@gmail.com>
Date: Thu, 18 May 2023 12:01:54 +0200
Subject: [PATCH] port merge action fix + new dev snapshot

Signed-off-by: Ljupcho Palashevski <lpalashevski@gmail.com>
---
 .github/workflows/merge.yml | 4 ++--
 build.gradle                | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 075a5a9..615252c 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -70,7 +70,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: odpi/egeria-connector-jdbc::${{ env.CONNECTOR_VERSION }}, odpi/egeria-connector-jdbc::latest, quay.io/odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-jdbc:latest
+          tags: odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}, odpi/egeria-connector-jdbc:latest, quay.io/odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-jdbc:latest
           platforms: linux/amd64,linux/arm64
           build-args: |
             EGERIA_BASE_IMAGE=${{ env.EGERIA_BASE_IMAGE }}
@@ -82,7 +82,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: odpi/egeria-connector-jdbc::${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}
+          tags: odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}, quay.io/odpi/egeria-connector-jdbc:${{ env.CONNECTOR_VERSION }}
           platforms: linux/amd64,linux/arm64
           build-args: |
             EGERIA_BASE_IMAGE=${{ env.EGERIA_BASE_IMAGE }}
diff --git a/build.gradle b/build.gradle
index e3a67e6..7dd1190 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ plugins {
 allprojects {
 
     group = 'org.odpi.egeria'
-    version = '1.1-SNAPSHOT'
+    version = '1.2-SNAPSHOT'
 
     // Mostly java, so default to this for now
     apply plugin: 'java'
@@ -58,7 +58,7 @@ allprojects {
     // Assign variables for any constraints
     ext {
         // add version variables here
-        egeriaversion='4.0-SNAPSHOT'
+        egeriaversion='4.1-SNAPSHOT'
     }
 
     dependencies {