Merge

Signed-off-by: Jade Carino <[email protected]>

javax.transaction/pom.xml → jakarta.transaction/pom.xml

@@ -10,18 +10,19 @@
 	</parent>
 
 	<artifactId>jta</artifactId>
-	<version>1.1</version>
+	<version>1.2</version>
 	<packaging>bundle</packaging>
 
 	<name>galasa wrapped version of JTA</name>
 
 	<dependencies>
-		<!-- https://mvnrepository.com/artifact/javax.transaction/jta -->
-<dependency>
-    <groupId>javax.transaction</groupId>
-    <artifactId>jta</artifactId>
-    <version>1.1</version>
-</dependency>
+		<!-- https://mvnrepository.com/artifact/jakarta.transaction/jakarta.transaction-api/2.0.1 -->
+	<dependency>
+		<groupId>jakarta.transaction</groupId>
+		<artifactId>jakarta.transaction-api</artifactId>
+		<version>2.0.1</version>
+	</dependency>
+
 
 
 	</dependencies>
@@ -35,10 +36,10 @@
 				<configuration>
 					<supportedProjectTypes>bundle</supportedProjectTypes>
 					<instructions>
-						<Bundle-SymbolicName>javax.transaction</Bundle-SymbolicName>
+						<Bundle-SymbolicName>jakarta.transaction</Bundle-SymbolicName>
 						<Embed-Dependency>*;scope=compile</Embed-Dependency>
-						<Export-Package>javax.transaction,
-						                javax.transaction.*
+						<Export-Package>jakarta.transaction-api,
+										jakarta.transaction-api.*
 						</Export-Package>
 					</instructions>
 				</configuration>

pom.xml

@@ -32,7 +32,7 @@
 		<module>com.jcraft.jsch</module>
 		<module>com.auth0.jwt</module>
 		<module>com.google.gson</module>
-		<module>javax.transaction</module>
+		<module>jakarta.transaction</module>
 		<module>io.grpc.java</module>
 		<module>kafka.clients</module>
 	</modules>