From b9ad083e93d642bbff388f2f818ef6e1a294646d Mon Sep 17 00:00:00 2001 From: Ben Manes Date: Thu, 9 Feb 2023 23:07:15 -0800 Subject: [PATCH] prepare for release --- gradle/dependencies.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- .../caffeine/jcache/configuration/package-info.java | 7 +++++++ .../github/benmanes/caffeine/jcache/copy/package-info.java | 7 +++++++ .../benmanes/caffeine/jcache/event/package-info.java | 7 +++++++ .../benmanes/caffeine/jcache/expiry/package-info.java | 7 +++++++ .../benmanes/caffeine/jcache/integration/package-info.java | 7 +++++++ .../benmanes/caffeine/jcache/management/package-info.java | 7 +++++++ .../com/github/benmanes/caffeine/jcache/package-info.java | 7 +++++++ .../benmanes/caffeine/jcache/processor/package-info.java | 7 +++++++ .../github/benmanes/caffeine/jcache/spi/package-info.java | 7 +++++++ 11 files changed, 65 insertions(+), 2 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 8c1cae01bb..2782bfcc8d 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -69,7 +69,7 @@ ext { testVersions = [ awaitility: '4.2.0', commonsCollectionsTests: '4.4', - eclipseCollections: '11.1.0', + eclipseCollections: '12.0.0.M1', felix: '7.0.5', felixScr: '2.2.6', guice: '5.1.0', diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cd7a34bea8..37069b4e9c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-5-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/configuration/package-info.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/configuration/package-info.java index 37d466184a..8326354ad1 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/configuration/package-info.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/configuration/package-info.java @@ -1,4 +1,11 @@ @CheckReturnValue +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN) package com.github.benmanes.caffeine.jcache.configuration; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.framework.qual.DefaultQualifier; +import org.checkerframework.framework.qual.TypeUseLocation; + import com.google.errorprone.annotations.CheckReturnValue; diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/copy/package-info.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/copy/package-info.java index 4b6aad596e..590a2760af 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/copy/package-info.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/copy/package-info.java @@ -1,4 +1,11 @@ @CheckReturnValue +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN) package com.github.benmanes.caffeine.jcache.copy; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.framework.qual.DefaultQualifier; +import org.checkerframework.framework.qual.TypeUseLocation; + import com.google.errorprone.annotations.CheckReturnValue; diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/event/package-info.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/event/package-info.java index 9b3c6707d8..99258f334a 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/event/package-info.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/event/package-info.java @@ -1,4 +1,11 @@ @CheckReturnValue +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN) package com.github.benmanes.caffeine.jcache.event; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.framework.qual.DefaultQualifier; +import org.checkerframework.framework.qual.TypeUseLocation; + import com.google.errorprone.annotations.CheckReturnValue; diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/expiry/package-info.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/expiry/package-info.java index 31d27656a9..287621f24f 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/expiry/package-info.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/expiry/package-info.java @@ -1,4 +1,11 @@ @CheckReturnValue +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN) package com.github.benmanes.caffeine.jcache.expiry; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.framework.qual.DefaultQualifier; +import org.checkerframework.framework.qual.TypeUseLocation; + import com.google.errorprone.annotations.CheckReturnValue; diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/integration/package-info.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/integration/package-info.java index 785bbd147e..2ee221290d 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/integration/package-info.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/integration/package-info.java @@ -1,4 +1,11 @@ @CheckReturnValue +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN) package com.github.benmanes.caffeine.jcache.integration; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.framework.qual.DefaultQualifier; +import org.checkerframework.framework.qual.TypeUseLocation; + import com.google.errorprone.annotations.CheckReturnValue; diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/management/package-info.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/management/package-info.java index d3d6c07883..924b882947 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/management/package-info.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/management/package-info.java @@ -1,4 +1,11 @@ @CheckReturnValue +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN) package com.github.benmanes.caffeine.jcache.management; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.framework.qual.DefaultQualifier; +import org.checkerframework.framework.qual.TypeUseLocation; + import com.google.errorprone.annotations.CheckReturnValue; diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/package-info.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/package-info.java index cfeead53ba..2e5866b425 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/package-info.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/package-info.java @@ -1,4 +1,11 @@ @CheckReturnValue +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN) package com.github.benmanes.caffeine.jcache; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.framework.qual.DefaultQualifier; +import org.checkerframework.framework.qual.TypeUseLocation; + import com.google.errorprone.annotations.CheckReturnValue; diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/processor/package-info.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/processor/package-info.java index 59e0c1b095..784bafab93 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/processor/package-info.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/processor/package-info.java @@ -1,4 +1,11 @@ @CheckReturnValue +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN) package com.github.benmanes.caffeine.jcache.processor; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.framework.qual.DefaultQualifier; +import org.checkerframework.framework.qual.TypeUseLocation; + import com.google.errorprone.annotations.CheckReturnValue; diff --git a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/spi/package-info.java b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/spi/package-info.java index dcaba8edba..3cda819cd5 100644 --- a/jcache/src/main/java/com/github/benmanes/caffeine/jcache/spi/package-info.java +++ b/jcache/src/main/java/com/github/benmanes/caffeine/jcache/spi/package-info.java @@ -1,4 +1,11 @@ @CheckReturnValue +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.FIELD) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.PARAMETER) +@DefaultQualifier(value = NonNull.class, locations = TypeUseLocation.RETURN) package com.github.benmanes.caffeine.jcache.spi; +import org.checkerframework.checker.nullness.qual.NonNull; +import org.checkerframework.framework.qual.DefaultQualifier; +import org.checkerframework.framework.qual.TypeUseLocation; + import com.google.errorprone.annotations.CheckReturnValue;