feat(214537): Add separate SB3 / LogCloud example to work with 6.0

pom.xml

@@ -6,14 +6,14 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.3.4.RELEASE</version>
+		<version>3.3.10</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-boot-sample-jta-atomikos</artifactId>
 	<name>Spring Boot Atomikos JTA Sample</name>
 	<description>Spring Boot Atomikos JTA Sample</description>
 	<properties>
-		<atomikos.version>5.0.108.EVAL</atomikos.version>
+		<atomikos.version>6.0.114.EVAL</atomikos.version>
 	</properties>
 	<dependencies>
 		<!-- Compile -->
@@ -26,8 +26,9 @@
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-jta-atomikos</artifactId>
+			<groupId>com.atomikos</groupId>
+			<artifactId>transactions-spring-boot3-starter</artifactId>
+			<version>${atomikos.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -59,24 +60,25 @@
 			<version>${atomikos.version}</version>
 		</dependency>
 
-		<!-- removed for latest 5.0.x <dependency> <groupId>com.atomikos</groupId> 
-			<artifactId>transactions-springboot2</artifactId> <version>${atomikos.version}</version> 
-			</dependency> -->
-
 		<!-- added for latest 5.0.x -->
 		<dependency>
 			<groupId>com.atomikos</groupId>
-			<artifactId>transactions-spring-boot-starter</artifactId>
+			<artifactId>transactions-spring-boot</artifactId>
 			<version>${atomikos.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.atomikos</groupId>
-			<artifactId>transactions-spring-boot</artifactId>
+			<artifactId>transactions-spring-boot-logcloud</artifactId>
 			<version>${atomikos.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.atomikos</groupId>
-			<artifactId>transactions-spring-boot-logcloud</artifactId>
+			<artifactId>transactions-remoting-recovery</artifactId>
+			<version>${atomikos.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.atomikos</groupId>
+			<artifactId>transactions-remoting</artifactId>
 			<version>${atomikos.version}</version>
 		</dependency>
 		<dependency>
@@ -85,6 +87,10 @@
 			<version>2.0.1</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.xml.bind</groupId>
+			<artifactId>jakarta.xml.bind-api</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -96,7 +102,12 @@
 			<artifactId>spring-boot-configuration-processor</artifactId>
 			<optional>true</optional>
 		</dependency>
-
+		<dependency>
+			<groupId>com.atomikos</groupId>
+			<artifactId>transactions-hibernate4</artifactId>
+			<version>${atomikos.version}</version>
+			<classifier>jakarta</classifier>
+		</dependency>
 		<!-- Test -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -112,19 +123,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<profiles>
-		<profile>
-			<id>java9+</id>
-			<activation>
-				<jdk>[9,)</jdk>
-			</activation>
-			<dependencies>
-				<dependency>
-					<groupId>jakarta.xml.bind</groupId>
-					<artifactId>jakarta.xml.bind-api</artifactId>
-					<version>2.3.2</version>
-				</dependency>
-			</dependencies>
-		</profile>
-	</profiles>
 </project>

src/main/java/sample/atomikos/Account.java

@@ -16,9 +16,9 @@
 
 package sample.atomikos;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class Account {

src/main/java/sample/atomikos/AccountService.java

@@ -16,7 +16,7 @@
 
 package sample.atomikos;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Service;

src/main/resources/application-postgres.yml

@@ -0,0 +1,31 @@
+# Conversion to YAML from Properties formar report
+# Warnings:
+# - The yaml file had comments which are lost in the refactoring!
+spring:
+  artemis:
+    embedded:
+      queues: accounts
+  jpa:
+    open-in-view: true
+    properties:
+      hibernate:
+        jdbc:
+          lob:
+            "[non_contextual_creation]": true
+    hibernate:
+      ddl-auto: create-drop
+  datasource:
+    url: jdbc:postgresql://localhost:5432/atomikos
+    username: atomikos
+    password: atomikos
+  jta:
+    atomikos:
+      datasource:
+        supports-tm-join: false
+        unique-resource-name: APP
+        local-transaction-mode: true
+      properties:
+        transaction-manager-unique-name: logcloud
+  sql:
+    init:
+      continue-on-error: true

src/main/resources/application.yml

@@ -0,0 +1,28 @@
+# Conversion to YAML from Properties formar report
+# Warnings:
+# - The yaml file had comments which are lost in the refactoring!
+spring:
+  artemis:
+    embedded:
+      queues: accounts
+  jpa:
+    open-in-view: true
+    hibernate:
+      ddl-auto: update
+  datasource:
+    url: jdbc:h2:./logcloud
+  jta:
+    atomikos:
+      datasource:
+        unique-resource-name: APP
+        local-transaction-mode: true
+      properties:
+        transaction-manager-unique-name: logcloud
+  sql:
+    init:
+      continue-on-error: true
+      mode: always
+
+atomikos:
+  properties:
+    transaction-manager-unique-name: logcloud

src/test/java/sample/atomikos/SampleAtomikosApplicationTests.java

@@ -16,28 +16,27 @@
 
 package sample.atomikos;
 
-import org.assertj.core.api.Condition;
-import org.junit.Rule;
-import org.junit.Test;
-
-import org.springframework.boot.test.system.OutputCaptureRule;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
+import org.assertj.core.api.Condition;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.system.OutputCaptureExtension;
+
 /**
  * Basic integration tests for demo application.
  *
  * @author Phillip Webb
  */
+@ExtendWith(OutputCaptureExtension.class)	
 public class SampleAtomikosApplicationTests {
 
-	@Rule
-	public OutputCaptureRule outputCapture = new OutputCaptureRule();
 
 	@Test
-	public void testTransactionRollback() throws Exception {
+	public void testTransactionRollback(CapturedOutput capturedOutput) throws Exception {
 		SampleAtomikosApplication.main(new String[] {});
-		String output = this.outputCapture.toString();
+		String output = capturedOutput.getOut();
 		assertThat(output).has(substring(1, "---->"));
 		assertThat(output).has(substring(1, "----> josh"));
 		assertThat(output).has(substring(2, "Count is 1"));