Merge branch 'main' of github.com:galasa-dev/extensions into iss1958

galasa-extensions-parent/build.gradle

@@ -2,16 +2,10 @@ plugins {
     id 'biz.aQute.bnd.builder' version '5.3.0' apply false
     id 'dev.galasa.githash' version '0.15.0' apply false
     id 'maven-publish'
+    id 'signing'
 }
 
-version = '0.36.0'
-
-task clean {
-    // make sure the build directory is gone
-    doFirst {
-        delete layout.buildDirectory
-    }
-}
+version = '0.37.0'
 
 //---------------------------------------------------------------
 // We need to gather the release and packaging metadata from each
@@ -148,6 +142,18 @@ subprojects {
     task allDeps(type: DependencyReportTask) {}
 }
 
+signing {
+    def signingKeyId = findProperty("signingKeyId")
+    def signingKey = findProperty("signingKey")
+    def signingPassword = findProperty("signingPassword")
+    useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+    sign publishing.publications
+}
+
+tasks.withType(Sign) {
+    onlyIf { isMainOrRelease.toBoolean() }
+}
+
 // Publish the release.yaml as a maven artifact.
 // Note: The maven co-ordinates are versioned using the version for this bundle.
 publishing {
@@ -161,7 +167,7 @@ publishing {
                 name = "Manifest for extensions bundle versions"
                 artifactId = "dev.galasa.extensions.manifest"
                 groupId = 'dev.galasa'
-				version = "0.36.0"
+				version = '0.37.0'
                 description = "Conveys bundle version information to OBR builds."
                 licenses {
                     license {

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

@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    implementation 'dev.galasa:dev.galasa.framework:0.36.0'
+    implementation 'dev.galasa:dev.galasa.framework:0.37.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.36.0'
+version = '0.37.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.36.0'
+version = '0.37.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.36.0'
+version = '0.37.0'
 
 dependencies {
 

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

@@ -6,11 +6,10 @@ plugins {
 
 description = 'Galasa Events Plug-In - Kafka'
 
-version = '0.36.0'
+version = '0.37.0'
 
 dependencies {
     implementation 'dev.galasa:kafka.clients:3.7.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.36.0'
+version = '0.37.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.36.0'
+version = '0.37.0'
 
 configurations {
     implementation.transitive = false
@@ -14,7 +14,6 @@ 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.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.36.0'
+version = '0.37.0'
 
 configurations {
     implementation.transitive = false

release.yaml

@@ -23,7 +23,7 @@ framework:
 
 
   - artifact: dev.galasa.auth.couchdb
-    version: 0.36.0
+    version: 0.37.0
     obr:          true
     mvp:          false
     bom:          false
@@ -32,7 +32,7 @@ framework:
     codecoverage: true
 
   - artifact: dev.galasa.cps.etcd
-    version: 0.36.0
+    version: 0.37.0
     obr:          true
     mvp:          false
     bom:          false
@@ -41,7 +41,7 @@ framework:
     codecoverage: true
 
   - artifact: dev.galasa.cps.rest
-    version: 0.36.0
+    version: 0.37.0
     obr:          true
     mvp:          false
     bom:          false
@@ -50,7 +50,7 @@ framework:
     codecoverage: true
 
   - artifact: dev.galasa.events.kafka
-    version: 0.36.0
+    version: 0.37.0
     obr:          true
     mvp:          false
     bom:          false
@@ -59,7 +59,7 @@ framework:
     codecoverage: true
 
   - artifact: dev.galasa.extensions.common
-    version: 0.36.0
+    version: 0.37.0
     obr:          true
     mvp:          false
     bom:          false
@@ -68,7 +68,7 @@ framework:
     codecoverage: true
 
   - artifact: dev.galasa.extensions.mocks
-    version: 0.36.0
+    version: 0.37.0
     obr:          false
     mvp:          false
     bom:          false
@@ -77,7 +77,7 @@ framework:
     codecoverage: false
 
   - artifact: dev.galasa.ras.couchdb
-    version: 0.36.0
+    version: 0.37.0
     obr:          true
     mvp:          false
     bom:          false

set-version.sh

@@ -106,13 +106,14 @@ function bump_version {
     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
+    cat $source_file | sed "s/version[ ]*=.*/version = '$component_version'/1" > $temp_file
     cp $temp_file $source_file
 }
 
 
 # Extensions base
 bump_version $BASEDIR/galasa-extensions-parent/buildSrc/src/main/groovy/galasa.extensions.gradle $temp_dir/galasa.extensions.gradle
+bump_version $BASEDIR/galasa-extensions-parent/build.gradle $temp_dir/extensions-parent.build.gradle
 
 # Couchdb...
 bump_version $BASEDIR/galasa-extensions-parent/dev.galasa.ras.couchdb/build.gradle $temp_dir/couchdb-build.gradle