From 88b1c0f74a3e56a7c37c2eb2d88186799bbf5cac Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 15 Mar 2019 15:26:57 +0100 Subject: [PATCH] Bump odlparent to 5.0.0 This integrates odlparent-5.0.0 and removes reliance on JSR305 annotations. Nullness annotations were migrated in previous patches, this switches the remainder to Checker Framework annotations. Change-Id: Ia59d13f424d68a0bd8e86c952db0f1926ad7efbc Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- benchmarks/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- .../org/opendaylight/yangtools/concepts/SemVer.java | 10 +++++----- common/mockito-configuration/pom.xml | 2 +- common/pom.xml | 2 +- common/testutils/pom.xml | 2 +- .../yangtools/testutils/mockito/MethodExtensions.java | 4 ++-- .../util/concurrent/QueuedNotificationManager.java | 2 +- .../util/concurrent/ThreadFactoryProvider.java | 9 +-------- distribution-karaf/pom.xml | 2 +- features/features-yangtools-experimental/pom.xml | 2 +- features/features-yangtools/pom.xml | 2 +- features/odl-yangtools-codec/pom.xml | 2 +- .../odl-yangtools-codec/src/main/feature/feature.xml | 4 ++-- features/odl-yangtools-common/pom.xml | 2 +- features/odl-yangtools-data-api/pom.xml | 2 +- features/odl-yangtools-data/pom.xml | 2 +- .../odl-yangtools-data/src/main/feature/feature.xml | 2 +- features/odl-yangtools-exp-data-xpath-api/pom.xml | 2 +- features/odl-yangtools-exp-data-xpath/pom.xml | 2 +- features/odl-yangtools-export/pom.xml | 2 +- features/odl-yangtools-parser-api/pom.xml | 2 +- features/odl-yangtools-parser/pom.xml | 2 +- .../odl-yangtools-parser/src/main/feature/feature.xml | 2 +- features/odl-yangtools-util/pom.xml | 2 +- features/odl-yangtools-xpath-api/pom.xml | 2 +- features/odl-yangtools-xpath/pom.xml | 2 +- features/pom.xml | 2 +- pom.xml | 2 +- yang-validation-tool/pom.xml | 2 +- yang/pom.xml | 2 +- .../org/opendaylight/yangtools/yang/common/QName.java | 6 +++--- .../opendaylight/yangtools/yang/common/Revision.java | 4 ++-- .../codec/gson/JSONNormalizedNodeStreamWriter.java | 6 +++--- .../LeafrefXPathStringParsingPathArgumentBuilder.java | 4 ++-- yang/yang-maven-plugin-it/pom.xml | 2 +- yang/yang-maven-plugin-spi/pom.xml | 2 +- yang/yang-maven-plugin/pom.xml | 2 +- .../yang/model/repo/util/AbstractSchemaRepository.java | 2 +- yang/yang-model-validator/pom.xml | 2 +- .../yang/parser/rfc7950/stmt/ArgumentUtils.java | 6 +++--- 42 files changed, 56 insertions(+), 63 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 4997165800..8e48f89511 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.9 + 5.0.0 diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 3fbb11cb50..24d310e7d8 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 4.0.9 + 5.0.0 4.0.0 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index bf22906d6f..3b6e0afe17 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 4.0.9 + 5.0.0 diff --git a/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/SemVer.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/SemVer.java index d4570ad366..7290be85ae 100644 --- a/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/SemVer.java +++ b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/SemVer.java @@ -12,7 +12,7 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.annotations.Beta; import java.io.Serializable; import java.util.Objects; -import javax.annotation.Nonnegative; +import org.checkerframework.checker.index.qual.NonNegative; import org.eclipse.jdt.annotation.NonNull; /** @@ -34,16 +34,16 @@ public final class SemVer implements Comparable, Serializable { this.patch = patch; } - public static @NonNull SemVer create(final @Nonnegative int major) { + public static @NonNull SemVer create(final @NonNegative int major) { return create(major, 0); } - public static @NonNull SemVer create(final @Nonnegative int major, final @Nonnegative int minor) { + public static @NonNull SemVer create(final @NonNegative int major, final @NonNegative int minor) { return create(major, minor, 0); } - public static @NonNull SemVer create(final @Nonnegative int major, final @Nonnegative int minor, - final @Nonnegative int patch) { + public static @NonNull SemVer create(final @NonNegative int major, final @NonNegative int minor, + final @NonNegative int patch) { return new SemVer(major, minor, patch); } diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index d370a97176..f1106903b5 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 4.0.9 + 5.0.0 diff --git a/common/pom.xml b/common/pom.xml index 3d243618a9..d03f5491a3 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.9 + 5.0.0 diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml index be470fa309..8b8fead55a 100644 --- a/common/testutils/pom.xml +++ b/common/testutils/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 4.0.9 + 5.0.0 diff --git a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/MethodExtensions.java b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/MethodExtensions.java index 4baf4a4203..25e9c51ac6 100644 --- a/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/MethodExtensions.java +++ b/common/testutils/src/main/java/org/opendaylight/yangtools/testutils/mockito/MethodExtensions.java @@ -11,7 +11,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Parameter; import java.lang.reflect.Type; import java.util.regex.Pattern; -import javax.annotation.RegEx; +import org.checkerframework.checker.regex.qual.Regex; /** * Nicer shorter toString() for {@link Method} than it's default. @@ -21,7 +21,7 @@ import javax.annotation.RegEx; * @author Michael Vorburger */ public final class MethodExtensions { - @RegEx + @Regex private static final String PARAM_PATTERN_STR = "\\[\\]$"; private static final Pattern PARAM_PATTERN = Pattern.compile(PARAM_PATTERN_STR); diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManager.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManager.java index 35be7f7f30..d4c47b61dc 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManager.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/QueuedNotificationManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; -import javax.annotation.concurrent.GuardedBy; +import org.checkerframework.checker.lock.qual.GuardedBy; import org.eclipse.jdt.annotation.NonNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/ThreadFactoryProvider.java b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/ThreadFactoryProvider.java index 595d9fc3e4..077e827254 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/ThreadFactoryProvider.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/concurrent/ThreadFactoryProvider.java @@ -8,12 +8,8 @@ package org.opendaylight.yangtools.util.concurrent; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Optional; import java.util.concurrent.ThreadFactory; -import javax.annotation.concurrent.Immutable; -import javax.annotation.concurrent.NotThreadSafe; -import org.immutables.value.Generated; import org.immutables.value.Value; import org.slf4j.Logger; @@ -25,10 +21,7 @@ import org.slf4j.Logger; * @author Michael Vorburger.ch */ @Value.Immutable -@Value.Style(stagedBuilder = true, allowedClasspathAnnotations = { Override.class, - SuppressWarnings.class, SuppressFBWarnings.class, - NotThreadSafe.class, Immutable.class, - Generated.class }) +@Value.Style(stagedBuilder = true) public abstract class ThreadFactoryProvider { // This class is also available in infrautils (but yangtools cannot depend on infrautils) diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 7bf868a8ac..f736cd3ca2 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 4.0.9 + 5.0.0 diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml index 4808763b26..bc04c75071 100644 --- a/features/features-yangtools-experimental/pom.xml +++ b/features/features-yangtools-experimental/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 4.0.9 + 5.0.0 diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml index 3d75dcc8af..7a07435f4c 100644 --- a/features/features-yangtools/pom.xml +++ b/features/features-yangtools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml index b0d5351d56..b1761a738b 100644 --- a/features/odl-yangtools-codec/pom.xml +++ b/features/odl-yangtools-codec/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-codec/src/main/feature/feature.xml b/features/odl-yangtools-codec/src/main/feature/feature.xml index ae0b23c45b..e77fd6c3d1 100644 --- a/features/odl-yangtools-codec/src/main/feature/feature.xml +++ b/features/odl-yangtools-codec/src/main/feature/feature.xml @@ -1,7 +1,7 @@ - odl-gson - odl-stax2-api + odl-gson + odl-stax2-api diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml index 498adf5d9f..1cdf97898a 100644 --- a/features/odl-yangtools-common/pom.xml +++ b/features/odl-yangtools-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index cf64d8fb06..54175f4f4e 100644 --- a/features/odl-yangtools-data-api/pom.xml +++ b/features/odl-yangtools-data-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml index 448b769bfa..5d8735d316 100644 --- a/features/odl-yangtools-data/pom.xml +++ b/features/odl-yangtools-data/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-data/src/main/feature/feature.xml b/features/odl-yangtools-data/src/main/feature/feature.xml index e2c6308c78..b46e91df38 100644 --- a/features/odl-yangtools-data/src/main/feature/feature.xml +++ b/features/odl-yangtools-data/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-antlr4 + odl-antlr4 diff --git a/features/odl-yangtools-exp-data-xpath-api/pom.xml b/features/odl-yangtools-exp-data-xpath-api/pom.xml index b8c5e8c0d3..0ddbf43bae 100644 --- a/features/odl-yangtools-exp-data-xpath-api/pom.xml +++ b/features/odl-yangtools-exp-data-xpath-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-exp-data-xpath/pom.xml b/features/odl-yangtools-exp-data-xpath/pom.xml index 514b7ede33..674eccb0a1 100644 --- a/features/odl-yangtools-exp-data-xpath/pom.xml +++ b/features/odl-yangtools-exp-data-xpath/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml index 77c4aefb0c..6aee9a9a84 100644 --- a/features/odl-yangtools-export/pom.xml +++ b/features/odl-yangtools-export/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml index 9534f7bfce..f12242cb88 100644 --- a/features/odl-yangtools-parser-api/pom.xml +++ b/features/odl-yangtools-parser-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml index 4e566ced59..894e4d7b07 100644 --- a/features/odl-yangtools-parser/pom.xml +++ b/features/odl-yangtools-parser/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-parser/src/main/feature/feature.xml b/features/odl-yangtools-parser/src/main/feature/feature.xml index b42a25e524..3e3fe1c785 100644 --- a/features/odl-yangtools-parser/src/main/feature/feature.xml +++ b/features/odl-yangtools-parser/src/main/feature/feature.xml @@ -1,6 +1,6 @@ - odl-antlr4 + odl-antlr4 diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml index d08fba4f2a..06a88fbf35 100644 --- a/features/odl-yangtools-util/pom.xml +++ b/features/odl-yangtools-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml index 74788bbde1..16b99923ce 100644 --- a/features/odl-yangtools-xpath-api/pom.xml +++ b/features/odl-yangtools-xpath-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml index 810638df1c..c0e7b4bd28 100644 --- a/features/odl-yangtools-xpath/pom.xml +++ b/features/odl-yangtools-xpath/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 4.0.9 + 5.0.0 diff --git a/features/pom.xml b/features/pom.xml index dc01f897cc..8e12d37b78 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.9 + 5.0.0 diff --git a/pom.xml b/pom.xml index 43b40b2533..418b7e7b65 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.9 + 5.0.0 diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml index 3bbbba3fc0..e1ef08830d 100644 --- a/yang-validation-tool/pom.xml +++ b/yang-validation-tool/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 4.0.9 + 5.0.0 diff --git a/yang/pom.xml b/yang/pom.xml index 1980bba7b7..1b3f5dde5b 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 4.0.9 + 5.0.0 diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java index 9b17b45226..fc3f5db03c 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/QName.java @@ -22,7 +22,7 @@ import java.util.Objects; import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.RegEx; +import org.checkerframework.checker.regex.qual.Regex; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.yangtools.concepts.Identifier; @@ -62,11 +62,11 @@ public final class QName implements Immutable, Serializable, Comparable, static final String QNAME_LEFT_PARENTHESIS = "("; static final String QNAME_RIGHT_PARENTHESIS = ")"; - @RegEx + @Regex private static final String QNAME_STRING_FULL = "^\\((.+)\\?revision=(.+)\\)(.+)$"; private static final Pattern QNAME_PATTERN_FULL = Pattern.compile(QNAME_STRING_FULL); - @RegEx + @Regex private static final String QNAME_STRING_NO_REVISION = "^\\((.+)\\)(.+)$"; private static final Pattern QNAME_PATTERN_NO_REVISION = Pattern.compile(QNAME_STRING_NO_REVISION); diff --git a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Revision.java b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Revision.java index 70b749cb0c..fcc9019fd3 100644 --- a/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Revision.java +++ b/yang/yang-common/src/main/java/org/opendaylight/yangtools/yang/common/Revision.java @@ -18,7 +18,7 @@ import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.util.Optional; import java.util.regex.Pattern; -import javax.annotation.RegEx; +import org.checkerframework.checker.regex.qual.Regex; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; @@ -43,7 +43,7 @@ public final class Revision implements Comparable, Serializable { private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd"); - @RegEx + @Regex // FIXME: we should improve this to filter incorrect dates -- see constructor. private static final String STRING_FORMAT_PATTERN_STR = "\\d\\d\\d\\d\\-\\d\\d-\\d\\d"; diff --git a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java index bbebf2c6b3..556809c70f 100644 --- a/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java +++ b/yang/yang-data-codec-gson/src/main/java/org/opendaylight/yangtools/yang/data/codec/gson/JSONNormalizedNodeStreamWriter.java @@ -15,8 +15,8 @@ import com.google.gson.stream.JsonWriter; import java.io.IOException; import java.net.URI; import java.util.regex.Pattern; -import javax.annotation.RegEx; import javax.xml.transform.dom.DOMSource; +import org.checkerframework.checker.regex.qual.Regex; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; @@ -73,11 +73,11 @@ public abstract class JSONNormalizedNodeStreamWriter implements NormalizedNodeSt */ private static final boolean DEFAULT_EMIT_EMPTY_CONTAINERS = true; - @RegEx + @Regex private static final String NUMBER_STRING = "-?\\d+(\\.\\d+)?"; private static final Pattern NUMBER_PATTERN = Pattern.compile(NUMBER_STRING); - @RegEx + @Regex private static final String NOT_DECIMAL_NUMBER_STRING = "-?\\d+"; private static final Pattern NOT_DECIMAL_NUMBER_PATTERN = Pattern.compile(NOT_DECIMAL_NUMBER_STRING); diff --git a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java index 930e9bdf91..15edcb925c 100644 --- a/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java +++ b/yang/yang-data-jaxen/src/main/java/org/opendaylight/yangtools/yang/data/jaxen/LeafrefXPathStringParsingPathArgumentBuilder.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.RegEx; +import org.checkerframework.checker.regex.qual.Regex; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; @@ -38,7 +38,7 @@ final class LeafrefXPathStringParsingPathArgumentBuilder implements Builder org.opendaylight.odlparent odlparent - 4.0.9 + 5.0.0 diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml index 96a5de8b04..8e3111f751 100644 --- a/yang/yang-maven-plugin-spi/pom.xml +++ b/yang/yang-maven-plugin-spi/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 4.0.9 + 5.0.0 diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml index 83136ad29d..358a546a8b 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 4.0.9 + 5.0.0 diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java index 3c3b4ab222..e3ea1b7e1f 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/AbstractSchemaRepository.java @@ -27,7 +27,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import javax.annotation.concurrent.GuardedBy; +import org.checkerframework.checker.lock.qual.GuardedBy; import org.opendaylight.yangtools.yang.model.repo.api.MissingSchemaSourceException; import org.opendaylight.yangtools.yang.model.repo.api.SchemaRepository; import org.opendaylight.yangtools.yang.model.repo.api.SchemaSourceRepresentation; diff --git a/yang/yang-model-validator/pom.xml b/yang/yang-model-validator/pom.xml index 3286822c0e..92f02c4d62 100644 --- a/yang/yang-model-validator/pom.xml +++ b/yang/yang-model-validator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 4.0.9 + 5.0.0 diff --git a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ArgumentUtils.java b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ArgumentUtils.java index 73ab63ee97..a8ad2201ba 100644 --- a/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ArgumentUtils.java +++ b/yang/yang-parser-rfc7950/src/main/java/org/opendaylight/yangtools/yang/parser/rfc7950/stmt/ArgumentUtils.java @@ -18,10 +18,10 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.RegEx; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; +import org.checkerframework.checker.regex.qual.Regex; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangVersion; @@ -48,12 +48,12 @@ public final class ArgumentUtils { private static final Logger LOG = LoggerFactory.getLogger(ArgumentUtils.class); - @RegEx + @Regex private static final String YANG_XPATH_FUNCTIONS_STRING = "(re-match|deref|derived-from(-or-self)?|enum-value|bit-is-set)([ \t\r\n]*)(\\()"; private static final Pattern YANG_XPATH_FUNCTIONS_PATTERN = Pattern.compile(YANG_XPATH_FUNCTIONS_STRING); - @RegEx + @Regex private static final String PATH_ABS_STR = "/[^/].*"; private static final Pattern PATH_ABS = Pattern.compile(PATH_ABS_STR); private static final Splitter SLASH_SPLITTER = Splitter.on('/').omitEmptyStrings().trimResults(); -- 2.36.6