Skip to content

Fix Jena dependency #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ostrzyciel merged 1 commit into from
Jun 20, 2026
Merged

Fix Jena dependency #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/commands/PackageCommand.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/util/StatCounterSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down Expand Up @@ -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
})
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/util/rdf/SubjectNodeShape.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down