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
8 changes: 7 additions & 1 deletion hibernate-core/hibernate-core.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,13 @@ dependencies {

testRuntimeOnly libs.byteBuddy
testRuntimeOnly testLibs.weld
testRuntimeOnly testLibs.wildFlyTxnClient
implementation(libs.logging)
testRuntimeOnly(testLibs.wildFlyTxnClient) {
// WildFly Elytron includes a whole copy of JBoss Logging, Jackson with its original package,
// not even shaded, which causes lots of problems.
// Since we don't need WildFly Elytron in our tests, we'll just exclude it.
exclude group: 'org.wildfly.security', module: 'wildfly-elytron'
}
testImplementation libs.jandex
testImplementation jakartaLibs.jsonb
testImplementation libs.jackson
Expand Down
15 changes: 14 additions & 1 deletion hibernate-testing/hibernate-testing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,20 @@ dependencies {

implementation libs.hibernateModels
implementation libs.jandex
implementation testLibs.wildFlyTxnClient
implementation(libs.logging)
// See https://hibernate.atlassian.net/browse/HHH-19743
// While this dependency isn't explicitly used, removing it will lead to using JBossStandAloneJtaPlatform
// by default in tests, which will apparently lead to leaks detected by HibernateClassLoaderLeaksTest,
// which will fail.
// JBossStandAloneJtaPlatform is old and likely wouldn't work with Jakarta EE anyway,
// so I won't try to fix it, but we might want to remove it in the next minor,
// and then we can remove the dependency below.
implementation(testLibs.wildFlyTxnClient) {
// WildFly Elytron includes a whole copy of JBoss Logging, Jackson with its original package,
// not even shaded, which causes lots of problems.
// Since we don't need WildFly Elytron in our tests, we'll just exclude it.
exclude group: 'org.wildfly.security', module: 'wildfly-elytron'
}
implementation testLibs.junit5Engine
implementation testLibs.junit5Launcher

Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ dependencyResolutionManagement {
def shrinkwrapVersion = version "shrinkwrap", "1.2.6"
def shrinkwrapDescriptorsVersion = version "shrinkwrapDescriptors", "2.0.0"
def weldVersion = version "weld", "6.0.3.Final"
def wildFlyTxnClientVersion = version "wildFlyTxnClient", "2.0.0.Final"
def wildFlyTxnClientVersion = version "wildFlyTxnClient", "3.0.5.Final"

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

Expand Down Expand Up @@ -212,7 +212,7 @@ dependencyResolutionManagement {

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 )
library( "wildFlyTxnClient", "org.wildfly.transaction", "wildfly-transaction-client" ).versionRef( wildFlyTxnClientVersion )

library( "weld", "org.jboss.weld.se", "weld-se-shaded" ).versionRef( weldVersion )

Expand Down
Loading