Merge branch 'main' into mcobbett-gherkin-3270-terminals-scenario-out…

…line
galasa-dev · Jul 3, 2024 · 0036274 · 0036274
2 parents 76dee0b + 294c6ef
commit 0036274
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle
@@ -9,7 +9,7 @@ plugins {
 // It is used as the version number of the managers bundle, which contains a yaml
 // file which is in a release.yaml, but published to maven, so that the OBR build 
 // can pick it up later.
-version = "0.35.0"
+version = "0.36.0"
 
 // A configuration to publish the merge exec into
 configurations {
@@ -41,6 +41,7 @@ task jacocoMerge(type: JacocoMerge) {
 }
 
 repositories {
+    mavenLocal()
     maven {
         url "$sourceMaven"
     }
@@ -192,7 +193,7 @@ publishing {
                 name = "Manifest for managers bundle versions"
                 artifactId = "dev.galasa.managers.manifest"
                 groupId = 'dev.galasa'
-				version = "0.35.0"
+				version = "0.36.0"
                 description = "Conveys bundle version information to OBR builds."
                 licenses {
                     license {

diff --git a/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle b/galasa-managers-parent/buildSrc/src/main/groovy/galasa.manager.gradle
@@ -6,7 +6,7 @@ plugins {
 
 dependencies {
     api            'dev.galasa:dev.galasa:0.34.0'
-    implementation 'dev.galasa:dev.galasa.framework:0.35.0'
+    implementation 'dev.galasa:dev.galasa.framework:0.36.0'
     implementation 'commons-logging:commons-logging:1.2'
     implementation 'org.osgi:org.osgi.core:6.0.0'
     implementation 'org.osgi:org.osgi.service.component.annotations:1.3.0'

diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/bnd.bnd
@@ -2,7 +2,14 @@
 Bundle-Name: Galasa Db2 Manager
 Export-Package: dev.galasa.db2,\
                 dev.galasa.db2.spi
-Import-Package: !javax.validation.constraints, \
+Import-Package: jakarta.transaction, \
+                jakarta.transaction.xa, \
+                javax.transaction, \
+                javax.transaction.xa, \
+                !jakarta.enterprise.util, \
+                !jakarta.interceptor, \
+                !jakarta.enterprise.context, \
+                !javax.validation.constraints, \
                 !com.ibm.bidiTools.bdlayout, \
                 !com.ibm.cics.server, \
                 com.ibm.dataaccess, \

diff --git a/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle b/galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager/build.gradle
@@ -4,12 +4,12 @@ plugins {
 
 description = 'Galasa Db2 Manager'
 
-version = '0.34.0'
+version = '0.35.0'
 
 dependencies {
 	// implementation project(':galasa-managers-core-parent:dev.galasa.artifact.manager')
     implementation 'com.ibm.db2.jcc:db2jcc:db2jcc4'
-    implementation 'dev.galasa:jta:1.2'
+    implementation 'dev.galasa:jta:2.0.1'
 }
 
 // Note: These values are consumed by the parent build process

diff --git a/...nagers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle b/...nagers-parent/galasa-managers-testingtools-parent/dev.galasa.sdv.manager.ivt/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 description = 'Galasa SDV Manager IVT'
 
-version = '0.34.0'
+version = '0.35.0'
 
 dependencies {
     implementation project (':galasa-managers-cicsts-parent:dev.galasa.cicsts.ceci.manager')

diff --git a/...nt/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java b/...nt/dev.galasa.sdv.manager.ivt/src/main/java/dev/galasa/sdv/manager/ivt/SdvManagerIVT.java
@@ -11,9 +11,7 @@
 
 import dev.galasa.BeforeClass;
 import dev.galasa.Test;
-import dev.galasa.cicsts.CicsRegion;
 import dev.galasa.cicsts.CicsTerminal;
-import dev.galasa.cicsts.ICicsRegion;
 import dev.galasa.cicsts.ICicsTerminal;
 import dev.galasa.core.manager.Logger;
 import dev.galasa.sdv.ISdvUser;
@@ -26,13 +24,10 @@ public class SdvManagerIVT {
     @Logger
     public Log logger;
 
-    @CicsRegion
-    public ICicsRegion cics;
-
-    @CicsTerminal
+    @CicsTerminal(cicsTag = "A")
     public ICicsTerminal terminal;
 
-    @SdvUser(roleTag = "role1")
+    @SdvUser(cicsTag = "A", roleTag = "R1")
     public ISdvUser user1;
 
     private static final String SDV_TCPIPSERVICE_NAME = "SDVXSDT";

diff --git a/release.yaml b/release.yaml
@@ -134,7 +134,7 @@ managers:
     isolated: true
 
   - artifact: dev.galasa.db2.manager
-    version: 0.34.0
+    version: 0.35.0
     obr: true
     bom: true
     javadoc: true
@@ -328,7 +328,7 @@ managers:
     codecoverage: true
 
   - artifact: dev.galasa.sdv.manager.ivt
-    version: 0.34.0
+    version: 0.35.0
     obr: true
     mvp: true
     isolated: true