diff --git a/.secrets.baseline b/.secrets.baseline index fafda2d67..91932d663 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -75,7 +75,18 @@ "name": "TwilioKeyDetector" } ], - "results": {}, + "results": { + "galasa-managers-parent/galasa-managers-database-parent/dev.galasa.db2.manager.ivt/README.md": [ + { + "hashed_secret": "22199ec38c6bedb7616f8e42aa3ad6e9f196cd24", + "is_secret": false, + "is_verified": false, + "line_number": 114, + "type": "Secret Keyword", + "verified_result": null + } + ] + }, "version": "0.13.1+ibm.62.dss", "word_list": { "file": null, diff --git a/galasa-managers-parent/build.gradle b/galasa-managers-parent/build.gradle index ffe4a44e3..2415fd641 100644 --- a/galasa-managers-parent/build.gradle +++ b/galasa-managers-parent/build.gradle @@ -41,6 +41,7 @@ task jacocoMerge(type: JacocoMerge) { } repositories { + mavenLocal() maven { url "$sourceMaven" } 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 index 80beccf94..9257d2961 100644 --- 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 index 0775b9372..d9a32487c 100644 --- 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/release.yaml b/release.yaml index ccea2ed57..9cdf00002 100644 --- 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