Skip to content

Commit 227cd1c

Browse files
committed
HHH-18902 completely remove Vibur
it has not been updated in 5 years
1 parent 30c15ce commit 227cd1c

File tree

15 files changed

+3
-605
lines changed

15 files changed

+3
-605
lines changed

documentation/documentation.gradle

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ configurations {
5252
agroal
5353
c3p0
5454
hikaricp
55-
vibur
5655

5756
jcache
5857

@@ -71,7 +70,6 @@ configurations {
7170
extendsFrom agroal
7271
extendsFrom c3p0
7372
extendsFrom hikaricp
74-
extendsFrom vibur
7573
extendsFrom jcache
7674
extendsFrom jpamodelgen
7775
}
@@ -132,7 +130,6 @@ dependencies {
132130
reportAggregation project(':hibernate-jcache')
133131
reportAggregation project(':hibernate-micrometer')
134132
reportAggregation project(':hibernate-spatial')
135-
reportAggregation project(':hibernate-vibur')
136133
reportAggregation project(':hibernate-ant')
137134
reportAggregation project(':hibernate-maven-plugin')
138135
reportAggregation project(':hibernate-processor')
@@ -160,9 +157,6 @@ dependencies {
160157
hikaricp project( ':hibernate-hikaricp' )
161158
javadocSources project( path: ':hibernate-hikaricp', configuration: 'javadocSources' )
162159

163-
vibur project( ':hibernate-vibur' )
164-
javadocSources project( path: ':hibernate-vibur', configuration: 'javadocSources' )
165-
166160
jcache project( ':hibernate-jcache' )
167161
javadocSources project( path: ':hibernate-jcache', configuration: 'javadocSources' )
168162

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ transitive dependencies based on the features being used or not.
5252
|hibernate-agroal| Support for https://agroal.github.io/[Agroal] connection pooling
5353
|hibernate-c3p0| Support for https://www.mchange.com/projects/c3p0/[C3P0] connection pooling
5454
|hibernate-hikaricp| Support for https://github.com/brettwooldridge/HikariCP/[HikariCP] connection pooling
55-
|hibernate-vibur| Support for https://www.vibur.org/[Vibur DBCP] connection pooling
5655
|hibernate-ucp| Support for https://docs.oracle.com/en/database/oracle/oracle-database/23/jjucp/intro.html[Universal Connection Pool] connection pooling
5756
|hibernate-jcache| Integration with https://jcp.org/en/jsr/detail?id=107$$[JCache], allowing any compliant implementation as a second-level cache provider
5857
|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

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ Hibernate will internally determine which `ConnectionProvider` to use based on t
1717
2. else if `hibernate.connection.datasource` is set -> <<database-connectionprovider-datasource>>
1818
3. else if any setting prefixed by `hibernate.c3p0.` is set -> <<database-connectionprovider-c3p0>>
1919
4. else if any setting prefixed by `hibernate.hikari.` is set -> <<database-connectionprovider-hikari>>
20-
5. else if any setting prefixed by `hibernate.vibur.` is set -> <<database-connectionprovider-vibur>>
21-
6. else if any setting prefixed by `hibernate.agroal.` is set -> <<database-connectionprovider-agroal>>
22-
7. else if any setting prefixed by `hibernate.oracleucp.` is set -> <<database-connectionprovider-ucp>>
23-
8. else if `hibernate.connection.url` is set -> <<database-connectionprovider-drivermanager>>
20+
5. else if any setting prefixed by `hibernate.agroal.` is set -> <<database-connectionprovider-agroal>>
21+
6. else if any setting prefixed by `hibernate.oracleucp.` is set -> <<database-connectionprovider-ucp>>
22+
7. else if `hibernate.connection.url` is set -> <<database-connectionprovider-drivermanager>>
2423
9. else -> <<database-connectionprovider-provided>>
2524

2625
[[database-connectionprovider-datasource]]
@@ -92,26 +91,6 @@ Additionally, this `ConnectionProvider` will pick up the following Hibernate-spe
9291
Note that Hikari only supports JDBC standard isolation levels (apparently).
9392
`hibernate.connection.autocommit`:: Mapped to Hikari's `autoCommit` setting
9493

95-
[[database-connectionprovider-vibur]]
96-
=== Using Vibur DBCP
97-
98-
[IMPORTANT]
99-
====
100-
To use the Vibur DBCP integration, the application must include the `hibernate-vibur` module jar (as well as its dependencies) on the classpath.
101-
====
102-
103-
Hibernate also provides support for applications to use https://www.vibur.org/[Vibur DBCP] connection pool.
104-
105-
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.
106-
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):
107-
108-
`hibernate.connection.driver_class`:: Mapped to Vibur's `driverClassName` setting
109-
`hibernate.connection.url`:: Mapped to Vibur's `jdbcUrl` setting
110-
`hibernate.connection.username`:: Mapped to Vibur's `username` setting
111-
`hibernate.connection.password`:: Mapped to Vibur's `password` setting
112-
`hibernate.connection.isolation`:: Mapped to Vibur's `defaultTransactionIsolationValue` setting. See <<ConnectionProvider support for transaction isolation setting>>.
113-
`hibernate.connection.autocommit`:: Mapped to Vibur's `defaultAutoCommit` setting
114-
11594
[[database-connectionprovider-agroal]]
11695
=== Using Agroal
11796

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,6 @@ public class ConnectionProviderInitiator implements StandardServiceInitiator<Con
7070
*/
7171
public static final String HIKARI_STRATEGY = "hikari";
7272

73-
/**
74-
* The strategy for vibur connection pooling
75-
*/
76-
public static final String VIBUR_STRATEGY = "vibur";
77-
7873
/**
7974
* The strategy for oracle ucp connection pooling
8075
*/
@@ -159,9 +154,6 @@ else if ( hasConfiguration( configurationValues, C3P0_CONFIG_PREFIX ) ) {
159154
else if ( hasConfiguration( configurationValues, HIKARI_CONFIG_PREFIX ) ) {
160155
return instantiateProvider( strategySelector, HIKARI_STRATEGY );
161156
}
162-
else if ( hasConfiguration( configurationValues, "hibernate.vibur" ) ) {
163-
return instantiateProvider( strategySelector, VIBUR_STRATEGY );
164-
}
165157
else if (hasConfiguration( configurationValues, "hibernate.oracleucp" ) ) {
166158
return instantiateProvider( strategySelector, UCP_STRATEGY );
167159
}

hibernate-platform/hibernate-platform.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ dependencies {
2323
api project( ":hibernate-agroal" )
2424
api project( ":hibernate-c3p0" )
2525
api project( ":hibernate-hikaricp" )
26-
api project( ":hibernate-vibur" )
2726

2827
api project( ":hibernate-jcache" )
2928

@@ -58,7 +57,6 @@ dependencies {
5857
runtime libs.agroalPool
5958
runtime libs.c3p0
6059
runtime libs.hikaricp
61-
runtime libs.vibur
6260

6361
runtime libs.jcache
6462

hibernate-vibur/hibernate-vibur.gradle

Lines changed: 0 additions & 20 deletions
This file was deleted.

hibernate-vibur/src/main/java/org/hibernate/vibur/internal/StrategyRegistrationProviderImpl.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

hibernate-vibur/src/main/java/org/hibernate/vibur/internal/ViburDBCPConnectionProvider.java

Lines changed: 0 additions & 191 deletions
This file was deleted.

hibernate-vibur/src/main/java/org/hibernate/vibur/internal/package-info.java

Lines changed: 0 additions & 11 deletions
This file was deleted.

hibernate-vibur/src/main/resources/META-INF/services/org.hibernate.boot.registry.selector.StrategyRegistrationProvider

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)