From 03384af94325537fba3ce11c0a2343524d098de5 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Tue, 26 Apr 2022 14:40:08 -0500 Subject: [PATCH] More work on hibernate-platform and version catalog --- hibernate-agroal/hibernate-agroal.gradle | 6 ++-- hibernate-c3p0/hibernate-c3p0.gradle | 4 +-- hibernate-hikaricp/hibernate-hikaricp.gradle | 2 +- hibernate-jcache/hibernate-jcache.gradle | 2 +- .../hibernate-micrometer.gradle | 2 +- hibernate-platform/hibernate-platform.gradle | 30 +++++++++++++++++-- hibernate-proxool/hibernate-proxool.gradle | 2 +- hibernate-vibur/hibernate-vibur.gradle | 5 ++-- settings.gradle | 17 +++++++++++ 9 files changed, 55 insertions(+), 15 deletions(-) diff --git a/hibernate-agroal/hibernate-agroal.gradle b/hibernate-agroal/hibernate-agroal.gradle index 1b75058101..54ae8107de 100644 --- a/hibernate-agroal/hibernate-agroal.gradle +++ b/hibernate-agroal/hibernate-agroal.gradle @@ -10,11 +10,9 @@ description = 'Integration for Agroal as a ConnectionProvider for Hibernate ORM' apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { - var agroalVersion = "1.14" - implementation project( ':hibernate-core' ) - implementation "io.agroal:agroal-api:${agroalVersion}" + implementation libs.agroal testImplementation project( ':hibernate-testing' ) - testRuntimeOnly "io.agroal:agroal-pool:${agroalVersion}" + testRuntimeOnly libs.agroalPool } diff --git a/hibernate-c3p0/hibernate-c3p0.gradle b/hibernate-c3p0/hibernate-c3p0.gradle index b0720799a4..9e68c8a25b 100644 --- a/hibernate-c3p0/hibernate-c3p0.gradle +++ b/hibernate-c3p0/hibernate-c3p0.gradle @@ -11,14 +11,14 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { implementation project( ':hibernate-core' ) - implementation "com.mchange:c3p0:0.9.5.5" + implementation libs.c3p0 testImplementation project( ':hibernate-testing' ) testImplementation libs.validator testRuntimeOnly jakartaLibs.el if ( db.equalsIgnoreCase( 'oracle' ) ) { - testRuntimeOnly libraries.oracle + testRuntimeOnly dbLibs.oracle } } diff --git a/hibernate-hikaricp/hibernate-hikaricp.gradle b/hibernate-hikaricp/hibernate-hikaricp.gradle index ccbd1ff9f3..0729d5cf88 100644 --- a/hibernate-hikaricp/hibernate-hikaricp.gradle +++ b/hibernate-hikaricp/hibernate-hikaricp.gradle @@ -11,7 +11,7 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { implementation project( ':hibernate-core' ) - implementation "com.zaxxer:HikariCP:3.2.0" + implementation libs.hikaricp testImplementation project( ':hibernate-testing' ) } diff --git a/hibernate-jcache/hibernate-jcache.gradle b/hibernate-jcache/hibernate-jcache.gradle index 0f6377e658..690c896b56 100644 --- a/hibernate-jcache/hibernate-jcache.gradle +++ b/hibernate-jcache/hibernate-jcache.gradle @@ -5,7 +5,7 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { api project( ':hibernate-core' ) - api "javax.cache:cache-api:1.0.0" + api libs.jcache testImplementation project( ':hibernate-testing' ) diff --git a/hibernate-micrometer/hibernate-micrometer.gradle b/hibernate-micrometer/hibernate-micrometer.gradle index 421df4d70e..1e331ad421 100644 --- a/hibernate-micrometer/hibernate-micrometer.gradle +++ b/hibernate-micrometer/hibernate-micrometer.gradle @@ -4,7 +4,7 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { implementation project( ':hibernate-core' ) - implementation "io.micrometer:micrometer-core:1.6.1" + implementation libs.micrometer testImplementation project( ':hibernate-testing' ) diff --git a/hibernate-platform/hibernate-platform.gradle b/hibernate-platform/hibernate-platform.gradle index a17d3538bc..f9d8ef17f6 100644 --- a/hibernate-platform/hibernate-platform.gradle +++ b/hibernate-platform/hibernate-platform.gradle @@ -9,6 +9,7 @@ dependencies { constraints { api project( ":hibernate-core" ) api project( ":hibernate-testing" ) + api project( ":hibernate-envers" ) api project( ":hibernate-spatial" ) @@ -28,11 +29,36 @@ dependencies { api project( ":hibernate-enhance-maven-plugin" ) api project( ":hibernate-ant" ) + api libs.hcann + api jakartaLibs.jpa api jakartaLibs.jta - api libs.byteBuddy - api "net.bytebuddy:byte-buddy-agent:${libs.versions.byteBuddy}" + runtime libs.antlr + runtime libs.logging + runtime libs.byteBuddy + runtime libs.byteBuddyAgent + runtime libs.jandex + runtime libs.classmate + + runtime jakartaLibs.jaxb + runtime jakartaLibs.jaxbApi + runtime jakartaLibs.inject + + + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // todo : imo these are questionable + runtime libs.agroal + runtime libs.agroalPool + runtime libs.c3p0 + runtime libs.hikaricp + runtime libs.proxool + runtime libs.vibur + + runtime libs.jcache + + runtime libs.micrometer + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ } } diff --git a/hibernate-proxool/hibernate-proxool.gradle b/hibernate-proxool/hibernate-proxool.gradle index 80528f1d16..679c5340dc 100644 --- a/hibernate-proxool/hibernate-proxool.gradle +++ b/hibernate-proxool/hibernate-proxool.gradle @@ -12,7 +12,7 @@ apply from: rootProject.file( 'gradle/published-java-module.gradle' ) dependencies { implementation project( ':hibernate-core' ) - implementation "proxool:proxool:0.8.3" + implementation libs.proxool testImplementation project( ':hibernate-testing' ) } diff --git a/hibernate-vibur/hibernate-vibur.gradle b/hibernate-vibur/hibernate-vibur.gradle index 8b09cb006e..1702a15b44 100644 --- a/hibernate-vibur/hibernate-vibur.gradle +++ b/hibernate-vibur/hibernate-vibur.gradle @@ -9,13 +9,12 @@ description = 'Integration for Vibur Connection pooling as a Hibernate ORM Conne apply from: rootProject.file( 'gradle/published-java-module.gradle' ) - dependencies { implementation project( ':hibernate-core' ) - implementation "org.vibur:vibur-dbcp:25.0" + implementation libs.vibur testImplementation project( ':hibernate-testing' ) - testImplementation "org.vibur:vibur-dbcp:25.0:tests" + testImplementation "org.vibur:vibur-dbcp:${libs.versions.vibur.get()}:tests" testImplementation 'com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2' } diff --git a/settings.gradle b/settings.gradle index ea86764d36..3ec358bee0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -61,11 +61,18 @@ dependencyResolutionManagement { version( "hcann", "6.0.0.Final" ) version( "geolatte", "1.8.2" ) version( "byteBuddy", "1.12.9" ) + version( "agroal", "1.14" ) + version( "c3po", "0.9.5.5" ) + version( "hikaricp", "3.2.0" ) + version( "proxool", "0.8.3" ) + version( "vibur", "25.0" ) + version( "micrometer", "1.6.1" ) alias( "antlr" ).to( "org.antlr", "antlr4" ).versionRef( "antlr") alias( "antlrRuntime" ).to( "org.antlr", "antlr4-runtime" ).versionRef( "antlr") alias( "byteBuddy" ).to( "net.bytebuddy", "byte-buddy" ).versionRef( "byteBuddy" ) + alias( "byteBuddyAgent" ).to( "net.bytebuddy", "byte-buddy-agent" ).versionRef( "byteBuddy" ) alias( "logging" ).to ( "org.jboss.logging", "jboss-logging" ).version( "3.4.3.Final" ) alias( "loggingAnnotations" ).to ( "org.jboss.logging", "jboss-logging-annotations" ).version( "2.2.1.Final" ) @@ -82,7 +89,17 @@ dependencyResolutionManagement { alias( "geolatte" ).to( "org.geolatte", "geolatte-geom" ).versionRef( "geolatte" ) + alias( "jcache" ).to( "javax.cache", "cache-api" ).version( "1.0.0" ) alias( "ehcache3" ).to( "org.ehcache:ehcache:3.10.0-alpha0" ) + + alias( "agroal" ).to( "io.agroal", "agroal-api" ).versionRef( "agroal" ) + alias( "agroalPool" ).to( "io.agroal", "agroal-pool" ).versionRef( "agroal" ) + alias( "c3p0" ).to( "com.mchange", "c3p0" ).versionRef( "c3po" ) + alias( "hikaricp" ).to( "com.zaxxer", "HikariCP" ).versionRef( "hikaricp" ) + alias( "proxool" ).to( "proxool", "proxool" ).versionRef( "proxool" ) + alias( "vibur" ).to( "org.vibur", "vibur-dbcp" ).versionRef( "vibur" ) + + alias( "micrometer" ).to ( "io.micrometer", "micrometer-core" ).versionRef( "micrometer" ) } jakartaLibs { version( "jaxbRuntime", "3.0.2" )