Bump extensions to 0.36.0 and fix set-version script

galasa-extensions-parent/buildSrc/src/main/groovy/galasa.extensions.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    implementation 'dev.galasa:dev.galasa.framework:0.35.0'
+    implementation 'dev.galasa:dev.galasa.framework:0.36.0'
     implementation 'dev.galasa:dev.galasa:0.34.0'
 
     implementation 'commons-logging:commons-logging:1.2'

galasa-extensions-parent/dev.galasa.auth.couchdb/build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 description = 'Galasa Authentication - CouchDB'
 
-version = '0.35.0'
+version = '0.36.0'
 
 configurations {
     implementation.transitive = false

galasa-extensions-parent/dev.galasa.cps.etcd/build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 description = 'Galasa etcd3 for CPS, DSS and Credentials - Provides the CPS, DSS and Credential stores from a etcd3 server'
 
-version = '0.35.0'
+version = '0.36.0'
 
 dependencies {
     implementation ('io.etcd:jetcd-core:0.5.9')

galasa-extensions-parent/dev.galasa.cps.rest/build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 description = 'Galasa CPS access over http - Provides the CPS stores via the public REST interface over http'
 
-version = '0.35.0'
+version = '0.36.0'
 
 dependencies {
 

galasa-extensions-parent/dev.galasa.events.kafka/build.gradle

@@ -6,11 +6,11 @@ plugins {
 
 description = 'Galasa Events Plug-In - Kafka'
 
-version = '0.35.0'
+version = '0.36.0'
 
 dependencies {
     implementation 'dev.galasa:kafka.clients:3.7.0'
-    implementation 'dev.galasa:dev.galasa.framework:0.35.0'
+    implementation 'dev.galasa:dev.galasa.framework:0.36.0'
 
     testImplementation(project(':dev.galasa.extensions.mocks'))
 }

galasa-extensions-parent/dev.galasa.extensions.common/build.gradle

@@ -5,7 +5,7 @@ plugins {
 
 description = 'Galasa CPS access over http - Provides the CPS stores via the public REST interface over http'
 
-version = '0.35.0'
+version = '0.36.0'
 
 dependencies {
     implementation ('org.apache.httpcomponents:httpclient-osgi:4.5.13')

galasa-extensions-parent/dev.galasa.extensions.mocks/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 description = 'Galasa extensions mocks used for tests'
 
-version = '0.35.0'
+version = '0.36.0'
 
 configurations {
     implementation.transitive = false
@@ -14,7 +14,7 @@ dependencies {
     implementation ('org.apache.httpcomponents:httpclient-osgi:4.5.13')
     implementation ('org.apache.httpcomponents:httpcore-osgi:4.4.14')
     implementation ('com.google.code.gson:gson:2.10.1')
-    implementation ('dev.galasa:dev.galasa.framework:0.35.0')
+    implementation ('dev.galasa:dev.galasa.framework:0.36.0')
     implementation ('junit:junit:4.13.1')
     implementation ('org.assertj:assertj-core:3.16.1')
     implementation (project(':dev.galasa.extensions.common'))

galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle

@@ -6,7 +6,7 @@ plugins {
 
 description = 'Galasa RAS - CouchDB'
 
-version = '0.35.0'
+version = '0.36.0'
 
 configurations {
     implementation.transitive = false

release.yaml

@@ -14,37 +14,37 @@ framework:
   bundles:
 
   - artifact: dev.galasa.auth.couchdb
-    version: 0.35.0
+    version: 0.36.0
     obr: true
     isolated: true
     codecoverage: true
 
   - artifact: dev.galasa.ras.couchdb
-    version: 0.35.0
+    version: 0.36.0
     obr: true
     isolated: true
     codecoverage: true
 
   - artifact: dev.galasa.cps.etcd
-    version: 0.35.0
+    version: 0.36.0
     obr: true
     isolated: true
     codecoverage: true
 
   - artifact: dev.galasa.cps.rest
-    version: 0.35.0
+    version: 0.36.0
     obr: true
     isolated: true
     codecoverage: true
 
   - artifact: dev.galasa.extensions.common
-    version: 0.35.0
+    version: 0.36.0
     obr: true
     isolated: true
     codecoverage: true
 
   - artifact: dev.galasa.events.kafka
-    version: 0.35.0
+    version: 0.36.0
     obr: true
     isolated: true
     codecoverage: true

set-version.sh

@@ -99,26 +99,42 @@ fi
 temp_dir=$BASEDIR/temp/version_bump
 mkdir -p $temp_dir
 
+function bump_version {
+    source_file=$1
+    temp_file=$2
+
+    cat $source_file | sed "s/dev.galasa.framework:.*'/dev.galasa.framework:$component_version'/1" > $temp_file
+    cp $temp_file $source_file
+
+    cat $source_file | sed "s/version = '.*'/version = '$component_version'/1" > $temp_file
+    cp $temp_file $source_file
+}
+
 
 # Extensions base
-cat $BASEDIR/galasa-extensions-parent/buildSrc/src/main/groovy/galasa.extensions.gradle | sed "s/dev.galasa.framework:.*'/dev.galasa.framework: $component_version'/1" > $temp_dir/galasa.extensions.gradl
-cp $temp_dir/galasa.extensions.gradl $BASEDIR/galasa-extensions-parent/buildSrc/src/main/groovy/galasa.extensions.gradle
+bump_version $BASEDIR/galasa-extensions-parent/buildSrc/src/main/groovy/galasa.extensions.gradle $temp_dir/galasa.extensions.gradle
 
 # Couchdb...
-cat $BASEDIR/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle | sed "s/dev.galasa.framework:.*'/dev.galasa.framework: $component_version'/1" > $temp_dir/couchdb-build.gradle
-cp $temp_dir/couchdb-build.gradle $BASEDIR/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle
+bump_version $BASEDIR/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle $temp_dir/couchdb-build.gradle
+
+# etcd...
+bump_version $BASEDIR/galasa-extensions-parent/dev.galasa.cps.etcd/build.gradle $temp_dir/etcd-build.gradle
+
+# REST CPS...
+bump_version $BASEDIR/galasa-extensions-parent/dev.galasa.cps.rest/build.gradle $temp_dir/restcps-build.gradle
 
-cat $BASEDIR/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle | sed "s/version = '.*'/version = '$component_version'/1" > $temp_dir/couchdb-build.gradle
-cp $temp_dir/couchdb-build.gradle $BASEDIR/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle
+# CouchDB Auth Store...
+bump_version $BASEDIR/galasa-extensions-parent/dev.galasa.auth.couchdb/build.gradle $temp_dir/couchdbauth-build.gradle
 
+# Kafka...
+bump_version $BASEDIR/galasa-extensions-parent/dev.galasa.events.kafka/build.gradle $temp_dir/kafka-build.gradle
 
-# etcd ... so far I don't think we need to bump up the version of this.
-# cat $BASEDIR/galasa-extensions-parent/dev.galasa.cps.etcd/build.gradle | sed "s/dev.galasa.framework:.*'/dev.galasa.framework: $component_version'/1" > $temp_dir/etcd-build.gradle
-# cp $temp_dir/etcd-build.gradle $BASEDIR/galasa-extensions-parent/dev.galasa.cps.etcd/build.gradle 
+# Common...
+bump_version $BASEDIR/galasa-extensions-parent/dev.galasa.extensions.common/build.gradle $temp_dir/common-build.gradle
 
-# cat $BASEDIR/galasa-extensions-parent/dev.galasa.cps.etcd/build.gradle | sed "s/version = '.*'/version = '$component_version'/1" > $temp_dir/etcd-build.gradle
-# cp $temp_dir/etcd-build.gradle $BASEDIR/galasa-extensions-parent/dev.galasa.cps.etcd/build.gradle 
+# Mocks...
+bump_version $BASEDIR/galasa-extensions-parent/dev.galasa.extensions.mocks/build.gradle $temp_dir/mocks-build.gradle
 
 # The framework version is the first one in the file.
 cat $BASEDIR/release.yaml | sed "s/version:.*/version: $component_version/1" > $temp_dir/release.yaml
-cp $temp_dir/release.yaml $BASEDIR/release.yaml 
+cp $temp_dir/release.yaml $BASEDIR/release.yaml