Commit a14adad

committed

HHH-19723 Upgrade from wildfly-transaction-client-jakarta 2.x to wildfly-transaction-client 3.x in hibernate-testing

1 parent 27f3ea6 commit a14adadCopy full SHA for a14adad

File tree

+23

-4

lines changed

+23

-4

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,13 @@ dependencies {`
`63`	`63`
`64`	`64`	`testRuntimeOnly libs.byteBuddy`
`65`	`65`	`testRuntimeOnly testLibs.weld`
`66`		`- testRuntimeOnly testLibs.wildFlyTxnClient`
	`66`	`+ implementation(libs.logging)`
	`67`	`+ testRuntimeOnly(testLibs.wildFlyTxnClient) {`
	`68`	`+ // WildFly Elytron includes a whole copy of JBoss Logging, Jackson with its original package,`
	`69`	`+ // not even shaded, which causes lots of problems.`
	`70`	`+ // Since we don't need WildFly Elytron in our tests, we'll just exclude it.`
	`71`	`+ exclude group: 'org.wildfly.security', module: 'wildfly-elytron'`
	`72`	`+ }`
`67`	`73`	`testImplementation libs.jandex`
`68`	`74`	`testImplementation jakartaLibs.jsonb`
`69`	`75`	`testImplementation libs.jackson`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,20 @@ dependencies {`
`41`	`41`
`42`	`42`	`implementation libs.hibernateModels`
`43`	`43`	`implementation libs.jandex`
`44`		`- implementation testLibs.wildFlyTxnClient`
	`44`	`+ implementation(libs.logging)`
	`45`	`+ // See https://hibernate.atlassian.net/browse/HHH-19743`
	`46`	`+ // While this dependency isn't explicitly used, removing it will lead to using JBossStandAloneJtaPlatform`
	`47`	`+ // by default in tests, which will apparently lead to leaks detected by HibernateClassLoaderLeaksTest,`
	`48`	`+ // which will fail.`
	`49`	`+ // JBossStandAloneJtaPlatform is old and likely wouldn't work with Jakarta EE anyway,`
	`50`	`+ // so I won't try to fix it, but we might want to remove it in the next minor,`
	`51`	`+ // and then we can remove the dependency below.`
	`52`	`+ implementation(testLibs.wildFlyTxnClient) {`
	`53`	`+ // WildFly Elytron includes a whole copy of JBoss Logging, Jackson with its original package,`
	`54`	`+ // not even shaded, which causes lots of problems.`
	`55`	`+ // Since we don't need WildFly Elytron in our tests, we'll just exclude it.`
	`56`	`+ exclude group: 'org.wildfly.security', module: 'wildfly-elytron'`
	`57`	`+ }`
`45`	`58`	`implementation testLibs.junit5Engine`
`46`	`59`	`implementation testLibs.junit5Launcher`
`47`	`60`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ dependencyResolutionManagement {`
`182`	`182`	`def shrinkwrapVersion = version "shrinkwrap", "1.2.6"`
`183`	`183`	`def shrinkwrapDescriptorsVersion = version "shrinkwrapDescriptors", "2.0.0"`
`184`	`184`	`def weldVersion = version "weld", "6.0.3.Final"`
`185`		`- def wildFlyTxnClientVersion = version "wildFlyTxnClient", "2.0.0.Final"`
	`185`	`+ def wildFlyTxnClientVersion = version "wildFlyTxnClient", "3.0.5.Final"`
`186`	`186`
`187`	`187`	`def jfrUnitVersion = version "jfrUnit", "1.0.0.Alpha2"`
`188`	`188`
`@@ -212,7 +212,7 @@ dependencyResolutionManagement {`
`212`	`212`
`213`	`213`	`library( "jbossJta", "org.jboss.narayana.jta", "narayana-jta" ).versionRef( jbossJtaVersion )`
`214`	`214`	`library( "jbossTxSpi", "org.jboss", "jboss-transaction-spi" ).versionRef( jbossTxSpiVersion )`
`215`		`- library( "wildFlyTxnClient", "org.wildfly.transaction", "wildfly-transaction-client-jakarta" ).versionRef( wildFlyTxnClientVersion )`
	`215`	`+ library( "wildFlyTxnClient", "org.wildfly.transaction", "wildfly-transaction-client" ).versionRef( wildFlyTxnClientVersion )`
`216`	`216`
`217`	`217`	`library( "weld", "org.jboss.weld.se", "weld-se-shaded" ).versionRef( weldVersion )`
`218`	`218`

Comments

(0)