This branch makes the Expression Language go back to 6.2.0.Final so i…

…t can work in places like Spring Boot that haven't got to the latest EL yet
graphql-java · May 26, 2022 · 7eb499d · 7eb499d
1 parent a07d5a7
commit 7eb499d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/build.gradle b/build.gradle
@@ -41,8 +41,8 @@ repositories {
 dependencies {
     api "com.graphql-java:graphql-java:18.1"
     api "com.graphql-java:graphql-java-extended-scalars:18.1"
-    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
@@ -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
@@ -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
@@ -15,9 +15,9 @@
 import java.util.MissingResourceException;
 import java.util.Optional;
 import java.util.ResourceBundle;
-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
@@ -1,11 +1,8 @@
-import jakarta.el.ELContext;
-import jakarta.el.ELManager;
-import jakarta.el.ExpressionFactory;
-import jakarta.el.StandardELContext;
-import jakarta.el.ValueExpression;
-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 org.hibernate.validator.constraints.Range;
 import org.hibernate.validator.internal.engine.MessageInterpolatorContext;
 import org.hibernate.validator.internal.engine.path.PathImpl;
@@ -17,6 +14,9 @@
 import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel;
 import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
 
+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;