diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 0966f9e..571c784 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -7,7 +7,7 @@ on: pull_request: branches: - master - - 19.x-validator-6.2.0.Final + - v19.x-validator-6.2.0.Final jobs: buildAndTest: runs-on: ubuntu-latest diff --git a/build.gradle b/build.gradle index 8b971cb..03c1f50 100644 --- a/build.gradle +++ b/build.gradle @@ -47,8 +47,8 @@ repositories { dependencies { api "com.graphql-java:graphql-java:19.2" api "com.graphql-java:graphql-java-extended-scalars:19.0" - api "org.hibernate.validator:hibernate-validator:7.0.1.Final" - api "org.glassfish:jakarta.el:4.0.0" + api "org.hibernate.validator:hibernate-validator:6.2.0.Final" + api "org.glassfish:jakarta.el:3.0.4" testImplementation 'org.slf4j:slf4j-simple:1.7.31' testImplementation 'org.spockframework:spock-core:1.3-groovy-2.5' diff --git a/src/main/java/graphql/validation/el/BetterMapELResolver.java b/src/main/java/graphql/validation/el/BetterMapELResolver.java index 59d6b88..e51f533 100644 --- a/src/main/java/graphql/validation/el/BetterMapELResolver.java +++ b/src/main/java/graphql/validation/el/BetterMapELResolver.java @@ -1,8 +1,8 @@ package graphql.validation.el; import graphql.Internal; -import jakarta.el.ELContext; -import jakarta.el.MapELResolver; +import javax.el.ELContext; +import javax.el.MapELResolver; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/graphql/validation/el/ELSupport.java b/src/main/java/graphql/validation/el/ELSupport.java index 1571bae..ea97d35 100644 --- a/src/main/java/graphql/validation/el/ELSupport.java +++ b/src/main/java/graphql/validation/el/ELSupport.java @@ -1,11 +1,11 @@ package graphql.validation.el; import graphql.Internal; -import jakarta.el.ELContext; -import jakarta.el.ELManager; -import jakarta.el.ExpressionFactory; -import jakarta.el.StandardELContext; -import jakarta.el.ValueExpression; +import javax.el.ELContext; +import javax.el.ELManager; +import javax.el.ExpressionFactory; +import javax.el.StandardELContext; +import javax.el.ValueExpression; import java.lang.reflect.Method; import java.util.Locale; import java.util.Map; diff --git a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java index 99df8c1..dec128b 100644 --- a/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java +++ b/src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java @@ -7,9 +7,9 @@ import graphql.schema.GraphQLAppliedDirective; import graphql.validation.el.StandardELVariables; import graphql.validation.rules.ValidationEnvironment; -import jakarta.validation.Constraint; -import jakarta.validation.Path; -import jakarta.validation.Payload; +import javax.validation.Constraint; +import javax.validation.Path; +import javax.validation.Payload; import org.hibernate.validator.internal.engine.MessageInterpolatorContext; import org.hibernate.validator.internal.metadata.core.ConstraintHelper; import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl; diff --git a/src/test/groovy/ELDiscover.java b/src/test/groovy/ELDiscover.java index 7c280b1..9323818 100644 --- a/src/test/groovy/ELDiscover.java +++ b/src/test/groovy/ELDiscover.java @@ -1,8 +1,3 @@ -import jakarta.el.ELContext; -import jakarta.el.ELManager; -import jakarta.el.ExpressionFactory; -import jakarta.el.StandardELContext; -import jakarta.el.ValueExpression; import org.hibernate.validator.constraints.Range; import org.hibernate.validator.internal.engine.MessageInterpolatorContext; import org.hibernate.validator.internal.engine.path.PathImpl; @@ -14,9 +9,14 @@ import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel; import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator; -import jakarta.validation.MessageInterpolator; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotNull; +import javax.el.ELContext; +import javax.el.ELManager; +import javax.el.ExpressionFactory; +import javax.el.StandardELContext; +import javax.el.ValueExpression; +import javax.validation.MessageInterpolator; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotNull; import java.lang.reflect.Method; import java.util.Collections; import java.util.HashMap;