Skip to content

update Validator dependency to 9 #9356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2024
Merged

update Validator dependency to 9 #9356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions hibernate-c3p0/hibernate-c3p0.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ dependencies {
implementation libs.c3p0

testImplementation project( ':hibernate-testing' )
testImplementation libs.validator
testRuntimeOnly jakartaLibs.el
testImplementation jakartaLibs.validation
testImplementation testLibs.validator
testRuntimeOnly testLibs.expressly
}

2 changes: 1 addition & 1 deletion hibernate-c3p0/src/test/java/org/hibernate/test/c3p0/IrrelevantEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;

import jakarta.validation.constraints.NotBlank;
import org.hibernate.annotations.GenericGenerator;
import org.hibernate.validator.constraints.NotBlank;

/**
* A testing entity for cases where the entity definition itself is irrelevant (testing JDBC connection semantics, etc).
Expand Down
2 changes: 1 addition & 1 deletion ...ects/src/main/java/org/hibernate/community/dialect/sequence/LegacyDB2SequenceSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ public String getSequencePreviousValString(String sequenceName) throws MappingEx
public String getDropSequenceString(String sequenceName) {
return "drop sequence " + sequenceName + " restrict";
}
}
}
7 changes: 2 additions & 5 deletions hibernate-core/hibernate-core.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,22 +45,19 @@ dependencies {
compileOnly libs.jacksonXml
compileOnly jdbcLibs.postgresql

// annotationProcessor project( ":annotation-descriptor-generator" )
compileOnly project( ":annotation-descriptor-generator" )

testImplementation project(':hibernate-testing')
testImplementation project(':hibernate-ant')
testImplementation project(':hibernate-scan-jandex')

// testImplementation testLibs.shrinkwrapApi
testImplementation testLibs.shrinkwrap
testImplementation testLibs.shrinkwrapDescriptors
// testImplementation testLibs.shrinkwrapDescriptorsApi
testImplementation jakartaLibs.cdi
testImplementation jakartaLibs.jacc
testImplementation jakartaLibs.validation
testImplementation jakartaLibs.el
testImplementation( libs.validator ) {
testImplementation testLibs.expressly
testImplementation( testLibs.validator ) {
// for test runtime
transitive = true
}
Expand Down
4 changes: 2 additions & 2 deletions hibernate-spatial/hibernate-spatial.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ dependencies {
testImplementation jakartaLibs.validation
testImplementation libs.jandex
testImplementation libs.classmate
testImplementation libs.validator
testImplementation testLibs.validator
testImplementation 'org.dom4j:dom4j:2.1.3@jar'

testImplementation jdbcLibs.postgresql
testImplementation jdbcLibs.h2gis

testRuntimeOnly jakartaLibs.el
testRuntimeOnly testLibs.expressly
testRuntimeOnly 'jaxen:jaxen:1.1'
testRuntimeOnly libs.byteBuddy
}
Expand Down
11 changes: 6 additions & 5 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ dependencyResolutionManagement {

def micrometerVersion = version "micrometer", "1.14.1"

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

def antVersion = version "ant", "1.10.15"

library( "antlr", "org.antlr", "antlr4" ).versionRef( antlrVersion )
Expand All @@ -118,7 +116,6 @@ dependencyResolutionManagement {
library( "jackson", "com.fasterxml.jackson.core", "jackson-databind" ).versionRef( jacksonVersion )
library( "jacksonXml", "com.fasterxml.jackson.dataformat", "jackson-dataformat-xml" ).versionRef( jacksonVersion )
library( "jacksonJsr310", "com.fasterxml.jackson.datatype", "jackson-datatype-jsr310" ).versionRef( jacksonVersion )
library( "validator", "org.hibernate.validator", "hibernate-validator" ).versionRef( hibernateValidatorVersion )

library( "agroal", "io.agroal", "agroal-api" ).versionRef( agroalVersion )
library( "agroalPool", "io.agroal", "agroal-pool" ).versionRef( agroalVersion )
Expand All @@ -145,7 +142,6 @@ dependencyResolutionManagement {

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.2.0"
def dataVersion = version "data", "1.0.1"
Expand Down Expand Up @@ -173,7 +169,6 @@ dependencyResolutionManagement {
library( "jaxbApi", "jakarta.xml.bind", "jakarta.xml.bind-api" ).versionRef( jaxbApiVersion )
library( "jaxb", "org.glassfish.jaxb", "jaxb-runtime" ).versionRef( jaxbRuntimeVersion )
library( "xjc", "org.glassfish.jaxb", "jaxb-xjc" ).versionRef( xjcVersion )
library( "el", "org.glassfish.expressly", "expressly" ).versionRef( elVersion )
}
testLibs {
def junit5Version = version "junit5", "5.11.3"
Expand All @@ -194,6 +189,12 @@ dependencyResolutionManagement {

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

def hibernateValidatorVersion = version "hibernateValidator", "9.0.0.Beta3"
def expresslyVersion = version "expressly", "6.0.0-M1"

library( "validator", "org.hibernate.validator", "hibernate-validator" ).versionRef( hibernateValidatorVersion )
library( "expressly", "org.glassfish.expressly", "expressly" ).versionRef( expresslyVersion )

library( "junit5Api", "org.junit.jupiter", "junit-jupiter-api" ).versionRef( junit5Version )
library( "junit5Engine", "org.junit.jupiter", "junit-jupiter-engine" ).versionRef( junit5Version )
library( "junit5Params", "org.junit.jupiter", "junit-jupiter-params" ).versionRef( junit5Version )
Expand Down