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 <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 49971658000644b8e424b5faace77746ad718d84..8e48f89511fa44a5114585ad3939afbb9e89733c 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>4.0.9</version>
+      <version>5.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 3fbb11cb503edd12e5f8225a8ab527793533c8ac..24d310e7d86cfeccbe4257aa4c8c73033ca9dc9b 100644 (file)
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml
index bf22906d6fb8e26bd5235bbfd32104b90163b6c3..3b6e0afe17a76aee52f8894caeb43883f8b0415d 100644 (file)
--- a/bundle-parent/pom.xml
+++ b/bundle-parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

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 d4570ad366a7510ab4bbe95b8745515331877049..7290be85aedaacd3ef635b75d08080aa557ca1b1 100644 (file)
--- 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<SemVer>, 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 d370a97176a966b80cff53112c0cd933ad0fee12..f1106903b5b4f1520e5a313948dd4afda88d5c67 100644 (file)
--- a/common/mockito-configuration/pom.xml
+++ b/common/mockito-configuration/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/common/pom.xml b/common/pom.xml
index 3d243618a999951db78bc550909ea938cbdd23c3..d03f5491a3aae8a9b80ca86b533e909f9c018790 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>4.0.9</version>
+      <version>5.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml
index be470fa309d1f3ddee061036ec47302d8f2f160c..8b8fead55a41f1033a97ba668e8c854b025a7b71 100644 (file)
--- a/common/testutils/pom.xml
+++ b/common/testutils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

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 4baf4a4203818fa3c3e37b6ed1abdd8ed2cb5746..25e9c51ac69b41d98f347753b5ce705160881a5d 100644 (file)
--- 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 35be7f7f302b160dcb964b056f22155cf6f69079..d4c47b61dc505f973396deb024e7cfea592ee12d 100644 (file)
--- 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 595d9fc3e4a4e82483d2bd4c0242a54a98081e1a..077e8272540cd7d008524cd291ced159d94016e7 100644 (file)
--- 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 7bf868a8ac60ba5a93902c969bfb3197369adf18..f736cd3ca26dcb71d6358b108468452a15a9805e 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml
index 4808763b2667f5771d8c8245e1ba3b330476d104..bc04c75071d49fa4110e34f926572348765ddb9d 100644 (file)
--- a/features/features-yangtools-experimental/pom.xml
+++ b/features/features-yangtools-experimental/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml
index 3d75dcc8af613fe960383962847b1bc9d2adbca6..7a07435f4c696ddee3ab715b56255cda227c51c1 100644 (file)
--- a/features/features-yangtools/pom.xml
+++ b/features/features-yangtools/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml
index b0d5351d56348dc29ed8b69c7f89cc6543937625..b1761a738bcf7ea22874a72ccd438743ba72dde8 100644 (file)
--- a/features/odl-yangtools-codec/pom.xml
+++ b/features/odl-yangtools-codec/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-codec/src/main/feature/feature.xml b/features/odl-yangtools-codec/src/main/feature/feature.xml
index ae0b23c45bf5296f26ee2e8f652e88757545e1d0..e77fd6c3d10067e9c30b15d39dd606017dba6b27 100644 (file)
--- a/features/odl-yangtools-codec/src/main/feature/feature.xml
+++ b/features/odl-yangtools-codec/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-codec">
     <feature name="odl-yangtools-codec">
-        <feature version="[4.0.8,5)">odl-gson</feature>
-        <feature version="[4.0.8,5)">odl-stax2-api</feature>
+        <feature version="[5,6)">odl-gson</feature>
+        <feature version="[5,6)">odl-stax2-api</feature>
     </feature>
 </features>

diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml
index 498adf5d9f5ca2ed9e0e5878513d18a6d50ce84d..1cdf97898a1903ffb075fa22c4ffaff659363d27 100644 (file)
--- a/features/odl-yangtools-common/pom.xml
+++ b/features/odl-yangtools-common/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml
index cf64d8fb06a5523e33005b5a48061be97248ba13..54175f4f4eca76bc11c3c986a323e3042631a1c4 100644 (file)
--- a/features/odl-yangtools-data-api/pom.xml
+++ b/features/odl-yangtools-data-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml
index 448b769bfa96a1c9713239cb12c9847702a491dc..5d8735d316325e8fa6d74c32b57bf35fe604951d 100644 (file)
--- a/features/odl-yangtools-data/pom.xml
+++ b/features/odl-yangtools-data/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-data/src/main/feature/feature.xml b/features/odl-yangtools-data/src/main/feature/feature.xml
index e2c6308c78c9b519bf83d943f9920e2b6d55ee31..b46e91df388a57ba327ea7cfbf97a0fb8b5b1532 100644 (file)
--- a/features/odl-yangtools-data/src/main/feature/feature.xml
+++ b/features/odl-yangtools-data/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-data">
     <feature name="odl-yangtools-data">
-        <feature version="[4.0.8,5)">odl-antlr4</feature>
+        <feature version="[5,6)">odl-antlr4</feature>
     </feature>
 </features>

diff --git a/features/odl-yangtools-exp-data-xpath-api/pom.xml b/features/odl-yangtools-exp-data-xpath-api/pom.xml
index b8c5e8c0d358519d0939f141c5eb9c2d861dfc2d..0ddbf43bae18c73736d3da901f8ed321b41bffd8 100644 (file)
--- a/features/odl-yangtools-exp-data-xpath-api/pom.xml
+++ b/features/odl-yangtools-exp-data-xpath-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-exp-data-xpath/pom.xml b/features/odl-yangtools-exp-data-xpath/pom.xml
index 514b7ede33db7c6d0dda51f27d0e90c9111532bb..674eccb0a18f4d933e1233c1bcf880b0ddfce351 100644 (file)
--- a/features/odl-yangtools-exp-data-xpath/pom.xml
+++ b/features/odl-yangtools-exp-data-xpath/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml
index 77c4aefb0cb47df05c50e290c7644d6b6677068f..6aee9a9a841c9e8b99b4c531a3752e8b5ecd744c 100644 (file)
--- a/features/odl-yangtools-export/pom.xml
+++ b/features/odl-yangtools-export/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml
index 9534f7bfce52db37e0d72f44feab1f375786e209..f12242cb8880351a1e69e47782ec6ebfcebe8824 100644 (file)
--- a/features/odl-yangtools-parser-api/pom.xml
+++ b/features/odl-yangtools-parser-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml
index 4e566ced59bb6c78d01d542cac65dfe0f0263944..894e4d7b079a5b38aa7946fdf6def667b4a70b8d 100644 (file)
--- a/features/odl-yangtools-parser/pom.xml
+++ b/features/odl-yangtools-parser/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-parser/src/main/feature/feature.xml b/features/odl-yangtools-parser/src/main/feature/feature.xml
index b42a25e524326a67b6c103f23b1340cdd575f160..3e3fe1c785c04852fd88431da985dba4e088c842 100644 (file)
--- a/features/odl-yangtools-parser/src/main/feature/feature.xml
+++ b/features/odl-yangtools-parser/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-yangtools-parser">
     <feature name="odl-yangtools-parser">
-        <feature version="[4.0.8,5)">odl-antlr4</feature>
+        <feature version="[5,6)">odl-antlr4</feature>
     </feature>
 </features>

diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml
index d08fba4f2aa7c4a12972e54b6edcf74cb3bfa768..06a88fbf359f440e141df1f2c3895ab5d88909ac 100644 (file)
--- a/features/odl-yangtools-util/pom.xml
+++ b/features/odl-yangtools-util/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml
index 74788bbde133a89695f8da7e928c2fcd993b0bec..16b99923cea3d0352aef45563b2bd5ae49093731 100644 (file)
--- a/features/odl-yangtools-xpath-api/pom.xml
+++ b/features/odl-yangtools-xpath-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml
index 810638df1ce7877342b9487413f971457df1f8b1..c0e7b4bd28a5a281c4f516116a87c85fa4540b03 100644 (file)
--- a/features/odl-yangtools-xpath/pom.xml
+++ b/features/odl-yangtools-xpath/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/pom.xml b/features/pom.xml
index dc01f897cc12b034fcc439aae490915d54a0df5c..8e12d37b78f4ab1d57823fe3ea6a5b339b92ce13 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 43b40b253335c3108ef51a3486afd2240c960211..418b7e7b65d12d13a1c972fc0cc617240c0388d8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>4.0.9</version>
+      <version>5.0.0</version>
       <relativePath/>
     </parent>
 

diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml
index 3bbbba3fc0bb9b51e2bcbd582c7460955e03e669..e1ef08830d98425d0f219102a1b7b9a53e95f942 100644 (file)
--- a/yang-validation-tool/pom.xml
+++ b/yang-validation-tool/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/pom.xml b/yang/pom.xml
index 1980bba7b7e13ffaed5fa2e7411aa2ca61d35b3e..1b3f5dde5b7a66ab6cbfde792913483896457d5d 100644 (file)
--- a/yang/pom.xml
+++ b/yang/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

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 9b17b4522699dd99d38149b2e1a3096679bcdf0b..fc3f5db03c2897ae7f17bde27e811608aef782a3 100644 (file)
--- 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<QName>,
     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 70b749cb0cf59569bcb733a998fccbab9040d8f2..fcc9019fd3c146bce676159c26f7c48a86651f96 100644 (file)
--- 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<Revision>, 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 bbebf2c6b3dbbbac7f0a04655bf3e21a255b80ef..556809c70fcbf45a4ea6c5169d1211cbd09b4cb7 100644 (file)
--- 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 930e9bdf91fa5ce6b3c7b594274bad91cf40c8f0..15edcb925c9a20f2a92d4f38d205543831ed0c5a 100644 (file)
--- 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<List
     private static final String UP_ONE_LEVEL = "..";
     private static final String CURRENT_FUNCTION_INVOCATION_STR = "current()";
 
-    @RegEx
+    @Regex
     private static final String NODE_IDENTIFIER_STR = "([A-Za-z_][A-Za-z0-9_\\.-]*:)?([A-Za-z_][A-Za-z0-9_\\.-]*)";
 
     /**

diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml
index df323cf775a9273b6363847172806e04373a7da5..c2d84fe20d8bf3dd11e4854c1d943fde0a62c5ac 100644 (file)
--- a/yang/yang-maven-plugin-it/pom.xml
+++ b/yang/yang-maven-plugin-it/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml
index 96a5de8b042661d2513c908a08640a750c42efa8..8e3111f751852b7e3c15f72be02191982683ef7b 100644 (file)
--- a/yang/yang-maven-plugin-spi/pom.xml
+++ b/yang/yang-maven-plugin-spi/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml
index 83136ad29d786e73ffaf2109d833f13087832959..358a546a8b34d98024379f0f4c68a4305de838f8 100644 (file)
--- a/yang/yang-maven-plugin/pom.xml
+++ b/yang/yang-maven-plugin/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

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 3c3b4ab222e2bbd0a77a5465f23c6690574ed454..e3ea1b7e1fe16e3fde96c599b40212cc28aa47bf 100644 (file)
--- 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 3286822c0ee9ce1308184c8324e44a009f44a385..92f02c4d62a13510e73eddd8866ffbe6bba684fb 100644 (file)
--- a/yang/yang-model-validator/pom.xml
+++ b/yang/yang-model-validator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>4.0.9</version>
+        <version>5.0.0</version>
         <relativePath/>
     </parent>
 

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 73ab63ee97fd3517c59822a97a5626a6ee9612e1..a8ad2201bab6c503b6f7fe117018682a499eac36 100644 (file)
--- 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();