Skip to content
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

Prepare for v19 release with Hibernate validator 6.2.0 Final #77

Merged
merged 2 commits into from
Sep 26, 2022
Merged

Prepare for v19 release with Hibernate validator 6.2.0 Final #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18c4c8d
Prepare for release with Hibernate validator 6.2.0 Final
dondonz Sep 26, 2022
2597012
Fix typo in branch name
dondonz Sep 26, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/graphql/validation/el/BetterMapELResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/graphql/validation/el/ELSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/graphql/validation/interpolation/ResourceBundleMessageInterpolator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions src/test/groovy/ELDiscover.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down