HHH-18902 drop support for Proxool and Vibur

documentation/documentation.gradle

@@ -52,8 +52,6 @@ configurations {
 	agroal
 	c3p0
 	hikaricp
-	proxool
-	vibur
 
 	jcache
 
@@ -72,8 +70,6 @@ configurations {
 		extendsFrom agroal
 		extendsFrom c3p0
 		extendsFrom hikaricp
-		extendsFrom proxool
-		extendsFrom vibur
 		extendsFrom jcache
 		extendsFrom jpamodelgen
 	}
@@ -133,9 +129,7 @@ dependencies {
 	reportAggregation project(':hibernate-hikaricp')
 	reportAggregation project(':hibernate-jcache')
 	reportAggregation project(':hibernate-micrometer')
-	reportAggregation project(':hibernate-proxool')
 	reportAggregation project(':hibernate-spatial')
-	reportAggregation project(':hibernate-vibur')
 	reportAggregation project(':hibernate-ant')
 	reportAggregation project(':hibernate-maven-plugin')
 	reportAggregation project(':hibernate-processor')
@@ -163,12 +157,6 @@ dependencies {
 	hikaricp project( ':hibernate-hikaricp' )
 	javadocSources project( path: ':hibernate-hikaricp', configuration: 'javadocSources' )
 
-	proxool project( ':hibernate-proxool' )
-	javadocSources project( path: ':hibernate-proxool', configuration: 'javadocSources' )
-
-	vibur project( ':hibernate-vibur' )
-	javadocSources project( path: ':hibernate-vibur', configuration: 'javadocSources' )
-
 	jcache project( ':hibernate-jcache' )
 	javadocSources project( path: ':hibernate-jcache', configuration: 'javadocSources' )
 
@@ -565,12 +553,6 @@ settingsDocumentation {
 			description = "Settings related to integrating with the C3P0 Connection pool"
 			settingsClassName "org.hibernate.cfg.C3p0Settings"
 		}
-		proxool {
-			explicitPosition = 5
-			summary = "Proxool Connection Pool Settings"
-			description = "Settings related to integrating with the Proxool Connection pool"
-			settingsClassName "org.hibernate.cfg.ProxoolSettings"
-		}
 		transaction {
 			explicitPosition = 6
 			summary = "Transaction Environment Settings"

documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc

@@ -52,8 +52,6 @@ transitive dependencies based on the features being used or not.
 |hibernate-agroal| Support for https://agroal.github.io/[Agroal] connection pooling
 |hibernate-c3p0| Support for https://www.mchange.com/projects/c3p0/[C3P0] connection pooling
 |hibernate-hikaricp| Support for https://github.com/brettwooldridge/HikariCP/[HikariCP] connection pooling
-|hibernate-vibur| Support for https://www.vibur.org/[Vibur DBCP] connection pooling
-|hibernate-proxool| Support for https://proxool.sourceforge.net/[Proxool] connection pooling
 |hibernate-ucp| Support for https://docs.oracle.com/en/database/oracle/oracle-database/23/jjucp/intro.html[Universal Connection Pool] connection pooling
 |hibernate-jcache| Integration with https://jcp.org/en/jsr/detail?id=107$$[JCache], allowing any compliant implementation as a second-level cache provider
 |hibernate-graalvm| Experimental extension to make it easier to compile applications as a https://www.graalvm.org/[GraalVM] native image

documentation/src/main/asciidoc/userguide/chapters/jdbc/Database_Access.adoc

@@ -16,13 +16,11 @@ Hibernate will internally determine which `ConnectionProvider` to use based on t
 1. If `hibernate.connection.provider_class` is set, it takes precedence
 2. else if `hibernate.connection.datasource` is set -> <<database-connectionprovider-datasource>>
 3. else if any setting prefixed by `hibernate.c3p0.` is set -> <<database-connectionprovider-c3p0>>
-4. else if any setting prefixed by `hibernate.proxool.` is set -> <<database-connectionprovider-proxool>>
-5. else if any setting prefixed by `hibernate.hikari.` is set -> <<database-connectionprovider-hikari>>
-6. else if any setting prefixed by `hibernate.vibur.` is set -> <<database-connectionprovider-vibur>>
-7. else if any setting prefixed by `hibernate.agroal.` is set -> <<database-connectionprovider-agroal>>
-8. else if any setting prefixed by `hibernate.oracleucp.` is set -> <<database-connectionprovider-ucp>>
-9. else if `hibernate.connection.url` is set -> <<database-connectionprovider-drivermanager>>
-10. else -> <<database-connectionprovider-provided>>
+4. else if any setting prefixed by `hibernate.hikari.` is set -> <<database-connectionprovider-hikari>>
+5. else if any setting prefixed by `hibernate.agroal.` is set -> <<database-connectionprovider-agroal>>
+6. else if any setting prefixed by `hibernate.oracleucp.` is set -> <<database-connectionprovider-ucp>>
+7. else if `hibernate.connection.url` is set -> <<database-connectionprovider-drivermanager>>
+9. else -> <<database-connectionprovider-provided>>
 
 [[database-connectionprovider-datasource]]
 === Using DataSources
@@ -72,38 +70,6 @@ Transaction isolation of the Connections is managed by the `ConnectionProvider`
 Any other settings prefixed with `hibernate.c3p0.`:: Will have the `hibernate.` portion stripped and be passed to c3p0.
 Any other settings prefixed with `c3p0.`:: Get passed to c3p0 as is. See https://www.mchange.com/projects/c3p0/#configuration[c3p0 configuration]
 
-[[database-connectionprovider-proxool]]
-=== Using Proxool
-
-[IMPORTANT]
-====
-To use the Proxool integration, the application must include the `hibernate-proxool` module jar (as well as its dependencies) on the classpath.
-====
-
-Hibernate also provides support for applications to use https://proxool.sourceforge.net/[Proxool] connection pooling.
-
-Transaction isolation of the Connections is managed by the `ConnectionProvider` itself. See <<database-connectionprovider-isolation>>.
-
-[[database-connectionprovider-proxool-existing]]
-==== Using existing Proxool pools
-
-Controlled by the `hibernate.proxool.existing_pool` setting.
-If set to true, this ConnectionProvider will use an already existing Proxool pool by alias as indicated by the `hibernate.proxool.pool_alias` setting.
-
-[[database-connectionprovider-proxool-jaxp]]
-==== Configuring Proxool via XML
-
-The `hibernate.proxool.xml` setting names a Proxool configuration XML file to be loaded as a classpath resource and loaded by Proxool's JAXPConfigurator.
-See https://proxool.sourceforge.net/configure.html[proxool  configuration].
-`hibernate.proxool.pool_alias` must be set to indicate which pool to use.
-
-[[database-connectionprovider-proxool-properties]]
-==== Configuring Proxool via Properties
-
-The `hibernate.proxool.properties` setting names a Proxool configuration properties file to be loaded as a classpath resource and loaded by Proxool's `PropertyConfigurator`.
-See https://proxool.sourceforge.net/configure.html[proxool  configuration].
-`hibernate.proxool.pool_alias` must be set to indicate which pool to use.
-
 [[database-connectionprovider-hikari]]
 === Using HikariCP
 
@@ -125,26 +91,6 @@ Additionally, this `ConnectionProvider` will pick up the following Hibernate-spe
 Note that Hikari only supports JDBC standard isolation levels (apparently).
 `hibernate.connection.autocommit`:: Mapped to Hikari's `autoCommit` setting
 
-[[database-connectionprovider-vibur]]
-=== Using Vibur DBCP
-
-[IMPORTANT]
-====
-To use the Vibur DBCP integration, the application must include the `hibernate-vibur` module jar (as well as its dependencies) on the classpath.
-====
-
-Hibernate also provides support for applications to use https://www.vibur.org/[Vibur DBCP] connection pool.
-
-Set all of your Vibur settings in Hibernate prefixed by `hibernate.vibur.` and this `ConnectionProvider` will pick them up and pass them along to Vibur DBCP.
-Additionally, this `ConnectionProvider` will pick up the following Hibernate-specific properties and map them to the corresponding Vibur ones (any `hibernate.vibur.` prefixed ones have precedence):
-
-`hibernate.connection.driver_class`:: Mapped to Vibur's `driverClassName` setting
-`hibernate.connection.url`:: Mapped to Vibur's `jdbcUrl` setting
-`hibernate.connection.username`:: Mapped to Vibur's `username` setting
-`hibernate.connection.password`:: Mapped to Vibur's `password` setting
-`hibernate.connection.isolation`:: Mapped to Vibur's `defaultTransactionIsolationValue` setting. See <<ConnectionProvider support for transaction isolation setting>>.
-`hibernate.connection.autocommit`:: Mapped to Vibur's `defaultAutoCommit` setting
-
 [[database-connectionprovider-agroal]]
 === Using Agroal
 

etc/hibernate.properties

@@ -217,22 +217,6 @@ hibernate.connection.pool_size 1
 
 
 
-##############################
-### Proxool Connection Pool###
-##############################
-
-## Properties for external configuration of Proxool
-
-hibernate.proxool.pool_alias pool1
-
-## Only need one of the following
-
-#hibernate.proxool.existing_pool true
-#hibernate.proxool.xml proxool.xml
-#hibernate.proxool.properties proxool.properties
-
-
-
 #################################
 ### Plugin ConnectionProvider ###
 #################################
@@ -242,7 +226,6 @@ hibernate.proxool.pool_alias pool1
 #hibernate.connection.provider_class org.hibernate.connection.DriverManagerConnectionProvider
 #hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider
 #hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider
-#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider
 
 
 

etc/hibernate.properties.template

@@ -191,22 +191,6 @@ hibernate.connection.pool_size 1
 
 
 
-##############################
-### Proxool Connection Pool###
-##############################
-
-## Properties for external configuration of Proxool
-
-hibernate.proxool.pool_alias pool1
-
-## Only need one of the following
-
-#hibernate.proxool.existing_pool true
-#hibernate.proxool.xml proxool.xml
-#hibernate.proxool.properties proxool.properties
-
-
-
 #################################
 ### Plugin ConnectionProvider ###
 #################################
@@ -217,7 +201,6 @@ hibernate.proxool.pool_alias pool1
 #hibernate.connection.provider_class org.hibernate.connection.DatasourceConnectionProvider
 #hibernate.connection.provider_class org.hibernate.connection.C3P0ConnectionProvider
 #hibernate.connection.provider_class org.hibernate.connection.DBCPConnectionProvider
-#hibernate.connection.provider_class org.hibernate.connection.ProxoolConnectionProvider
 
 
 

hibernate-core/src/main/java/org/hibernate/cfg/JdbcSettings.java

@@ -19,7 +19,7 @@
  *
  * @author Steve Ebersole
  */
-public interface JdbcSettings extends C3p0Settings, ProxoolSettings, AgroalSettings, HikariCPSettings {
+public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSettings {
 
 	/**
 	 * Specifies a JTA {@link javax.sql.DataSource} to use for Connections.

hibernate-core/src/main/java/org/hibernate/engine/jdbc/connections/internal/ConnectionProviderInitiator.java

@@ -41,7 +41,6 @@
 import static org.hibernate.cfg.JdbcSettings.POOL_SIZE;
 import static org.hibernate.cfg.JdbcSettings.URL;
 import static org.hibernate.cfg.JdbcSettings.USER;
-import static org.hibernate.cfg.ProxoolSettings.PROXOOL_CONFIG_PREFIX;
 import static org.hibernate.cfg.SchemaToolingSettings.ENABLE_SYNONYMS;
 import static org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentImpl.isMultiTenancyEnabled;
 import static org.hibernate.internal.util.StringHelper.nullIfEmpty;
@@ -66,21 +65,11 @@ public class ConnectionProviderInitiator implements StandardServiceInitiator<Con
 	 */
 	public static final String C3P0_STRATEGY = "c3p0";
 
-	/**
-	 * The strategy for proxool connection pooling
-	 */
-	public static final String PROXOOL_STRATEGY = "proxool";
-
 	/**
 	 * The strategy for hikari connection pooling
 	 */
 	public static final String HIKARI_STRATEGY = "hikari";
 
-	/**
-	 * The strategy for vibur connection pooling
-	 */
-	public static final String VIBUR_STRATEGY = "vibur";
-
 	/**
 	 * The strategy for oracle ucp connection pooling
 	 */
@@ -162,15 +151,9 @@ private ConnectionProvider instantiateConnectionProvider(
 		else if ( hasConfiguration( configurationValues, C3P0_CONFIG_PREFIX ) ) {
 			return instantiateProvider( strategySelector, C3P0_STRATEGY );
 		}
-		else if (hasConfiguration( configurationValues, PROXOOL_CONFIG_PREFIX )) {
-			return instantiateProvider( strategySelector, PROXOOL_STRATEGY );
-		}
 		else if ( hasConfiguration( configurationValues, HIKARI_CONFIG_PREFIX ) ) {
 			return instantiateProvider( strategySelector, HIKARI_STRATEGY );
 		}
-		else if ( hasConfiguration( configurationValues, "hibernate.vibur" ) ) {
-			return instantiateProvider( strategySelector, VIBUR_STRATEGY );
-		}
 		else if (hasConfiguration( configurationValues, "hibernate.oracleucp" ) ) {
 			return instantiateProvider( strategySelector, UCP_STRATEGY );
 		}

hibernate-platform/hibernate-platform.gradle

@@ -23,8 +23,6 @@ dependencies {
         api project( ":hibernate-agroal" )
         api project( ":hibernate-c3p0" )
         api project( ":hibernate-hikaricp" )
-        api project( ":hibernate-proxool" )
-        api project( ":hibernate-vibur" )
 
         api project( ":hibernate-jcache" )
 
@@ -59,8 +57,6 @@ dependencies {
         runtime libs.agroalPool
         runtime libs.c3p0
         runtime libs.hikaricp
-        runtime libs.proxool
-        runtime libs.vibur
 
         runtime libs.jcache