From 343c9c6f7ec03ecaa400329c44bbff6dd9e606a2 Mon Sep 17 00:00:00 2001
From: Christoph Dreis <christoph.dreis@freenet.de>
Date: Thu, 18 May 2023 17:20:08 +0200
Subject: [PATCH] Remove references to Atomikos and Bitronix

See gh-35562
---
 ...itional-spring-configuration-metadata.json | 161 ------
 .../docs/asciidoc/anchor-rewrite.properties   |   1 -
 ...itional-spring-configuration-metadata.json | 479 ------------------
 3 files changed, 641 deletions(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index be821293afa..8bfa50b648c 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -1584,167 +1584,6 @@
       "name": "spring.jpa.open-in-view",
       "defaultValue": true
     },
-    {
-      "name": "spring.jta.bitronix.properties.allow-multiple-lrc",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.asynchronous2-pc",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.background-recovery-interval",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.background-recovery-interval-seconds",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.current-node-only-recovery",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.debug-zero-resource-transaction",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.default-transaction-timeout",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.disable-jmx",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.exception-analyzer",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.filter-log-status",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.force-batching-enabled",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.forced-write-enabled",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.graceful-shutdown-interval",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.jndi-transaction-synchronization-registry-name",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.jndi-user-transaction-name",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.journal",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.log-part1-filename",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.log-part2-filename",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.max-log-size-in-mb",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.resource-configuration-filename",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.server-id",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.skip-corrupted-logs",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.properties.warn-about-zero-resource-transaction",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
     {
       "name": "spring.jta.enabled",
       "type": "java.lang.Boolean",
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties
index 44164b23981..fce3906da37 100644
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/anchor-rewrite.properties
@@ -306,7 +306,6 @@ boot-features-webclient-customization=features.webclient.customization
 boot-features-validation=features.validation
 boot-features-email=features.email
 boot-features-jta=features.jta
-boot-features-jta-atomikos=features.jta.atomikos
 boot-features-jta-javaee=features.jta.javaee
 boot-features-jta-mixed-jms=features.jta.mixing-xa-and-non-xa-connections
 boot-features-jta-supporting-alternative-embedded=features.jta.supporting-alternative-embedded-transaction-manager
diff --git a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index d4bd08721b8..5bc1a19d991 100644
--- a/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-boot-project/spring-boot/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -361,485 +361,6 @@
       "description": "Whether to defer DataSource initialization until after any EntityManagerFactory beans have been created and initialized.",
       "defaultValue": false
     },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.borrow-connection-timeout",
-      "type": "java.lang.Integer",
-      "description": "Timeout, in seconds, for borrowing connections from the pool.",
-      "defaultValue": 30
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.ignore-session-transacted-flag",
-      "type": "java.lang.Boolean",
-      "description": "Whether to ignore the transacted flag when creating session.",
-      "defaultValue": true
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.local-transaction-mode",
-      "type": "java.lang.Boolean",
-      "description": "Whether local transactions are desired.",
-      "defaultValue": false
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.maintenance-interval",
-      "type": "java.lang.Integer",
-      "description": "Time, in seconds, between runs of the pool's maintenance thread.",
-      "defaultValue": 60
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.max-idle-time",
-      "type": "java.lang.Integer",
-      "description": "Time, in seconds, after which connections are cleaned up from the pool.",
-      "defaultValue": 60
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.max-lifetime",
-      "type": "java.lang.Integer",
-      "description": "Time, in seconds, that a connection can be pooled for before being destroyed. 0 denotes no limit.",
-      "defaultValue": 0
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.max-pool-size",
-      "type": "java.lang.Integer",
-      "description": "Maximum size of the pool.",
-      "defaultValue": 1
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.min-pool-size",
-      "type": "java.lang.Integer",
-      "description": "Minimum size of the pool.",
-      "defaultValue": 1
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.reap-timeout",
-      "type": "java.lang.Integer",
-      "description": "Reap timeout, in seconds, for borrowed connections. 0 denotes no limit.",
-      "defaultValue": 0
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.unique-resource-name",
-      "type": "java.lang.String",
-      "description": "Unique name used to identify the resource during recovery.",
-      "defaultValue": "jmsConnectionFactory"
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.xa-connection-factory-class-name",
-      "type": "java.lang.String",
-      "description": "Vendor-specific implementation of XAConnectionFactory."
-    },
-    {
-      "name": "spring.jta.atomikos.connectionfactory.xa-properties",
-      "type": "java.util.Properties",
-      "description": "Vendor-specific XA properties."
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.borrow-connection-timeout",
-      "type": "java.lang.Integer",
-      "description": "Timeout, in seconds, for borrowing connections from the pool.",
-      "defaultValue": 30
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.concurrent-connection-validation",
-      "type": "java.lang.Boolean",
-      "description": "Whether to use concurrent connection validation.",
-      "defaultValue": true
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.default-isolation-level",
-      "type": "java.lang.Integer",
-      "description": "Default isolation level of connections provided by the pool."
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.login-timeout",
-      "type": "java.lang.Integer",
-      "description": "Timeout, in seconds, for establishing a database connection.",
-      "defaultValue": 0
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.maintenance-interval",
-      "type": "java.lang.Integer",
-      "description": "Time, in seconds, between runs of the pool's maintenance thread.",
-      "defaultValue": 60
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.max-idle-time",
-      "type": "java.lang.Integer",
-      "description": "Time, in seconds, after which connections are cleaned up from the pool.",
-      "defaultValue": 60
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.max-lifetime",
-      "type": "java.lang.Integer",
-      "description": "Time, in seconds, that a connection can be pooled for before being destroyed. 0 denotes no limit.",
-      "defaultValue": 0
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.max-pool-size",
-      "type": "java.lang.Integer",
-      "description": "Maximum size of the pool.",
-      "defaultValue": 1
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.min-pool-size",
-      "type": "java.lang.Integer",
-      "description": "Minimum size of the pool.",
-      "defaultValue": 1
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.reap-timeout",
-      "type": "java.lang.Integer",
-      "description": "Reap timeout, in seconds, for borrowed connections. 0 denotes no limit.",
-      "defaultValue": 0
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.test-query",
-      "type": "java.lang.String",
-      "description": "SQL query or statement used to validate a connection before returning it."
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.unique-resource-name",
-      "type": "java.lang.String",
-      "description": "Unique name used to identify the resource during recovery.",
-      "defaultValue": "dataSource"
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.xa-data-source-class-name",
-      "type": "java.lang.String",
-      "description": "Vendor-specific implementation of XAConnectionFactory."
-    },
-    {
-      "name": "spring.jta.atomikos.datasource.xa-properties",
-      "type": "java.util.Properties",
-      "description": "Vendor-specific XA properties."
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.acquire-increment",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.acquisition-interval",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.acquisition-timeout",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.allow-local-transactions",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.apply-transaction-timeout",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.automatic-enlisting-enabled",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.cache-producers-consumers",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.class-name",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.defer-connection-release",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.disabled",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.driver-properties",
-      "type": "java.util.Properties",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.ignore-recovery-failures",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.max-idle-time",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.max-pool-size",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.min-pool-size",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.password",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.share-transaction-connections",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.test-connections",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.two-pc-ordering-position",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.unique-name",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.use-tm-join",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.connectionfactory.user",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.acquire-increment",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.acquisition-interval",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.acquisition-timeout",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.allow-local-transactions",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.apply-transaction-timeout",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.automatic-enlisting-enabled",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.class-name",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.cursor-holdability",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.defer-connection-release",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.disabled",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.driver-properties",
-      "type": "java.util.Properties",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.enable-jdbc4-connection-test",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.ignore-recovery-failures",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.isolation-level",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.local-auto-commit",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.login-timeout",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.max-idle-time",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.max-pool-size",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.min-pool-size",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.prepared-statement-cache-size",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.share-transaction-connections",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.test-query",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.two-pc-ordering-position",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.unique-name",
-      "type": "java.lang.String",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.jta.bitronix.datasource.use-tm-join",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "level": "error"
-      }
-    },
     {
       "name": "spring.main.allow-bean-definition-overriding",
       "type": "java.lang.Boolean",