From 863faf4c980ce67dee03b785a17980dc94ae5f57 Mon Sep 17 00:00:00 2001 From: Sanne Grinovero Date: Thu, 19 Jan 2023 11:55:26 +0000 Subject: [PATCH] HHH-16060 Upgrade Narayana used for integration testing to version 6.0.0.CR1 --- .../hibernate-integrationtest-java-modules.gradle | 4 ++++ settings.gradle | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle b/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle index 339fa5f355..cf1ef6691b 100644 --- a/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle +++ b/hibernate-integrationtest-java-modules/hibernate-integrationtest-java-modules.gradle @@ -20,6 +20,10 @@ checkstyleMain.exclude '**/module-info.java' dependencies { api project( ':hibernate-core' ) api project( ':hibernate-envers' ) + //Provide the jakarta.cdi module, as it's required by module jakarta.transaction + //but not provided as transitive dependency of Narayana. + testRuntimeOnly( jakartaLibs.cdi ) + testRuntimeOnly( jakartaLibs.interceptors ) } test { diff --git a/settings.gradle b/settings.gradle index 3bb5b8080d..7b25f103e3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -108,10 +108,11 @@ dependencyResolutionManagement { // `jakartaJpaVersion` comes from the local-build-plugins to allow for command-line overriding of the JPA version to use alias( "jpa" ).to( "jakarta.persistence", "jakarta.persistence-api" ).version( "${jakartaJpaVersion}" ) - alias( "jta" ).to( "jakarta.transaction", "jakarta.transaction-api" ).version( "2.0.0") + alias( "jta" ).to( "jakarta.transaction", "jakarta.transaction-api" ).version( "2.0.1") alias( "validation" ).to( "jakarta.validation", "jakarta.validation-api" ).version( "3.0.0" ) alias( "jacc" ).to( "jakarta.authorization", "jakarta.authorization-api" ).version( "2.0.0" ) alias( "cdi" ).to( "jakarta.enterprise", "jakarta.enterprise.cdi-api" ).version( "3.0.0" ) + alias( "interceptors" ).to( "jakarta.interceptor", "jakarta.interceptor-api" ).version( "2.1.0" ) alias( "jsonbApi" ).to( "jakarta.json.bind", "jakarta.json.bind-api" ).version( "2.0.0" ) alias( "jsonb" ).to( "org.eclipse", "yasson" ).versionRef( "jsonbRuntime" ) alias( "inject" ).to( "jakarta.inject", "jakarta.inject-api" ).version( "2.0.0" ) @@ -154,7 +155,7 @@ dependencyResolutionManagement { alias( "shrinkwrapDescriptors" ).to( "org.jboss.shrinkwrap.descriptors", "shrinkwrap-descriptors-impl-javaee" ).versionRef( "shrinkwrapDescriptors" ) alias( "shrinkwrapDescriptorsApi" ).to( "org.jboss.shrinkwrap.descriptors", "shrinkwrap-descriptors-api-javaee" ).versionRef( "shrinkwrapDescriptors" ) - alias( "jbossJta" ).to( "org.jboss.narayana.jta", "narayana-jta-jakarta" ).version( "5.11.2.Final" ) + alias( "jbossJta" ).to( "org.jboss.narayana.jta", "narayana-jta" ).version( "6.0.0.CR1" ) alias( "jbossTxSpi" ).to( "org.jboss", "jboss-transaction-spi-jakarta" ).version( "7.6.1.Final" ) alias( "wildFlyTxnClient" ).to( "org.wildfly.transaction", "wildfly-transaction-client-jakarta" ).version( "2.0.0.Final" ) alias( "weld" ).to( "org.jboss.weld.se", "weld-se-shaded" ).version( "4.0.1.SP1" )