Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/databases.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ if ( processTestResourcesTask != null ) {
processTestResourcesTask.inputs.property( 'dbHost', dbHost )
// processTestResourcesTask.inputs.property( "gradle.libs.versions.h2", project.getProperty( "gradle.libs.versions.h2", "2.1.214" ) )
// processTestResourcesTask.inputs.property( "gradle.libs.versions.h2gis", project.getProperty( "gradle.libs.versions.h2gis", "2.1.0" ) )
// processTestResourcesTask.inputs.property( "gradle.libs.versions.hsqldb", project.getProperty( "gradle.libs.versions.hsqldb", "2.7.2" ) )
// processTestResourcesTask.inputs.property( "gradle.libs.versions.hsqldb", project.getProperty( "gradle.libs.versions.hsqldb", "2.7.4" ) )
// processTestResourcesTask.inputs.property( "gradle.libs.versions.derby", project.getProperty( "gradle.libs.versions.derby", "10.15.2.0" ) )
processTestResourcesTask.filter( ReplaceTokens, tokens: dbBundle[db] )
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@

import org.hibernate.c3p0.internal.C3P0ConnectionProvider;
import org.hibernate.cfg.Environment;
import org.hibernate.dialect.SybaseASEDialect;
import org.hibernate.engine.jdbc.env.internal.JdbcEnvironmentInitiator.ConnectionProviderJdbcConnectionAccess;
import org.hibernate.engine.jdbc.spi.JdbcServices;

import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.testing.orm.junit.SkipForDialect;
import org.junit.Test;

import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
Expand All @@ -27,6 +29,8 @@
/**
* @author Strong Liu
*/
@SkipForDialect(dialectClass = SybaseASEDialect.class,
reason = "JtdsConnection.isValid not implemented")
public class C3P0ConnectionProviderTest extends BaseCoreFunctionalTestCase {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.c3p0.internal.C3P0ConnectionProvider;
import org.hibernate.community.dialect.AltibaseDialect;
import org.hibernate.dialect.SybaseASEDialect;
import org.hibernate.dialect.TiDBDialect;
import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
import org.hibernate.service.spi.ServiceRegistryImplementor;
Expand All @@ -21,6 +22,7 @@
*/
@SkipForDialect(value = TiDBDialect.class, comment = "Doesn't support SERIALIZABLE isolation")
@SkipForDialect(value = AltibaseDialect.class, comment = "Altibase cannot change isolation level in autocommit mode")
@SkipForDialect(value = SybaseASEDialect.class, comment = "JtdsConnection.isValid not implemented")
public class C3p0TransactionIsolationConfigTest extends BaseTransactionIsolationConfigTest {
private StandardServiceRegistry ssr;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;

import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SybaseASEDialect;
import org.hibernate.testing.orm.junit.SkipForDialect;
import org.junit.Assert;
import org.junit.Test;

Expand All @@ -20,9 +23,13 @@
*
* @author Shawn Clowater
*/
@SkipForDialect(dialectClass = SybaseASEDialect.class,
reason = "JtdsConnection.isValid not implemented")
public class StatementCacheTest extends BaseCoreFunctionalTestCase {
@Test
@JiraKey(value = "HHH-7193")
@SkipForDialect(dialectClass = SQLServerDialect.class,
reason = "started failing after upgrade to c3p0 0.10")
public void testStatementCaching() {
inSession(
session -> {
Expand Down Expand Up @@ -56,7 +63,8 @@ public void testStatementCaching() {
}
);

//only one entity should have been inserted to the database (if the statement in the cache wasn't cleared then it would have inserted both entities)
// only one entity should have been inserted to the database
// (if the statement in the cache wasn't cleared then it would have inserted both entities)
inTransaction(
session -> {
CriteriaBuilder criteriaBuilder = session.getCriteriaBuilder();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
@RequiresDialect(MySQLDialect.class)
@RequiresDialect(SQLServerDialect.class)
@RequiresDialect(PostgreSQLDialect.class)
@RequiresDialect(DB2Dialect.class)
@RequiresDialect(value = DB2Dialect.class, majorVersion = 11)
@RequiresDialect(OracleDialect.class)
public class CustomSqlRestrictionOverridesTest {
@Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@

import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.Configuration;
import org.hibernate.dialect.HANADialect;
import org.hibernate.testing.orm.junit.JiraKey;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.testing.orm.junit.SkipForDialect;
import org.junit.Test;

import jakarta.persistence.*;

import static org.hibernate.testing.transaction.TransactionUtil.doInHibernate;

@SkipForDialect( dialectClass = HANADialect.class,
reason = "The INSERT statement for table [Child] contains no column, and this is not supported")
public class ReSaveReferencedDeletedEntity extends BaseCoreFunctionalTestCase {
@Override
protected Class<?>[] getAnnotatedClasses() {
Expand Down
4 changes: 2 additions & 2 deletions hibernate-testing/hibernate-testing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ dependencies {
api testLibs.assertjCore

api testLibs.mockito
api testLibs.mockitoInline
// api testLibs.mockitoInline

api testLibs.byteman
api testLibs.bytemanInstall
api testLibs.bytemanBmunit

api testLibs.xapool
// api testLibs.xapool
api( testLibs.jbossTxSpi ) {
transitive=false;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class TransactionUtil2 {
public static void inSession(SessionFactoryImplementor sfi, Consumer<SessionImplementor> action) {
log.trace( "#inSession(SF,action)" );

try (SessionImplementor session = (SessionImplementor) sfi.openSession()) {
try (SessionImplementor session = sfi.openSession()) {
log.trace( "Session opened, calling action" );
action.accept( session );
log.trace( "called action" );
Expand All @@ -41,7 +41,7 @@ public static void inSession(SessionFactoryImplementor sfi, Consumer<SessionImpl
public static <R> R fromSession(SessionFactoryImplementor sfi, Function<SessionImplementor,R> action) {
log.trace( "#inSession(SF,action)" );

try (SessionImplementor session = (SessionImplementor) sfi.openSession()) {
try (SessionImplementor session = sfi.openSession()) {
log.trace( "Session opened, calling action" );
return action.apply( session );
}
Expand All @@ -54,7 +54,7 @@ public static <R> R inSessionReturn(SessionFactoryImplementor sfi, Function<Sess
log.trace( "#inSession(SF,action)" );

R result = null;
try (SessionImplementor session = (SessionImplementor) sfi.openSession()) {
try (SessionImplementor session = sfi.openSession()) {
log.trace( "Session opened, calling action" );
result = action.apply( session );
log.trace( "called action" );
Expand Down
60 changes: 30 additions & 30 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,21 @@ dependencyResolutionManagement {
def antlrVersion = version "antlr", "4.13.0"
// WARNING: When upgrading to a version of bytebuddy that supports a new bytecode version,
// make sure to remove the now unnecessary net.bytebuddy.experimental=true in relevant CI jobs (Jenkinsfile).
def byteBuddyVersion = version "byteBuddy", "1.14.18"
def classmateVersion = version "classmate", "1.5.1"
def byteBuddyVersion = version "byteBuddy", "1.15.10"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @gavinking could you please file a Jira issue next time you upgrade a dependency -- especially Bytebuddy? It's a very sensitive dependency that impacts our support of versions of OpenJDK, so worth mentioning in changelogs in particular.

def classmateVersion = version "classmate", "1.7.0"
def geolatteVersion = version "geolatte", "1.9.1"
def hibernateModelsVersion = version "hibernateModels", "0.9.3"
def jandexVersion = version "jandex", "3.2.0"
def jacksonVersion = version "jackson", "2.17.0"
def jbossLoggingVersion = version "jbossLogging", "3.6.0.Final"
def jbossLoggingToolVersion = version "jbossLoggingTool", "3.0.2.Final"

def agroalVersion = version "agroal", "2.0"
def c3poVersion = version"c3p0", "0.9.5.5"
def hikaricpVersion = version "hikaricp", "3.2.0"
def jandexVersion = version "jandex", "3.2.3"
def jacksonVersion = version "jackson", "2.18.2"
def jbossLoggingVersion = version "jbossLogging", "3.6.1.Final"
def jbossLoggingToolVersion = version "jbossLoggingTool", "3.0.3.Final"

def agroalVersion = version "agroal", "2.5"
def c3poVersion = version "c3p0", "0.10.1"
def hikaricpVersion = version "hikaricp", "6.2.1"
def proxoolVersion = version "proxool", "0.8.3"
def viburVersion = version "vibur", "25.0"
def ucpVersion = version "ucp", "23.4.0.24.05"
def ucpVersion = version "ucp", "23.6.0.24.10"

def jcacheVersion = version "jcache", "1.0.0"
def ehcache3Version = version "ehcache3", "3.10.8"
Expand Down Expand Up @@ -174,22 +174,22 @@ dependencyResolutionManagement {
library( "el", "org.glassfish.expressly", "expressly" ).versionRef( elVersion )
}
testLibs {
def junit5Version = version "junit5", "5.10.2"
def junit5Version = version "junit5", "5.11.3"
def junit4Version = version "junit4", "4.13.2"
def junit5LauncherVersion = version "junit5Launcher", "1.10.2"
def junit5LauncherVersion = version "junit5Launcher", "1.11.3"

def assertjVersion = version "assertj", "3.22.0"
def bytemanVersion = version "byteman", "4.0.20"
def jbossJtaVersion = version "jbossJta", "7.0.0.Final"
def assertjVersion = version "assertj", "3.26.3"
def bytemanVersion = version "byteman", "4.0.23"
def jbossJtaVersion = version "jbossJta", "7.1.0.Final"
def jbossTxSpiVersion = version "jbossTxSpi", "8.0.0.Final"
def log4jVersion = version "log4j", "2.17.1"
def mockitoVersion = version "mockito", "5.2.0"
def log4jVersion = version "log4j", "2.24.2"
def mockitoVersion = version "mockito", "5.14.2"
//Compatible with JDK20
def shrinkwrapVersion = version "shrinkwrap", "1.2.6"
def shrinkwrapDescriptorsVersion = version "shrinkwrapDescriptors", "2.0.0"
def weldVersion = version "weld", "4.0.1.SP1"
def weldVersion = version "weld", "5.1.3.Final"
def wildFlyTxnClientVersion = version "wildFlyTxnClient", "2.0.0.Final"
def xapoolVersion = version "xapool", "1.5.0"
// def xapoolVersion = version "xapool", "1.5.0"

def jfrUnitVersion = version "jfrUnit", "1.0.0.Alpha2"

Expand All @@ -215,9 +215,9 @@ dependencyResolutionManagement {
library( "bytemanBmunit", "org.jboss.byteman", "byteman-bmunit" ).versionRef( bytemanVersion )

library( "mockito", "org.mockito", "mockito-core" ).versionRef( mockitoVersion )
library( "mockitoInline", "org.mockito", "mockito-inline" ).versionRef( mockitoVersion )
// library( "mockitoInline", "org.mockito", "mockito-inline" ).versionRef( mockitoVersion )

library( "xapool", "com.experlog", "xapool" ).versionRef( xapoolVersion )
// library( "xapool", "com.experlog", "xapool" ).versionRef( xapoolVersion )
library( "jbossJta", "org.jboss.narayana.jta", "narayana-jta" ).versionRef( jbossJtaVersion )
library( "jbossTxSpi", "org.jboss", "jboss-transaction-spi" ).versionRef( jbossTxSpiVersion )
library( "wildFlyTxnClient", "org.wildfly.transaction", "wildfly-transaction-client-jakarta" ).versionRef( wildFlyTxnClientVersion )
Expand All @@ -233,16 +233,16 @@ dependencyResolutionManagement {
// Latest Derby version 10.16.1.1 only supports JDK 17+, but 10.15.2 should be compatible
def derbyVersion = version "derby", overrideableVersion( "gradle.libs.versions.derby", "10.15.2.0" )
def firebirdVersion = version "firebird", "4.0.8.java11"
def hanaVersion = version "hana", "2.19.11"
def h2gisVersion = version "h2gis", overrideableVersion( "gradle.libs.versions.h2gis", "2.2.2" )
def hsqldbVersion = version "hsqldb", overrideableVersion( "gradle.libs.versions.hsqldb", "2.7.2" )
def informixVersion = version "informix", "4.50.10.1"
def mariadbVersion = version "mariadb", "3.4.0"
def mssqlVersion = version "mssql", "12.4.2.jre11"
def mysqlVersion = version "mysql", "8.2.0"
def hanaVersion = version "hana", "2.22.12"
def h2gisVersion = version "h2gis", overrideableVersion( "gradle.libs.versions.h2gis", "2.2.3" )
def hsqldbVersion = version "hsqldb", overrideableVersion( "gradle.libs.versions.hsqldb", "2.7.4" )
def informixVersion = version "informix", "4.50.11"
def mariadbVersion = version "mariadb", "3.5.1"
def mssqlVersion = version "mssql", "12.8.1.jre11"
def mysqlVersion = version "mysql", "9.1.0"
def oracleVersion = version "oracle", "23.4.0.24.05"
def oracleLegacyVersion = version "oracleLegacy", "11.2.0.4"
def pgsqlVersion = version "pgsql", "42.7.1"
def pgsqlVersion = version "pgsql", "42.7.4"
def sybaseVersion = version "sybase", "1.3.1"
def tidbVersion = version "tidb", mysqlVersion
def altibaseVersion = version "altibase", "7.3.0.0.3"
Expand Down