Skip to content

Commit dd3b69b

Browse files
committed
HHH-19145 - Relicense Hibernate ORM under ASL
HHH-19170 - Move hibernate-envers to separate repository HHH-19100 - Drop the UCP ConnectionProvider https://hibernate.atlassian.net/browse/HHH-19145 https://hibernate.atlassian.net/browse/HHH-19170 https://hibernate.atlassian.net/browse/HHH-19100
1 parent b2a528f commit dd3b69b

File tree

5 files changed

+4
-46
lines changed

5 files changed

+4
-46
lines changed

documentation/src/main/asciidoc/introduction/Tuning.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Perhaps it's better to set this configuration property:
4545
|===
4646
| Configuration property name | Purpose
4747

48-
| link:{doc-javadoc-url}/org/hibernate/cfg/JdbcSettings.html#CONNECTION_PROVIDER[`hibernate.connection.provider_class`] | Explicitly specify a link:{doc-javadoc-url}/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.html[connection pool], for example, `agroal`, `hikaricp`, `c3p0`, or `oracleucp`.
48+
| link:{doc-javadoc-url}/org/hibernate/cfg/JdbcSettings.html#CONNECTION_PROVIDER[`hibernate.connection.provider_class`] | Explicitly specify a link:{doc-javadoc-url}/org/hibernate/engine/jdbc/connections/spi/ConnectionProvider.html[connection pool], for example, `agroal`, `hikaricp` or `c3p0`.
4949
|===
5050

5151
TIP: You can set `hibernate.connection.provider_class` to `agroal` so that Hibernate fails at startup if Agroal is missing.

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-ucp| Support for https://docs.oracle.com/en/database/oracle/oracle-database/23/jjucp/intro.html[Universal Connection Pool] connection pooling
5655
|hibernate-jcache| Integration with https://jcp.org/en/jsr/detail?id=107$$[JCache], allowing any compliant implementation as a second-level cache provider
5756
|hibernate-graalvm| Experimental extension to make it easier to compile applications as a https://www.graalvm.org/[GraalVM] native image
5857
|hibernate-micrometer| Integration with https://micrometer.io[Micrometer] metrics

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

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ Hibernate will internally determine which `ConnectionProvider` to use based on t
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>>
2020
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>>
23-
9. else -> <<database-connectionprovider-provided>>
21+
6. else if `hibernate.connection.url` is set -> <<database-connectionprovider-drivermanager>>
22+
7. else -> <<database-connectionprovider-provided>>
2423

2524
[[database-connectionprovider-datasource]]
2625
=== Using DataSources
@@ -111,38 +110,6 @@ Additionally, this `ConnectionProvider` will pick up the following Hibernate-spe
111110
`hibernate.connection.isolation`:: Mapped to Agroal's `jdbcTransactionIsolation` setting. See <<ConnectionProvider support for transaction isolation setting>>.
112111
`hibernate.connection.autocommit`:: Mapped to Agroal's `autoCommit` setting
113112

114-
[[database-connectionprovider-ucp]]
115-
=== Using Oracle Universal Connection Pool
116-
117-
[IMPORTANT]
118-
====
119-
To use the Universal Connection Pool (aka UCP) integration, the application must include the `hibernate-ucp` module jar (as well as its dependencies) on the classpath.
120-
====
121-
122-
Hibernate also provides support for applications to use https://docs.oracle.com/en/database/oracle/oracle-database/23/jjucp/intro.html[Oracle Universal Connection Pool].
123-
124-
Set all of your UCP settings in Hibernate prefixed by `hibernate.oracleucp.` and this `ConnectionProvider` will pick them up and pass them along to UCP.
125-
Additionally, this `ConnectionProvider` will pick up the following Hibernate-specific properties and map them to the corresponding UCP ones (any `hibernate.oracleucp.` prefixed ones have precedence):
126-
127-
`hibernate.connection.url`:: Mapped to UCP's `URL` setting
128-
`hibernate.connection.username`:: Mapped to UCP's `user` setting
129-
`hibernate.connection.password`:: Mapped to UCP's `password` setting
130-
`hibernate.connection.isolation`:: Used to initialize `Connection` retrieved from UCP. See <<ConnectionProvider support for transaction isolation setting>>.
131-
`hibernate.connection.autocommit`:: Used to initialize `Connection` retrieved from UCP.
132-
Any other settings prefixed with `hibernate.oracleucp.`:: Will have the `hibernate.oracleucp.` portion stripped and be passed to UCP.
133-
134-
[IMPORTANT]
135-
====
136-
You can pass further settings to the `Connection` provided by UCP by using the `hibernate.oracleucp.connectionProperties` property in the following manner:
137-
138-
`hibernate.oracleucp.connectionProperties=oracle.jdbc.thinForceDNSLoadBalancing=true,oracle.jdbc.fanEnabled=true,oracle.jdbc.defaultConnectionValidation=SOCKET,oracle.jdbc.implicitStatementCacheSize=50,oracle.jdbc.loginTimeout=5000`
139-
====
140-
141-
The Hibernate property `hibernate.oracleucp.connectionFactoryClassName` can be used to choose between:
142-
143-
. a standard connection pool: `oracle.jdbc.pool.OracleDataSource`
144-
. a _replay_ connection pool: `oracle.jdbc.replay.OracleDataSourceImpl` which allows using [Transparent] Application Continuity capabilities to mask planned and unplanned downtime
145-
146113
[[database-connectionprovider-drivermanager]]
147114
=== Using Hibernate's built-in (and unsupported) pooling
148115

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public interface JdbcSettings extends C3p0Settings, AgroalSettings, HikariCPSett
235235
* either:
236236
* <ul>
237237
* <li>a short strategy name like {@code agroal}, {@code hikaricp},
238-
* {@code c3p0}, or {@code ucp},
238+
* {@code c3p0},
239239
* <li>an instance of {@code ConnectionProvider},
240240
* <li>a {@link Class} object representing a class that implements
241241
* {@code ConnectionProvider}, or

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
@@ -71,11 +71,6 @@ public class ConnectionProviderInitiator implements StandardServiceInitiator<Con
7171
*/
7272
public static final String HIKARI_STRATEGY = "hikari";
7373

74-
/**
75-
* The strategy for oracle ucp connection pooling
76-
*/
77-
public static final String UCP_STRATEGY = "ucp";
78-
7974
/**
8075
* The strategy for agroal connection pooling
8176
*/
@@ -164,9 +159,6 @@ else if ( hasConfiguration( configurationValues, C3P0_CONFIG_PREFIX ) ) {
164159
else if ( hasConfiguration( configurationValues, HIKARI_CONFIG_PREFIX ) ) {
165160
return instantiateProvider( strategySelector, HIKARI_STRATEGY );
166161
}
167-
else if (hasConfiguration( configurationValues, "hibernate.oracleucp" ) ) {
168-
return instantiateProvider( strategySelector, UCP_STRATEGY );
169-
}
170162
else if ( hasConfiguration( configurationValues, AGROAL_CONFIG_PREFIX ) ) {
171163
return instantiateProvider( strategySelector, AGROAL_STRATEGY );
172164
}

0 commit comments

Comments
 (0)