Remove Narayana support

The Spring Boot integration is now handled by the Narayana project
itself at https://github.com/snowdrop/narayana-spring-boot

This commit removes our support.

Closes gh-12026

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/pom.xml

@@ -668,21 +668,6 @@
 			<artifactId>jooq</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.jboss.narayana.jta</groupId>
-			<artifactId>jms</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.narayana.jta</groupId>
-			<artifactId>jta</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.narayana.jts</groupId>
-			<artifactId>narayana-jts-integration</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java

@@ -42,7 +42,7 @@
 		ActiveMQAutoConfiguration.class, ArtemisAutoConfiguration.class,
 		HibernateJpaAutoConfiguration.class })
 @Import({ JndiJtaConfiguration.class, BitronixJtaConfiguration.class,
-		AtomikosJtaConfiguration.class, NarayanaJtaConfiguration.class })
+		AtomikosJtaConfiguration.class })
 @EnableConfigurationProperties(JtaProperties.class)
 public class JtaAutoConfiguration {
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/NarayanaJtaConfiguration.java

@@ -31,7 +31,6 @@
 import javax.transaction.UserTransaction;
 import javax.transaction.xa.XAResource;
 
-import com.arjuna.ats.jbossatx.jta.RecoveryManagerService;
 import com.atomikos.icatch.config.UserTransactionService;
 import com.atomikos.icatch.jta.UserTransactionManager;
 import com.atomikos.jms.AtomikosConnectionFactoryBean;
@@ -52,9 +51,6 @@
 import org.springframework.boot.jta.bitronix.BitronixDependentBeanFactoryPostProcessor;
 import org.springframework.boot.jta.bitronix.PoolingConnectionFactoryBean;
 import org.springframework.boot.jta.bitronix.PoolingDataSourceBean;
-import org.springframework.boot.jta.narayana.NarayanaBeanFactoryPostProcessor;
-import org.springframework.boot.jta.narayana.NarayanaConfigurationBean;
-import org.springframework.boot.jta.narayana.NarayanaRecoveryManagerBean;
 import org.springframework.boot.test.util.TestPropertyValues;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -140,20 +136,6 @@ public void bitronixSanityCheck() {
 		this.context.getBean(JtaTransactionManager.class);
 	}
 
-	@Test
-	public void narayanaSanityCheck() {
-		this.context = new AnnotationConfigApplicationContext(JtaProperties.class,
-				NarayanaJtaConfiguration.class);
-		this.context.getBean(NarayanaConfigurationBean.class);
-		this.context.getBean(UserTransaction.class);
-		this.context.getBean(TransactionManager.class);
-		this.context.getBean(XADataSourceWrapper.class);
-		this.context.getBean(XAConnectionFactoryWrapper.class);
-		this.context.getBean(NarayanaBeanFactoryPostProcessor.class);
-		this.context.getBean(JtaTransactionManager.class);
-		this.context.getBean(RecoveryManagerService.class);
-	}
-
 	@Test
 	public void defaultBitronixServerId() throws UnknownHostException {
 		this.context = new AnnotationConfigApplicationContext(
@@ -285,16 +267,6 @@ public void bitronixCustomizeJtaTransactionManagerUsingProperties() {
 		assertThat(transactionManager.isRollbackOnCommitFailure()).isTrue();
 	}
 
-	@Test
-	public void narayanaRecoveryManagerBeanCanBeCustomized() {
-		this.context = new AnnotationConfigApplicationContext();
-		this.context.register(CustomNarayanaRecoveryManagerConfiguration.class,
-				JtaProperties.class, NarayanaJtaConfiguration.class);
-		this.context.refresh();
-		assertThat(this.context.getBean(NarayanaRecoveryManagerBean.class))
-				.isInstanceOf(CustomNarayanaRecoveryManagerBean.class);
-	}
-
 	@Configuration
 	@EnableConfigurationProperties(JtaProperties.class)
 	public static class JtaPropertiesConfiguration {
@@ -337,25 +309,4 @@ public DataSource pooledDataSource(XADataSourceWrapper wrapper) throws Exception
 
 	}
 
-	@Configuration
-	public static class CustomNarayanaRecoveryManagerConfiguration {
-
-		@Bean
-		public NarayanaRecoveryManagerBean customRecoveryManagerBean(
-				RecoveryManagerService recoveryManagerService) {
-			return new CustomNarayanaRecoveryManagerBean(recoveryManagerService);
-		}
-
-	}
-
-	static final class CustomNarayanaRecoveryManagerBean
-			extends NarayanaRecoveryManagerBean {
-
-		private CustomNarayanaRecoveryManagerBean(
-				RecoveryManagerService recoveryManagerService) {
-			super(recoveryManagerService);
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java

@@ -129,7 +129,6 @@
 		<mongodb.version>3.8.0</mongodb.version>
 		<mssql-jdbc.version>6.4.0.jre8</mssql-jdbc.version>
 		<mysql.version>8.0.12</mysql.version>
-		<narayana.version>5.8.2.Final</narayana.version>
 		<nekohtml.version>1.9.22</nekohtml.version>
 		<neo4j-ogm.version>3.1.0</neo4j-ogm.version>
 		<netty.version>4.1.28.Final</netty.version>
@@ -450,11 +449,6 @@
 				<artifactId>spring-boot-starter-jta-bitronix</artifactId>
 				<version>${revision}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-starter-jta-narayana</artifactId>
-				<version>${revision}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter-log4j2</artifactId>
@@ -2203,26 +2197,6 @@
 				<artifactId>jboss-logging</artifactId>
 				<version>${jboss-logging.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.jboss.narayana.jta</groupId>
-				<artifactId>jdbc</artifactId>
-				<version>${narayana.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.narayana.jta</groupId>
-				<artifactId>jms</artifactId>
-				<version>${narayana.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.narayana.jta</groupId>
-				<artifactId>jta</artifactId>
-				<version>${narayana.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.jboss.narayana.jts</groupId>
-				<artifactId>narayana-jts-integration</artifactId>
-				<version>${narayana.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.jdom</groupId>
 				<artifactId>jdom2</artifactId>

spring-boot-project/spring-boot-dependencies/pom.xml

@@ -532,26 +532,6 @@
 			<artifactId>jboss-logging</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.jboss.narayana.jta</groupId>
-			<artifactId>jdbc</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.narayana.jta</groupId>
-			<artifactId>jms</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.narayana.jta</groupId>
-			<artifactId>jta</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.narayana.jts</groupId>
-			<artifactId>narayana-jts-integration</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.jooq</groupId>
 			<artifactId>jooq</artifactId>

spring-boot-project/spring-boot-docs/pom.xml

@@ -917,21 +917,6 @@ content into your application. Rather, pick only the properties that you need.
 	spring.jta.bitronix.properties.skip-corrupted-logs=false # Skip corrupted transactions log entries.
 	spring.jta.bitronix.properties.warn-about-zero-resource-transaction=true # Whether to log a warning for transactions executed without a single enlisted resource.
 
-	# NARAYANA ({sc-spring-boot}/jta/narayana/NarayanaProperties.{sc-ext}[NarayanaProperties])
-	spring.jta.narayana.default-timeout=60s # Transaction timeout. If a duration suffix is not specified, seconds will be used.
-	spring.jta.narayana.expiry-scanners=com.arjuna.ats.internal.arjuna.recovery.ExpiredTransactionStatusManagerScanner # Comma-separated list of expiry scanners.
-	spring.jta.narayana.log-dir= # Transaction object store directory.
-	spring.jta.narayana.one-phase-commit=true # Whether to enable one phase commit optimization.
-	spring.jta.narayana.periodic-recovery-period=120s # Interval in which periodic recovery scans are performed. If a duration suffix is not specified, seconds will be used.
-	spring.jta.narayana.recovery-backoff-period=10s # Back off period between first and second phases of the recovery scan. If a duration suffix is not specified, seconds will be used.
-	spring.jta.narayana.recovery-db-pass= # Database password to be used by the recovery manager.
-	spring.jta.narayana.recovery-db-user= # Database username to be used by the recovery manager.
-	spring.jta.narayana.recovery-jms-pass= # JMS password to be used by the recovery manager.
-	spring.jta.narayana.recovery-jms-user= # JMS username to be used by the recovery manager.
-	spring.jta.narayana.recovery-modules= # Comma-separated list of recovery modules.
-	spring.jta.narayana.transaction-manager-id=1 # Unique transaction manager id.
-	spring.jta.narayana.xa-resource-orphan-filters= # Comma-separated list of orphan filters.
-
 	# EMBEDDED MONGODB ({sc-spring-boot-autoconfigure}/mongo/embedded/EmbeddedMongoProperties.{sc-ext}[EmbeddedMongoProperties])
 	spring.mongodb.embedded.features=sync_delay # Comma-separated list of features to enable.
 	spring.mongodb.embedded.storage.database-dir= # Directory used for data storage.