This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 2496f0f Upgrading Commons JEXL, CodeMirror and AspectJ
2496f0f is described below
commit 2496f0f0263aa9a900ba1c90931fe795ffa6ded3
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Fri Jun 25 15:38:48 2021 +0200
Upgrading Commons JEXL, CodeMirror and AspectJ
---
.../syncope/core/persistence/jpa/dao/AbstractJPAJSONAnyDAO.java | 3 +--
.../org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java | 3 +--
.../apache/syncope/core/provisioning/api/jexl/SandboxUberspect.java | 5 +----
pom.xml | 6 +++---
4 files changed, 6 insertions(+), 11 deletions(-)
diff --git
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPAJSONAnyDAO.java
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPAJSONAnyDAO.java
index de1cd45..d2ac3ef 100644
---
a/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPAJSONAnyDAO.java
+++
b/core/persistence-jpa-json/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractJPAJSONAnyDAO.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.core.persistence.jpa.dao;
-import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -220,7 +219,7 @@ abstract class AbstractJPAJSONAnyDAO extends
AbstractDAO<AbstractEntity> impleme
return Collections.<A>emptyList();
}
- Parser parser = new Parser(new
StringReader(derSchema.getExpression()));
+ Parser parser = new Parser(derSchema.getExpression());
// Schema keys
List<String> identifiers = new ArrayList<>();
diff --git
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
index 07a4f42..1edc88f 100644
---
a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
+++
b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/AbstractAnyDAO.java
@@ -18,7 +18,6 @@
*/
package org.apache.syncope.core.persistence.jpa.dao;
-import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -285,7 +284,7 @@ public abstract class AbstractAnyDAO<A extends Any<?>>
extends AbstractDAO<A> im
}
private Set<String> getWhereClause(final String expression, final String
value, final boolean ignoreCaseMatch) {
- Parser parser = new Parser(new StringReader(expression));
+ Parser parser = new Parser(expression);
// Schema keys
List<String> identifiers = new ArrayList<>();
diff --git
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/jexl/SandboxUberspect.java
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/jexl/SandboxUberspect.java
index c14e897..54436ea 100644
---
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/jexl/SandboxUberspect.java
+++
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/jexl/SandboxUberspect.java
@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.Optional;
import java.util.Set;
import org.apache.commons.jexl3.JexlEngine;
-import org.apache.commons.jexl3.internal.TemplateInterpreter;
import org.apache.commons.jexl3.internal.introspection.Uberspect;
import org.apache.commons.jexl3.introspection.JexlMethod;
import org.apache.commons.jexl3.introspection.JexlPropertySet;
@@ -66,9 +65,7 @@ class SandboxUberspect extends Uberspect {
@Override
public JexlMethod getMethod(final Object obj, final String method, final
Object... args) {
- if (obj instanceof TemplateInterpreter) { //
https://issues.apache.org/jira/browse/JEXL-351
- return super.getMethod(obj, method, args);
- } else if (obj instanceof AnyTO || obj instanceof Any
+ if (obj instanceof AnyTO || obj instanceof Any
|| obj instanceof PlainAttr || obj instanceof AttrTO
|| obj instanceof MembershipTO || obj instanceof Membership
|| obj instanceof Realm || obj instanceof RealmTO) {
diff --git a/pom.xml b/pom.xml
index 32cbbbc..e366537 100644
--- a/pom.xml
+++ b/pom.xml
@@ -440,7 +440,7 @@ under the License.
<commons-io.version>2.7</commons-io.version>
<commons-email.version>1.5</commons-email.version>
- <commons-jexl.version>3.2</commons-jexl.version>
+ <commons-jexl.version>3.2.1</commons-jexl.version>
<commons-lang.version>3.12.0</commons-lang.version>
<commons-text.version>1.9</commons-text.version>
<commons-logging.version>1.1.3</commons-logging.version>
@@ -474,7 +474,7 @@ under the License.
<font-awesome.filename>font-awesome.min.css</font-awesome.filename>
<ionicons.version>2.0.1</ionicons.version>
<highlightjs.version>10.1.2</highlightjs.version>
- <codemirror.version>5.50.0</codemirror.version>
+ <codemirror.version>5.62.0</codemirror.version>
<googlediffmatchpath.version>895a9512bb</googlediffmatchpath.version>
<jsplumb.version>2.0.7</jsplumb.version>
<chartjs.version>1.0.2</chartjs.version>
@@ -1020,7 +1020,7 @@ under the License.
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
- <version>1.9.6</version>
+ <version>1.9.7</version>
</dependency>
<dependency>
