Remove bitronix support

See gh-24806

Author: snicoll

spring-boot-project/spring-boot-autoconfigure/build.gradle

@@ -62,7 +62,6 @@ dependencies {
 	optional("org.apache.tomcat.embed:tomcat-embed-el")
 	optional("org.apache.tomcat.embed:tomcat-embed-websocket")
 	optional("org.apache.tomcat:tomcat-jdbc")
-	optional("org.codehaus.btm:btm")
 	optional("org.codehaus.groovy:groovy-templates")
 	optional("com.github.ben-manes.caffeine:caffeine")
 	optional("com.github.mxab.thymeleaf.extras:thymeleaf-extras-data-attribute")

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

@@ -35,13 +35,12 @@
  * @author Nishant Raut
  * @since 1.2.0
  */
-@SuppressWarnings("deprecation")
 @Configuration(proxyBeanMethods = false)
 @ConditionalOnClass(javax.transaction.Transaction.class)
 @ConditionalOnProperty(prefix = "spring.jta", value = "enabled", matchIfMissing = true)
 @AutoConfigureBefore({ XADataSourceAutoConfiguration.class, ActiveMQAutoConfiguration.class,
 		ArtemisAutoConfiguration.class, HibernateJpaAutoConfiguration.class })
-@Import({ JndiJtaConfiguration.class, BitronixJtaConfiguration.class, AtomikosJtaConfiguration.class })
+@Import({ JndiJtaConfiguration.class, AtomikosJtaConfiguration.class })
 public class JtaAutoConfiguration {
 
 }

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

@@ -1041,119 +1041,6 @@
       "name": "spring.jpa.open-in-view",
       "defaultValue": true
     },
-    {
-      "name": "spring.jta.bitronix.properties.allow-multiple-lrc",
-      "description": "Whether to allow multiple LRC resources to be enlisted into the same transaction.",
-      "defaultValue": false
-    },
-    {
-      "name": "spring.jta.bitronix.properties.asynchronous2-pc",
-      "description": "Whether to enable asynchronously execution of two phase commit.",
-      "defaultValue": false
-    },
-    {
-      "name": "spring.jta.bitronix.properties.background-recovery-interval",
-      "description": "Interval in minutes at which to run the recovery process in the background.",
-      "defaultValue": 1,
-      "deprecation": {
-        "replacement": "spring.jta.bitronix.properties.background-recovery-interval-seconds"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.background-recovery-interval-seconds",
-      "description": "Interval in seconds at which to run the recovery process in the background.",
-      "defaultValue": 60
-    },
-    {
-      "name": "spring.jta.bitronix.properties.current-node-only-recovery",
-      "description": "Whether to recover only the current node. Should be enabled if you run multiple instances of the transaction manager on the same JMS and JDBC resources.",
-      "defaultValue": true
-    },
-    {
-      "name": "spring.jta.bitronix.properties.debug-zero-resource-transaction",
-      "description": "Whether to log the creation and commit call stacks of transactions executed without a single enlisted resource.",
-      "defaultValue": false
-    },
-    {
-      "name": "spring.jta.bitronix.properties.default-transaction-timeout",
-      "description": "Default transaction timeout, in seconds.",
-      "defaultValue": 60
-    },
-    {
-      "name": "spring.jta.bitronix.properties.disable-jmx",
-      "description": "Whether to enable JMX support.",
-      "defaultValue": false
-    },
-    {
-      "name": "spring.jta.bitronix.properties.exception-analyzer",
-      "description": "Set the fully qualified name of the exception analyzer implementation to use."
-    },
-    {
-      "name": "spring.jta.bitronix.properties.filter-log-status",
-      "description": "Whether to enable filtering of logs so that only mandatory logs are written.",
-      "defaultValue": false
-    },
-    {
-      "name": "spring.jta.bitronix.properties.force-batching-enabled",
-      "description": "Whether disk forces are batched.",
-      "defaultValue": true
-    },
-    {
-      "name": "spring.jta.bitronix.properties.forced-write-enabled",
-      "description": "Whether logs are forced to disk.",
-      "defaultValue": true
-    },
-    {
-      "name": "spring.jta.bitronix.properties.graceful-shutdown-interval",
-      "description": "Maximum amount of seconds the TM waits for transactions to get done before aborting them at shutdown time.",
-      "defaultValue": 60
-    },
-    {
-      "name": "spring.jta.bitronix.properties.jndi-transaction-synchronization-registry-name",
-      "description": "JNDI name of the TransactionSynchronizationRegistry."
-    },
-    {
-      "name": "spring.jta.bitronix.properties.jndi-user-transaction-name",
-      "description": "JNDI name of the UserTransaction."
-    },
-    {
-      "name": "spring.jta.bitronix.properties.journal",
-      "description": "Name of the journal. Can be 'disk', 'null', or a class name.",
-      "defaultValue": "disk"
-    },
-    {
-      "name": "spring.jta.bitronix.properties.log-part1-filename",
-      "description": "Name of the first fragment of the journal.",
-      "defaultValue": "btm1.tlog"
-    },
-    {
-      "name": "spring.jta.bitronix.properties.log-part2-filename",
-      "description": "Name of the second fragment of the journal.",
-      "defaultValue": "btm2.tlog"
-    },
-    {
-      "name": "spring.jta.bitronix.properties.max-log-size-in-mb",
-      "description": "Maximum size in megabytes of the journal fragments.",
-      "defaultValue": 2
-    },
-    {
-      "name": "spring.jta.bitronix.properties.resource-configuration-filename",
-      "description": "ResourceLoader configuration file name."
-    },
-    {
-      "name": "spring.jta.bitronix.properties.server-id",
-      "description": "ASCII ID that must uniquely identify this TM instance. Defaults to the machine's IP address."
-    },
-    {
-      "name": "spring.jta.bitronix.properties.skip-corrupted-logs",
-      "description": "Skip corrupted transactions log entries. Use only at last resort when all you have to recover is a pair of corrupted files.",
-      "defaultValue": false
-    },
-    {
-      "name": "spring.jta.bitronix.properties.warn-about-zero-resource-transaction",
-      "description": "Whether to log a warning for transactions executed without a single enlisted resource.",
-      "defaultValue": true
-    },
     {
       "name": "spring.jta.enabled",
       "type": "java.lang.Boolean",

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -18,8 +18,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.nio.file.Path;
 
 import javax.jms.ConnectionFactory;
@@ -29,7 +27,6 @@
 import javax.jms.XASession;
 import javax.sql.DataSource;
 import javax.sql.XADataSource;
-import javax.transaction.TransactionManager;
 import javax.transaction.UserTransaction;
 import javax.transaction.xa.XAResource;
 
@@ -67,7 +64,6 @@
  * @author Kazuki Shimizu
  * @author Nishant Raut
  */
-// @SuppressWarnings("deprecation")
 class JtaAutoConfigurationTests {
 
 	private AnnotationConfigApplicationContext context;
@@ -111,37 +107,6 @@ void atomikosSanityCheck() {
 		this.context.getBean(JtaTransactionManager.class);
 	}
 
-	@Test
-	@Deprecated
-	void bitronixSanityCheck() {
-		this.context = new AnnotationConfigApplicationContext(JtaProperties.class, BitronixJtaConfiguration.class);
-		this.context.getBean(bitronix.tm.Configuration.class);
-		this.context.getBean(TransactionManager.class);
-		this.context.getBean(XADataSourceWrapper.class);
-		this.context.getBean(XAConnectionFactoryWrapper.class);
-		this.context.getBean(org.springframework.boot.jta.bitronix.BitronixDependentBeanFactoryPostProcessor.class);
-		this.context.getBean(JtaTransactionManager.class);
-	}
-
-	@Test
-	@Deprecated
-	void defaultBitronixServerId() throws UnknownHostException {
-		this.context = new AnnotationConfigApplicationContext(BitronixJtaConfiguration.class);
-		String serverId = this.context.getBean(bitronix.tm.Configuration.class).getServerId();
-		assertThat(serverId).isEqualTo(InetAddress.getLocalHost().getHostAddress());
-	}
-
-	@Test
-	@Deprecated
-	void customBitronixServerId() {
-		this.context = new AnnotationConfigApplicationContext();
-		TestPropertyValues.of("spring.jta.transactionManagerId:custom").applyTo(this.context);
-		this.context.register(BitronixJtaConfiguration.class);
-		this.context.refresh();
-		String serverId = this.context.getBean(bitronix.tm.Configuration.class).getServerId();
-		assertThat(serverId).isEqualTo("custom");
-	}
-
 	@Test
 	void defaultAtomikosTransactionManagerName(@TempDir Path dir) throws IOException {
 		this.context = new AnnotationConfigApplicationContext();
@@ -166,20 +131,6 @@ void atomikosConnectionFactoryPoolConfiguration() {
 		assertThat(connectionFactory.getMaxPoolSize()).isEqualTo(10);
 	}
 
-	@Test
-	@Deprecated
-	void bitronixConnectionFactoryPoolConfiguration() {
-		this.context = new AnnotationConfigApplicationContext();
-		TestPropertyValues.of("spring.jta.bitronix.connectionfactory.minPoolSize:5",
-				"spring.jta.bitronix.connectionfactory.maxPoolSize:10").applyTo(this.context);
-		this.context.register(BitronixJtaConfiguration.class, PoolConfiguration.class);
-		this.context.refresh();
-		org.springframework.boot.jta.bitronix.PoolingConnectionFactoryBean connectionFactory = this.context
-				.getBean(org.springframework.boot.jta.bitronix.PoolingConnectionFactoryBean.class);
-		assertThat(connectionFactory.getMinPoolSize()).isEqualTo(5);
-		assertThat(connectionFactory.getMaxPoolSize()).isEqualTo(10);
-	}
-
 	@Test
 	void atomikosDataSourcePoolConfiguration() {
 		this.context = new AnnotationConfigApplicationContext();
@@ -193,21 +144,6 @@ void atomikosDataSourcePoolConfiguration() {
 		assertThat(dataSource.getMaxPoolSize()).isEqualTo(10);
 	}
 
-	@Test
-	@Deprecated
-	void bitronixDataSourcePoolConfiguration() {
-		this.context = new AnnotationConfigApplicationContext();
-		TestPropertyValues
-				.of("spring.jta.bitronix.datasource.minPoolSize:5", "spring.jta.bitronix.datasource.maxPoolSize:10")
-				.applyTo(this.context);
-		this.context.register(BitronixJtaConfiguration.class, PoolConfiguration.class);
-		this.context.refresh();
-		org.springframework.boot.jta.bitronix.PoolingDataSourceBean dataSource = this.context
-				.getBean(org.springframework.boot.jta.bitronix.PoolingDataSourceBean.class);
-		assertThat(dataSource.getMinPoolSize()).isEqualTo(5);
-		assertThat(dataSource.getMaxPoolSize()).isEqualTo(10);
-	}
-
 	@Test
 	void atomikosCustomizeJtaTransactionManagerUsingProperties() {
 		this.context = new AnnotationConfigApplicationContext();
@@ -221,20 +157,6 @@ void atomikosCustomizeJtaTransactionManagerUsingProperties() {
 		assertThat(transactionManager.isRollbackOnCommitFailure()).isTrue();
 	}
 
-	@Test
-	@Deprecated
-	void bitronixCustomizeJtaTransactionManagerUsingProperties() {
-		this.context = new AnnotationConfigApplicationContext();
-		TestPropertyValues
-				.of("spring.transaction.default-timeout:30", "spring.transaction.rollback-on-commit-failure:true")
-				.applyTo(this.context);
-		this.context.register(BitronixJtaConfiguration.class, TransactionAutoConfiguration.class);
-		this.context.refresh();
-		JtaTransactionManager transactionManager = this.context.getBean(JtaTransactionManager.class);
-		assertThat(transactionManager.getDefaultTimeout()).isEqualTo(30);
-		assertThat(transactionManager.isRollbackOnCommitFailure()).isTrue();
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	static class CustomTransactionManagerConfig {