diff --git a/pom.xml b/pom.xml index 27dbbb8f..bb764b98 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,7 @@ UTF-8 - 5.2.0 + 5.4.0 4.13.2 2.0.17 2.24.3 diff --git a/src/main/java/org/topbraid/jenax/util/QueryExecutionFactoryFilter.java b/src/main/java/org/topbraid/jenax/util/QueryExecutionFactoryFilter.java index 5cbeda87..033c837f 100644 --- a/src/main/java/org/topbraid/jenax/util/QueryExecutionFactoryFilter.java +++ b/src/main/java/org/topbraid/jenax/util/QueryExecutionFactoryFilter.java @@ -60,7 +60,7 @@ public QueryExecution create(Query query, Model model, QuerySolution initialBind return QueryExecution.create() .query(query) .model(model) - .initialBinding(initialBinding) + .substitution(initialBinding) .build(); } diff --git a/src/main/java/org/topbraid/shacl/arq/functions/IsValidLangTagFunction.java b/src/main/java/org/topbraid/shacl/arq/functions/IsValidLangTagFunction.java index 30fb4402..eb38cbc4 100644 --- a/src/main/java/org/topbraid/shacl/arq/functions/IsValidLangTagFunction.java +++ b/src/main/java/org/topbraid/shacl/arq/functions/IsValidLangTagFunction.java @@ -1,7 +1,7 @@ package org.topbraid.shacl.arq.functions; import org.apache.jena.graph.Node; -import org.apache.jena.riot.web.LangTag; +import org.apache.jena.langtagx.LangTagX; import org.apache.jena.sparql.expr.ExprEvalException; import org.apache.jena.sparql.expr.NodeValue; import org.apache.jena.sparql.function.FunctionEnv; @@ -19,6 +19,6 @@ protected NodeValue exec(Node arg, FunctionEnv env) { if(arg == null || !arg.isLiteral()) { throw new ExprEvalException("Argument must be a (string) literal"); } - return NodeValue.makeBoolean(LangTag.check(arg.getLiteralLexicalForm())); + return NodeValue.makeBoolean(LangTagX.checkLanguageTag(arg.getLiteralLexicalForm())); } } diff --git a/src/main/java/org/topbraid/shacl/validation/java/PatternConstraintExecutor.java b/src/main/java/org/topbraid/shacl/validation/java/PatternConstraintExecutor.java index c4bc080b..63b747da 100644 --- a/src/main/java/org/topbraid/shacl/validation/java/PatternConstraintExecutor.java +++ b/src/main/java/org/topbraid/shacl/validation/java/PatternConstraintExecutor.java @@ -4,7 +4,7 @@ import java.util.regex.Pattern; import org.apache.jena.rdf.model.RDFNode; -import org.apache.jena.sparql.expr.RegexJava; +import org.apache.jena.sparql.expr.RegexEngine; import org.apache.jena.sparql.expr.nodevalue.NodeFunctions; import org.topbraid.jenax.util.JenaUtil; import org.topbraid.shacl.engine.Constraint; @@ -29,7 +29,7 @@ class PatternConstraintExecutor extends AbstractNativeConstraintExecutor { PatternConstraintExecutor(Constraint constraint) { flagsStr = JenaUtil.getStringProperty(constraint.getShapeResource(), SH.flags); patternString = JenaUtil.getStringProperty(constraint.getShapeResource(), SH.pattern); - int flags = RegexJava.makeMask(flagsStr); + int flags = RegexEngine.RegexJava.makeMask(flagsStr); if (flagsStr != null && flagsStr.contains("q")) { patternString = Pattern.quote(patternString); }