Skip to content
Merged
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
34 changes: 17 additions & 17 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ dependencyResolutionManagement {
version "maxSupportedBytecode", maxJdk
}
libs {
def antlrVersion = version "antlr", "4.13.0"
def antlrVersion = version "antlr", "4.13.2"
// 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.15.10"
Expand All @@ -94,9 +94,9 @@ dependencyResolutionManagement {
def jcacheVersion = version "jcache", "1.0.0"
def ehcache3Version = version "ehcache3", "3.10.8"

def micrometerVersion = version "micrometer", "1.10.4"
def micrometerVersion = version "micrometer", "1.14.1"

def hibernateValidatorVersion = version "hibernateValidator", "8.0.0.Final"
def hibernateValidatorVersion = version "hibernateValidator", "8.0.1.Final"

library( "antlr", "org.antlr", "antlr4" ).versionRef( antlrVersion )
library( "antlrRuntime", "org.antlr", "antlr4-runtime" ).versionRef( antlrVersion)
Expand Down Expand Up @@ -141,19 +141,19 @@ dependencyResolutionManagement {
// `jakartaJpaVersion` comes from the local-build-plugins to allow for command-line overriding of the JPA version to use
def jpaVersion = version "jpa", "${jakartaJpaVersion}"

def annotationVersion = version "annotation", "2.1.1"
def cdiVersion = version "cdi", "4.0.1"
def annotationVersion = version "annotation", "3.0.0"
def cdiVersion = version "cdi", "4.1.0"
def elVersion = version "el", "5.0.0"
def injectVersion = version "inject", "2.0.1"
def interceptorsVersion = version "interceptors", "2.1.0"
def dataVersion = version "data", "1.0.0"
def jaccVersion = version "jacc", "2.1.0"
def jaxbApiVersion = version "jaxbApi", "4.0.0"
def jaxbRuntimeVersion = version "jaxbRuntime", "4.0.2"
def jsonbApiVersion = version "jsonbApi", "3.0.0"
def jsonbRuntimeVersion = version "jsonbRuntime", "3.0.2"
def interceptorsVersion = version "interceptors", "2.2.0"
def dataVersion = version "data", "1.0.1"
def jaccVersion = version "jacc", "3.0.0"
def jaxbApiVersion = version "jaxbApi", "4.0.2"
def jaxbRuntimeVersion = version "jaxbRuntime", "4.0.5"
def jsonbApiVersion = version "jsonbApi", "3.0.1"
def jsonbRuntimeVersion = version "jsonbRuntime", "3.0.4"
def jtaVersion = version "jta", "2.0.1"
def validationVersion = version "validation", "3.0.2"
def validationVersion = version "validation", "3.1.0"
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
I've noticed you've updated the Validation spec version. It probably doesn't matter that much since 3.1/3.0 are identical, but just in case, Hibernate Validator 8 is Jakarta Bean Validation 3.0 and Hibernate Validator 9 is targeting 3.1. There's a beta release of it available. And then if we bump validation to 3.1 we probably should also bump EL to 6.0 as well (at least that's the HV 9 relies on), it's currently set to 5.0.0

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, OK, thanks, I guess I should revert that then.

Copy link
Member

Choose a reason for hiding this comment

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

that ... I don't know 😃
Jakarta validation 3.1 is part of Jakarta 11 so maybe we should keep it and bump the HV version to 9? In ORM HV is used only for tests, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Well H9 is still in beta, so perhaps it's should wait.

In ORM HV is used only for tests, right?

Well there is integration code which depends on at least the spec jar.

Copy link
Member Author

Choose a reason for hiding this comment

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

OK I think I see what you mean: you're saying that HV itself is only used as in testing, even thought it's wrongly classified under libs instead of testLibs, and se we could use the beta release of H9 there. That makes sense to me.

def xjcVersion = version "jaxbRuntime", jaxbRuntimeVersion

library( "jpa", "jakarta.persistence", "jakarta.persistence-api" ).versionRef( jpaVersion )
Expand Down Expand Up @@ -269,17 +269,17 @@ dependencyResolutionManagement {
library( "altibase", "com.altibase", "altibase-jdbc" ).versionRef( altibaseVersion )
}
mavenLibs {
def mavenCoreVersion = version "mavenCore", "3.8.1"
def mavenVersion = version "maven", "3.0.5"
def mavenPluginToolsVersion = version "mavenPluginTools", "3.2"
def mavenCoreVersion = version "mavenCore", "3.9.9"
def mavenVersion = version "maven", "3.9.9"
def mavenPluginToolsVersion = version "mavenPluginTools", "3.15.1"

library( "mavenCore", "org.apache.maven", "maven-core" ).versionRef( mavenCoreVersion )
library( "mavenArtifact", "org.apache.maven", "maven-artifact" ).versionRef( mavenVersion )
library( "mavenPlugin", "org.apache.maven", "maven-plugin-api" ).versionRef( mavenVersion )
library( "mavenPluginTools", "org.apache.maven.plugin-tools", "maven-plugin-annotations" ).versionRef( mavenPluginToolsVersion )
}
buildscriptLibs {
def forbiddenapisversion = version "forbiddenapis", "3.7"
def forbiddenapisversion = version "forbiddenapis", "3.8"

library( "forbiddenapis", "de.thetaphi", "forbiddenapis" ).versionRef( forbiddenapisversion )
}
Expand Down