Skip to content

GH-4185: Manage version of jspecify directly #4186

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
afs merged 1 commit into from
Sep 2, 2026
+23 −9
Merged

GH-4185: Manage version of jspecify directly #4186

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
3 changes: 0 additions & 3 deletions ...benchmarks-jmh/src/test/java/org/apache/jena/sparql/engine/benchmark/QueryTaskResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@
*/
package org.apache.jena.sparql.engine.benchmark;

import org.jspecify.annotations.NonNull;

public record QueryTaskResult(String queryString, String originalOpString, String optimizedOpString,
long resultSetSize) {

@NonNull
@Override
public String toString() {
return String.join("\n",
Expand Down
9 changes: 5 additions & 4 deletions jena-core/src/main/java/org/apache/jena/mem/collection/JenaSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,8 @@
*/
package org.apache.jena.mem.collection;

import org.jspecify.annotations.NonNull;

import java.util.Iterator;
import java.util.Objects;
import java.util.Spliterator;
import java.util.function.Consumer;

Expand Down Expand Up @@ -64,7 +63,9 @@ default Spliterator<E> spliterator() {
}

@Override
default @NonNull Iterator<E> iterator() {
return this.keyIterator();
default Iterator<E> iterator() {
Iterator<E> iter = this.keyIterator();
Objects.requireNonNull(iter);
return iter;
}
}
20 changes: 18 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@

<ver.caffeine>3.2.4</ver.caffeine>
<!-- Most of Jena uses other libraries for equivalent functionality. -->
<ver.guava>33.6.0-jre</ver.guava>
<ver.guava>33.7.1-jre</ver.guava>

<ver.gson>2.14.0</ver.gson>
<ver.lucene>10.3.1</ver.lucene>
Expand All @@ -102,7 +102,7 @@
<ver.commons-fileupload>2.0.0-M5</ver.commons-fileupload>

<ver.dexxcollection>0.7</ver.dexxcollection>
<ver.micrometer>1.17.0</ver.micrometer>
<ver.micrometer>1.17.1</ver.micrometer>
<ver.roaringbitmap>1.6.20</ver.roaringbitmap>
<ver.opencsv>5.12.0</ver.opencsv>

Expand Down Expand Up @@ -437,6 +437,9 @@
</dependency>

<!--
Some packages have dependencies that can cause
dependency convergence errors.

com.google.errorprone:error_prone_annotations
is used by gson, guava and caffeine.
It can lead to dependency convergence errors.
Expand All @@ -455,6 +458,11 @@
https://checkerframework.org/manual/#faq-runtime-retention

The downside of including them is that they bringing in IDE autocomplete names.

Another way is to have a direct dependency on a version.
Being top-level, it is used over recusive dependencies.

These should be used temporarily.
-->
<!--
<dependency>
Expand All @@ -463,6 +471,14 @@
<version>VERSION</version>
</dependency>
-->
<!--
jspecify comes from gauva, caffeine, junit and micrometer.
-->
<dependency>
<groupId>org.jspecify</groupId>
<artifactId>jspecify</artifactId>
<version>1.0.1</version>
</dependency>

<dependency>
<groupId>com.google.code.gson</groupId>
Expand Down