You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/07/19 18:42:29 UTC
[camel] branch main updated (5468951de05 -> b6192216280)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 5468951de05 Upgrade shiro 1.12.0
new ae18d0ef0f7 Upgrade jackrabbit 2.21.17
new b6192216280 Upgrade ognl 3.4.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/camel/language/ognl/CamelClassResolver.java | 6 ++----
.../main/java/org/apache/camel/language/ognl/OgnlExpression.java | 5 ++---
.../src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java | 3 ++-
parent/pom.xml | 4 ++--
4 files changed, 8 insertions(+), 10 deletions(-)
[camel] 02/02: Upgrade ognl 3.4.0
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b6192216280f7b8310781a1829727a14999d6eb7
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jul 19 20:42:19 2023 +0200
Upgrade ognl 3.4.0
---
.../java/org/apache/camel/language/ognl/CamelClassResolver.java | 6 ++----
.../main/java/org/apache/camel/language/ognl/OgnlExpression.java | 5 ++---
.../src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java | 3 ++-
parent/pom.xml | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/CamelClassResolver.java b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/CamelClassResolver.java
index b7a26c20bfb..4626477fd03 100644
--- a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/CamelClassResolver.java
+++ b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/CamelClassResolver.java
@@ -16,9 +16,8 @@
*/
package org.apache.camel.language.ognl;
-import java.util.Map;
-
import ognl.ClassResolver;
+import ognl.OgnlContext;
/**
* This class is used to wrap the org.apache.camel.spi.ClassResolver with ClassResolver interface
@@ -32,8 +31,7 @@ public class CamelClassResolver implements ClassResolver {
}
@Override
- public Class<?> classForName(String className, Map context) throws ClassNotFoundException {
-
+ public Class<?> classForName(String className, OgnlContext context) throws ClassNotFoundException {
return delegateClassResolver.resolveClass(className);
}
diff --git a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
index 741965ecd56..c786fe33afb 100644
--- a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
+++ b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlExpression.java
@@ -16,10 +16,9 @@
*/
package org.apache.camel.language.ognl;
-import java.util.Map;
-
import ognl.ClassResolver;
import ognl.Ognl;
+import ognl.OgnlContext;
import ognl.OgnlException;
import org.apache.camel.Exchange;
import org.apache.camel.ExpressionEvaluationException;
@@ -52,7 +51,7 @@ public class OgnlExpression extends ExpressionSupport {
@Override
public <T> T evaluate(Exchange exchange, Class<T> tClass) {
ClassResolver cr = new CamelClassResolver(exchange.getContext().getClassResolver());
- Map<?, ?> oglContext = Ognl.createDefaultContext(null, cr);
+ OgnlContext oglContext = Ognl.createDefaultContext(null, cr);
try {
Object value = Ognl.getValue(expression, oglContext, new RootObject(exchange));
return exchange.getContext().getTypeConverter().convertTo(tClass, value);
diff --git a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
index 1309ff678ec..0ceb31c9ca0 100644
--- a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
+++ b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
@@ -20,6 +20,7 @@ import java.util.Map;
import ognl.ClassResolver;
import ognl.Ognl;
+import ognl.OgnlContext;
import org.apache.camel.Expression;
import org.apache.camel.ExpressionIllegalSyntaxException;
import org.apache.camel.Predicate;
@@ -50,7 +51,7 @@ public class OgnlLanguage extends TypedLanguageSupport implements ScriptingLangu
try {
Object compiled = Ognl.parseExpression(script);
ClassResolver cr = new CamelClassResolver(getCamelContext().getClassResolver());
- Map<?, ?> oglContext = Ognl.createDefaultContext(null, cr);
+ OgnlContext oglContext = Ognl.createDefaultContext(null, cr);
Object value = Ognl.getValue(compiled, oglContext, bindings);
return getCamelContext().getTypeConverter().convertTo(resultType, value);
} catch (Exception e) {
diff --git a/parent/pom.xml b/parent/pom.xml
index 5f791990651..f3c2a615d1f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -373,7 +373,7 @@
<okclient-version>3.14.9</okclient-version>
<olingo2-version>2.0.12</olingo2-version>
<olingo4-version>4.9.0</olingo4-version>
- <ognl-version>3.3.4</ognl-version>
+ <ognl-version>3.4.0</ognl-version>
<openapi-generator>6.6.0</openapi-generator>
<openjpa-version>3.2.2</openjpa-version>
<opensearch-rest-client-version>2.8.0</opensearch-rest-client-version>
[camel] 01/02: Upgrade jackrabbit 2.21.17
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ae18d0ef0f79f0a9b455a2ff9ee1dd4ac4007841
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Jul 19 20:39:15 2023 +0200
Upgrade jackrabbit 2.21.17
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8f67f828960..5f791990651 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -228,7 +228,7 @@
<!-- For projects not yet compatible with Jackson 2.15 -->
<jackson2.14-version>2.14.3</jackson2.14-version>
<jackson2-module-scala-version>2.15.1</jackson2-module-scala-version>
- <jackrabbit-version>2.21.16</jackrabbit-version>
+ <jackrabbit-version>2.21.17</jackrabbit-version>
<jasminb-jsonapi-version>0.12</jasminb-jsonapi-version>
<jandex-version>3.1.2</jandex-version>
<jansi-version>2.4.0</jansi-version>