From c28414631b8e5d6f1cf5c22958b7902fa691019c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 5 Aug 2019 11:27:39 +0200 Subject: [PATCH] Bump odlparent to 6.0.0-SNAPSHOT We will need some JDK11 work done, for that we'll use odlparent snapshots for a while. Due to MJAVADOC (and underlying JDK-8220702) we keep the target of yang-data-impl and yang-parser-rfc7950 at 8. Change-Id: I3da91a8a6b1dfd4cc40c7e0e9fdd527733da5331 Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- benchmarks/pom.xml | 2 +- bundle-parent/pom.xml | 2 +- common/mockito-configuration/pom.xml | 2 +- common/pom.xml | 2 +- common/testutils/pom.xml | 2 +- .../org/opendaylight/yangtools/util/ImmutableOffsetMap.java | 3 +++ 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 +- features/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 +- features/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 +- features/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 +- .../yangtools/yang/data/api/YangInstanceIdentifier.java | 2 ++ yang/yang-data-impl/pom.xml | 5 +++++ yang/yang-maven-plugin-it/pom.xml | 2 +- yang/yang-maven-plugin-spi/pom.xml | 2 +- yang/yang-maven-plugin/pom.xml | 2 +- .../yangtools/yang/model/api/stmt/UnresolvedNumber.java | 3 +++ .../yang/model/repo/util/AbstractSchemaRepository.java | 5 ++++- yang/yang-model-validator/pom.xml | 2 +- yang/yang-parser-rfc7950/pom.xml | 5 +++++ .../yangtools/yang/parser/rfc7950/stmt/ArgumentUtils.java | 3 +++ yang/yang-xpath-impl/pom.xml | 5 +++++ 40 files changed, 63 insertions(+), 34 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 76b27d5769..854ca9f8d0 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 119e71041a..54159e3bc9 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT 4.0.0 diff --git a/bundle-parent/pom.xml b/bundle-parent/pom.xml index 8b041188a0..89d958d6c9 100644 --- a/bundle-parent/pom.xml +++ b/bundle-parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index ee0948dc9d..7670f98a81 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 8de409af62..9758ad49cd 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml index 50656c5cfc..d1e69837ac 100644 --- a/common/testutils/pom.xml +++ b/common/testutils/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java index aa44a97dea..be0bcbf3da 100644 --- a/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java +++ b/common/util/src/main/java/org/opendaylight/yangtools/util/ImmutableOffsetMap.java @@ -13,6 +13,7 @@ import static java.util.Objects.requireNonNull; import com.google.common.annotations.Beta; import com.google.common.collect.ImmutableMap; import com.google.common.collect.UnmodifiableIterator; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; @@ -392,6 +393,8 @@ public abstract class ImmutableOffsetMap implements UnmodifiableMapPhase map, final @NonNull Field field, final Object value) throws IOException { try { diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml index 8c01877789..484721629f 100644 --- a/distribution-karaf/pom.xml +++ b/distribution-karaf/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent karaf4-parent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml index 4daa380707..ca3cf4bb91 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml index 9c5fe04b2c..be988645eb 100644 --- a/features/features-yangtools/pom.xml +++ b/features/features-yangtools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml index 4a18887fde..3c0f82fa1f 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-codec/src/main/feature/feature.xml b/features/odl-yangtools-codec/src/main/feature/feature.xml index e77fd6c3d1..c4bf354159 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 51f466acc1..d680919600 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index 9e4cfc4eef..46549af78b 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml index 4e751d153a..273455c4a5 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-data/src/main/feature/feature.xml b/features/odl-yangtools-data/src/main/feature/feature.xml index b46e91df38..dd3f693915 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 e8af792490..2ada50aa23 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-exp-data-xpath/pom.xml b/features/odl-yangtools-exp-data-xpath/pom.xml index 22831301ad..c684301dcd 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml index 7b81f9ef9c..5ab73eee58 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml index 6d48148d1e..2382e1af9a 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml index 5573d6450e..b5fcd8a69e 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-parser/src/main/feature/feature.xml b/features/odl-yangtools-parser/src/main/feature/feature.xml index 3e3fe1c785..760cd874f5 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 c4a03183ce..0a2c415791 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-xpath-api/pom.xml b/features/odl-yangtools-xpath-api/pom.xml index ddecb77108..bb0664ff8a 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml index 17179c00f7..cc11a23420 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/features/pom.xml b/features/pom.xml index 68223b6477..44ed80f634 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1669fe7edb..1625f1fc7d 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml index ca7174a870..dcb90d3814 100644 --- a/yang-validation-tool/pom.xml +++ b/yang-validation-tool/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/yang/pom.xml b/yang/pom.xml index 310e1ae993..33d6e613bb 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java index 8fd4f31cfa..6a29f11a64 100644 --- a/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java +++ b/yang/yang-data-api/src/main/java/org/opendaylight/yangtools/yang/data/api/YangInstanceIdentifier.java @@ -363,6 +363,8 @@ public abstract class YangInstanceIdentifier implements Path${project.artifactId} ${project.artifactId} + + + 8 + + diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml index dc3e93d534..34ce26a0b8 100644 --- a/yang/yang-maven-plugin-it/pom.xml +++ b/yang/yang-maven-plugin-it/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml index cec410587b..dbaaded453 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 - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml index 56af0fa707..86c88497a1 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java index 4d65f61f1d..c90106cef2 100644 --- a/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java +++ b/yang/yang-model-api/src/main/java/org/opendaylight/yangtools/yang/model/api/stmt/UnresolvedNumber.java @@ -11,6 +11,7 @@ import static com.google.common.base.Preconditions.checkArgument; import com.google.common.annotations.Beta; import com.google.common.collect.Range; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.concepts.Immutable; @@ -91,6 +92,8 @@ public abstract class UnresolvedNumber extends Number implements Immutable { throw new UnsupportedOperationException(); } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private static T resolve(final T number) { checkArgument(!(number instanceof UnresolvedNumber)); return number; 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 c8e39ab6cc..44ea4e2536 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 @@ -18,6 +18,7 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -142,6 +143,8 @@ public abstract class AbstractSchemaRepository implements SchemaRepository, Sche } } + @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD", + justification = "https://github.com/spotbugs/spotbugs/issues/811") private synchronized void removeSource(final PotentialSchemaSource source, final SchemaSourceRegistration reg) { final Multimap, AbstractSchemaSourceRegistration> m = @@ -164,7 +167,7 @@ public abstract class AbstractSchemaRepository implements SchemaRepository, Sche final SchemaSourceProvider provider, final PotentialSchemaSource source) { final PotentialSchemaSource src = source.cachedReference(); - final AbstractSchemaSourceRegistration ret = new AbstractSchemaSourceRegistration(provider, src) { + final AbstractSchemaSourceRegistration ret = new AbstractSchemaSourceRegistration<>(provider, src) { @Override protected void removeRegistration() { removeSource(src, this); diff --git a/yang/yang-model-validator/pom.xml b/yang/yang-model-validator/pom.xml index 34c4152a27..cc39d69b6c 100644 --- a/yang/yang-model-validator/pom.xml +++ b/yang/yang-model-validator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent odlparent - 5.0.2-SNAPSHOT + 6.0.0-SNAPSHOT diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml index e570e87ce9..1e2913170e 100644 --- a/yang/yang-parser-rfc7950/pom.xml +++ b/yang/yang-parser-rfc7950/pom.xml @@ -21,6 +21,11 @@ ${project.artifactId} RFC6020/RFC7950 parser support + + + 8 + + com.google.guava 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 28538ee98e..a931ff15dd 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 @@ -23,6 +23,7 @@ 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.gaul.modernizer_maven_annotations.SuppressModernizer; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.YangVersion; import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; @@ -153,6 +154,8 @@ public final class ArgumentUtils { XPATH_FACTORY.remove(); } + // FIXME: remove suppression when we have release=9 + @SuppressModernizer private static String addPrefixToYangXPathFunctions(final String path, final StmtContext ctx) { if (ctx.getRootVersion() == YangVersion.VERSION_1_1) { // FIXME once Java 9 is available, change this to StringBuilder as Matcher.appendReplacement() and diff --git a/yang/yang-xpath-impl/pom.xml b/yang/yang-xpath-impl/pom.xml index 1bf2900728..9d4e6aa8e7 100644 --- a/yang/yang-xpath-impl/pom.xml +++ b/yang/yang-xpath-impl/pom.xml @@ -22,6 +22,11 @@ ${project.artifactId} YANG XPath parser + + + 8 + + com.google.guava -- 2.36.6