diff --git a/build.sbt b/build.sbt index 759b041..51d9894 100644 --- a/build.sbt +++ b/build.sbt @@ -7,7 +7,7 @@ resolvers += lazy val circeV = "0.14.15" lazy val jellyV = "3.7.3" lazy val jenaV = "5.3.0" -lazy val pekkoV = "1.1.5" +lazy val pekkoV = "1.6.0" lazy val pekkoHttpV = "1.3.0" lazy val pekkoConnV = "1.3.0" lazy val rdf4jV = "5.3.1" @@ -23,11 +23,13 @@ lazy val root = (project in file(".")) "com.google.guava" % "guava" % "33.6.0-jre", "com.ibm.icu" % "icu4j" % icu4jV, "eu.neverblink.jelly" %% "jelly-pekko-stream" % jellyV, - "eu.neverblink.jelly" % "jelly-jena" % jellyV, + // Jelly-JVM >= 3.4.1 includes Jena 5.6.x as a dependency, we must exclude it, because + // we use Jena 5.3.0. + ("eu.neverblink.jelly" % "jelly-jena" % jellyV).excludeAll(ExclusionRule("org.apache.jena")), "io.circe" %% "circe-core" % circeV, "io.circe" %% "circe-generic" % circeV, "io.circe" %% "circe-parser" % circeV, - "org.apache.commons" % "commons-compress" % "1.27.1", + "org.apache.commons" % "commons-compress" % "1.28.0", "org.apache.jena" % "jena-core" % jenaV, "org.apache.jena" % "jena-arq" % jenaV, "org.apache.jena" % "jena-shacl" % jenaV, diff --git a/src/main/scala/commands/PackageCommand.scala b/src/main/scala/commands/PackageCommand.scala index 0c46253..4fffc38 100644 --- a/src/main/scala/commands/PackageCommand.scala +++ b/src/main/scala/commands/PackageCommand.scala @@ -476,7 +476,7 @@ object PackageCommand extends Command: if !metadata.conformance.usesRdfStar then val rdfStar = ds.find().asScala .flatMap(q => q.getGraph :: q.getSubject :: q.getPredicate :: q.getObject :: Nil) - .exists(_.isTripleTerm) + .exists(_.isNodeTriple) if rdfStar then return Some(s"The dataset contains an RDF-star node, " + s"but the metadata does not declare the use of RDF-star.") diff --git a/src/main/scala/util/StatCounterSuite.scala b/src/main/scala/util/StatCounterSuite.scala index f5498dc..f1b8fa7 100644 --- a/src/main/scala/util/StatCounterSuite.scala +++ b/src/main/scala/util/StatCounterSuite.scala @@ -115,7 +115,7 @@ class StatCounterSuite(val size: Long): // Find triples recursively – needed for RDF-star def getTriples(t: Triple): List[Triple] = t +: (t.getSubject :: t.getPredicate :: t.getObject :: Nil) - .filter(_.isTripleTerm) + .filter(_.isNodeTriple) .flatMap(n => getTriples(n.getTriple)) val allNodes = ds.find().asScala.flatMap(t => { @@ -148,7 +148,7 @@ class StatCounterSuite(val size: Long): datatypes += n.getLiteralDatatypeURI else simpleLiterals += n.getLiteralLexicalForm - else if n.isTripleTerm then + else if n.isNodeTriple then // isomorphism in RDF-star is a pain... quotedTripleCount += 1 }) diff --git a/src/main/scala/util/rdf/SubjectNodeShape.scala b/src/main/scala/util/rdf/SubjectNodeShape.scala index 72083b3..c4d1b88 100644 --- a/src/main/scala/util/rdf/SubjectNodeShape.scala +++ b/src/main/scala/util/rdf/SubjectNodeShape.scala @@ -35,7 +35,7 @@ object SubjectNodeShape: override def findInDs(ds: DatasetGraph) = customInstance match case RdfUtil.`yagoTarget` => ds.find(null, null, null, null).asScala .map(_.getSubject) - .filter(_.isTripleTerm) + .filter(_.isNodeTriple) .map(_.getTriple.getSubject) .toSeq case _ => throw new Exception(s"Unknown custom target instance: $customInstance")