From a93d098c5ea45c25d61db588c8082d1b8553628e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 18 Oct 2017 14:30:36 +0200 Subject: [PATCH] Bump odlparent to 3.0.0-SNAPSHOT and fix breakages This patch bumps the odlparent version, bringing in changes in that release. This break checkstyle-logging, which is fixed here. Change-Id: Iee8fae0c70c83add3f4e7bade75eb86bf8f4d4bc Signed-off-by: Robert Varga Signed-off-by: Stephen Kitt --- benchmarks/pom.xml | 2 +- common/artifacts/pom.xml | 2 +- common/checkstyle-logging/pom.xml | 2 +- .../checkstyle/AbstractLogMessageCheck.java | 13 ++++++++++++- .../LogMessageConcatenationCheck.java | 13 ++++++++++++- .../LoggerDeclarationsCountCheck.java | 19 +++++++++++++++---- .../LoggerFactoryClassParameterCheck.java | 13 ++++++++++++- .../checkstyle/LoggerMustBeSlf4jCheck.java | 15 +++++++++++++-- .../LoggerVariableModifiersCheck.java | 13 ++++++++++++- .../checkstyle/LoggerVariableNameCheck.java | 13 ++++++++++++- common/concepts/pom.xml | 2 +- common/mockito-configuration/pom.xml | 2 +- common/object-cache-api/pom.xml | 2 +- common/object-cache-guava/pom.xml | 2 +- common/object-cache-noop/pom.xml | 2 +- common/pom.xml | 2 +- common/testutils/pom.xml | 2 +- common/util/pom.xml | 2 +- .../features-yangtools-experimental/pom.xml | 2 +- features/features-yangtools/pom.xml | 2 +- features/odl-exp-objcache/pom.xml | 2 +- features/odl-triemap/pom.xml | 6 +++--- features/odl-yangtools-codec/pom.xml | 2 +- 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-export/pom.xml | 2 +- features/odl-yangtools-parser-api/pom.xml | 2 +- features/odl-yangtools-parser/pom.xml | 2 +- features/odl-yangtools-util/pom.xml | 2 +- features/odl-yangtools-xpath/pom.xml | 2 +- features/pom.xml | 2 +- pom.xml | 2 +- third-party/pom.xml | 2 +- third-party/triemap/pom.xml | 2 +- yang-validation-tool/pom.xml | 2 +- yang/odlext-model-api/pom.xml | 2 +- yang/odlext-parser-support/pom.xml | 2 +- yang/openconfig-model-api/pom.xml | 2 +- yang/openconfig-parser-support/pom.xml | 2 +- yang/pom.xml | 2 +- yang/rfc7952-model-api/pom.xml | 2 +- yang/rfc7952-parser-support/pom.xml | 2 +- yang/rfc8040-model-api/pom.xml | 2 +- yang/rfc8040-parser-support/pom.xml | 2 +- yang/yang-common/pom.xml | 2 +- yang/yang-data-api/pom.xml | 2 +- yang/yang-data-codec-gson/pom.xml | 2 +- yang/yang-data-codec-xml/pom.xml | 2 +- yang/yang-data-impl/pom.xml | 2 +- yang/yang-data-jaxen/pom.xml | 2 +- yang/yang-data-transform/pom.xml | 2 +- yang/yang-data-util/pom.xml | 2 +- yang/yang-maven-plugin-it/pom.xml | 9 ++++++++- yang/yang-maven-plugin-spi/pom.xml | 2 +- yang/yang-maven-plugin/pom.xml | 2 +- yang/yang-model-api/pom.xml | 2 +- yang/yang-model-export/pom.xml | 2 +- yang/yang-model-immutable/pom.xml | 2 +- yang/yang-model-util/pom.xml | 2 +- yang/yang-model-validator/pom.xml | 2 +- yang/yang-parser-api/pom.xml | 2 +- yang/yang-parser-impl/pom.xml | 2 +- yang/yang-parser-reactor/pom.xml | 2 +- yang/yang-parser-rfc7950/pom.xml | 2 +- yang/yang-parser-spi/pom.xml | 2 +- yang/yang-test-util/pom.xml | 2 +- 67 files changed, 157 insertions(+), 73 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 9691c0d19c..7ee7dc3722 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.0-SNAPSHOT 4.0.0 diff --git a/common/artifacts/pom.xml b/common/artifacts/pom.xml index a6f30490eb..69f1405277 100644 --- a/common/artifacts/pom.xml +++ b/common/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/common/checkstyle-logging/pom.xml b/common/checkstyle-logging/pom.xml index d76cfc78be..cbed1b26fd 100644 --- a/common/checkstyle-logging/pom.xml +++ b/common/checkstyle-logging/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT org.opendaylight.yangtools diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/AbstractLogMessageCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/AbstractLogMessageCheck.java index 4c1d4a1f11..33e6feb5fc 100644 --- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/AbstractLogMessageCheck.java +++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/AbstractLogMessageCheck.java @@ -13,10 +13,21 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; import java.util.Optional; public abstract class AbstractLogMessageCheck extends AbstractCheck { + private static final int[] TOKENS = { TokenTypes.METHOD_CALL }; @Override public int[] getDefaultTokens() { - return new int[]{TokenTypes.METHOD_CALL}; + return TOKENS; + } + + @Override + public int[] getAcceptableTokens() { + return TOKENS; + } + + @Override + public int[] getRequiredTokens() { + return TOKENS; } @Override diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LogMessageConcatenationCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LogMessageConcatenationCheck.java index da8ba1c344..a077ed6f83 100644 --- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LogMessageConcatenationCheck.java +++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LogMessageConcatenationCheck.java @@ -15,10 +15,21 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class LogMessageConcatenationCheck extends AbstractCheck { private static final String LOG_MESSAGE = "Log message contains string concatenation."; + private static final int[] TOKENS = { TokenTypes.METHOD_CALL }; @Override public int[] getDefaultTokens() { - return new int[]{TokenTypes.METHOD_CALL}; + return TOKENS; + } + + @Override + public int[] getAcceptableTokens() { + return TOKENS; + } + + @Override + public int[] getRequiredTokens() { + return TOKENS; } @Override diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerDeclarationsCountCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerDeclarationsCountCheck.java index ea0270784b..f16dae6dd9 100644 --- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerDeclarationsCountCheck.java +++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerDeclarationsCountCheck.java @@ -17,15 +17,27 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class LoggerDeclarationsCountCheck extends AbstractCheck { private static final String LOG_MESSAGE = "Logger might be declared only once."; + private static final int[] TOKENS = { TokenTypes.VARIABLE_DEF }; + private String prevClassName = ""; @Override public int[] getDefaultTokens() { - return new int[]{TokenTypes.VARIABLE_DEF}; + return TOKENS; + } + + @Override + public int[] getAcceptableTokens() { + return TOKENS; } @Override - public void visitToken(DetailAST ast) { + public int[] getRequiredTokens() { + return TOKENS; + } + + @Override + public void visitToken(final DetailAST ast) { if (CheckLoggingUtil.isLoggerType(ast) && isAFieldVariable(ast)) { final String className = CheckLoggingUtil.getClassName(ast); if (this.prevClassName.equals(className)) { @@ -36,9 +48,8 @@ public class LoggerDeclarationsCountCheck extends AbstractCheck { } @Override - public void finishTree(DetailAST rootAST) { + public void finishTree(final DetailAST rootAST) { super.finishTree(rootAST); this.prevClassName = ""; } - } diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerFactoryClassParameterCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerFactoryClassParameterCheck.java index e16129ec4e..21d4abacba 100644 --- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerFactoryClassParameterCheck.java +++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerFactoryClassParameterCheck.java @@ -17,10 +17,21 @@ public class LoggerFactoryClassParameterCheck extends AbstractCheck { private static final String LOG_MESSAGE = "LoggerFactory.getLogger Class argument is incorrect."; private static final String METHOD_NAME = "LoggerFactory.getLogger"; + private static final int[] TOKENS = { TokenTypes.METHOD_CALL }; @Override public int[] getDefaultTokens() { - return new int[] { TokenTypes.METHOD_CALL }; + return TOKENS; + } + + @Override + public int[] getAcceptableTokens() { + return TOKENS; + } + + @Override + public int[] getRequiredTokens() { + return TOKENS; } @Override diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerMustBeSlf4jCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerMustBeSlf4jCheck.java index 19eadfd109..71280fbaa7 100644 --- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerMustBeSlf4jCheck.java +++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerMustBeSlf4jCheck.java @@ -19,14 +19,25 @@ public class LoggerMustBeSlf4jCheck extends AbstractCheck { private static final String LOG_MESSAGE = "Logger must be slf4j."; private static final String SLF4J = "slf4j"; + private static final int[] TOKENS = { TokenTypes.VARIABLE_DEF, TokenTypes.IMPORT }; @Override public int[] getDefaultTokens() { - return new int[]{TokenTypes.VARIABLE_DEF, TokenTypes.IMPORT}; + return TOKENS; } @Override - public void visitToken(DetailAST ast) { + public int[] getAcceptableTokens() { + return TOKENS; + } + + @Override + public int[] getRequiredTokens() { + return TOKENS; + } + + @Override + public void visitToken(final DetailAST ast) { if (ast.getType() == TokenTypes.VARIABLE_DEF) { if (CheckLoggingUtil.isAFieldVariable(ast)) { final String typeName = CheckLoggingUtil.getTypeName(ast); diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java index 2cd397acc3..1856a1fe04 100644 --- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java +++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableModifiersCheck.java @@ -15,10 +15,21 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class LoggerVariableModifiersCheck extends AbstractCheck { private static final String LOG_MESSAGE = "Logger must be declared as private static final."; + private static final int[] TOKENS = { TokenTypes.VARIABLE_DEF }; @Override public int[] getDefaultTokens() { - return new int[]{TokenTypes.VARIABLE_DEF}; + return TOKENS; + } + + @Override + public int[] getAcceptableTokens() { + return TOKENS; + } + + @Override + public int[] getRequiredTokens() { + return TOKENS; } @Override diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableNameCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableNameCheck.java index ffa9d9800f..5c28ce15c2 100644 --- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableNameCheck.java +++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableNameCheck.java @@ -17,10 +17,21 @@ import com.puppycrawl.tools.checkstyle.api.TokenTypes; public class LoggerVariableNameCheck extends AbstractCheck { private static final String LOG_MESSAGE = "Logger name should be LOG."; + private static final int[] TOKENS = { TokenTypes.VARIABLE_DEF }; @Override public int[] getDefaultTokens() { - return new int[]{TokenTypes.VARIABLE_DEF}; + return TOKENS; + } + + @Override + public int[] getAcceptableTokens() { + return TOKENS; + } + + @Override + public int[] getRequiredTokens() { + return TOKENS; } @Override diff --git a/common/concepts/pom.xml b/common/concepts/pom.xml index ea9c90a699..989ef586e7 100644 --- a/common/concepts/pom.xml +++ b/common/concepts/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/common/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml index 6dd559b0ac..c232e76d50 100644 --- a/common/mockito-configuration/pom.xml +++ b/common/mockito-configuration/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/common/object-cache-api/pom.xml b/common/object-cache-api/pom.xml index 2405dad95a..9206123617 100644 --- a/common/object-cache-api/pom.xml +++ b/common/object-cache-api/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT bundle diff --git a/common/object-cache-guava/pom.xml b/common/object-cache-guava/pom.xml index 0f7de712ef..007429c068 100644 --- a/common/object-cache-guava/pom.xml +++ b/common/object-cache-guava/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/common/object-cache-noop/pom.xml b/common/object-cache-noop/pom.xml index 7b0c697a05..911c3ad9af 100644 --- a/common/object-cache-noop/pom.xml +++ b/common/object-cache-noop/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT bundle diff --git a/common/pom.xml b/common/pom.xml index 08368424c0..8443aef278 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/common/testutils/pom.xml b/common/testutils/pom.xml index 5b8d68e76c..cf5bde7dd0 100644 --- a/common/testutils/pom.xml +++ b/common/testutils/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/common/util/pom.xml b/common/util/pom.xml index 3b2b1e4787..5b713de7af 100644 --- a/common/util/pom.xml +++ b/common/util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT bundle diff --git a/features/features-yangtools-experimental/pom.xml b/features/features-yangtools-experimental/pom.xml index df1cc4a5bf..4cbbeff208 100644 --- a/features/features-yangtools-experimental/pom.xml +++ b/features/features-yangtools-experimental/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/features-yangtools/pom.xml b/features/features-yangtools/pom.xml index ca15103476..af82a41277 100644 --- a/features/features-yangtools/pom.xml +++ b/features/features-yangtools/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent feature-repo-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-exp-objcache/pom.xml b/features/odl-exp-objcache/pom.xml index 8a59ef14c5..aac77a2dbb 100644 --- a/features/odl-exp-objcache/pom.xml +++ b/features/odl-exp-objcache/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-triemap/pom.xml b/features/odl-triemap/pom.xml index 8bd5956e3b..26afdd4ba1 100644 --- a/features/odl-triemap/pom.xml +++ b/features/odl-triemap/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT @@ -40,8 +40,8 @@ org.opendaylight.odlparent - odl-guava-22 - 2.0.5 + odl-guava-23 + 3.0.0-SNAPSHOT xml features diff --git a/features/odl-yangtools-codec/pom.xml b/features/odl-yangtools-codec/pom.xml index 5aaaa6a113..af52fdd4d3 100644 --- a/features/odl-yangtools-codec/pom.xml +++ b/features/odl-yangtools-codec/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-yangtools-common/pom.xml b/features/odl-yangtools-common/pom.xml index cb0ce3fa87..ea020db78a 100644 --- a/features/odl-yangtools-common/pom.xml +++ b/features/odl-yangtools-common/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-yangtools-data-api/pom.xml b/features/odl-yangtools-data-api/pom.xml index 29e6523310..26ef2ed21c 100644 --- a/features/odl-yangtools-data-api/pom.xml +++ b/features/odl-yangtools-data-api/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-yangtools-data/pom.xml b/features/odl-yangtools-data/pom.xml index 660ad6728d..f5a2578302 100644 --- a/features/odl-yangtools-data/pom.xml +++ b/features/odl-yangtools-data/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-yangtools-export/pom.xml b/features/odl-yangtools-export/pom.xml index 4925ccf88d..3574f6b092 100644 --- a/features/odl-yangtools-export/pom.xml +++ b/features/odl-yangtools-export/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-yangtools-parser-api/pom.xml b/features/odl-yangtools-parser-api/pom.xml index e5d3f6d098..c51a780f47 100644 --- a/features/odl-yangtools-parser-api/pom.xml +++ b/features/odl-yangtools-parser-api/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-yangtools-parser/pom.xml b/features/odl-yangtools-parser/pom.xml index e1922b34ee..d8c2d09899 100644 --- a/features/odl-yangtools-parser/pom.xml +++ b/features/odl-yangtools-parser/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-yangtools-util/pom.xml b/features/odl-yangtools-util/pom.xml index 640738ea93..8a3ab83f4b 100644 --- a/features/odl-yangtools-util/pom.xml +++ b/features/odl-yangtools-util/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/odl-yangtools-xpath/pom.xml b/features/odl-yangtools-xpath/pom.xml index 55a167e0d8..a6e007bf8e 100644 --- a/features/odl-yangtools-xpath/pom.xml +++ b/features/odl-yangtools-xpath/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent single-feature-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/features/pom.xml b/features/pom.xml index 3eeff49712..2ec77c9d75 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/pom.xml b/pom.xml index 6a57c2da24..eb839e325c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/third-party/pom.xml b/third-party/pom.xml index 20c9b3680a..372ffb6439 100644 --- a/third-party/pom.xml +++ b/third-party/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/third-party/triemap/pom.xml b/third-party/triemap/pom.xml index 2e9cca9ed5..3c6b966f61 100644 --- a/third-party/triemap/pom.xml +++ b/third-party/triemap/pom.xml @@ -20,7 +20,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang-validation-tool/pom.xml b/yang-validation-tool/pom.xml index e22fbe65b3..f95b8236fb 100644 --- a/yang-validation-tool/pom.xml +++ b/yang-validation-tool/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/odlext-model-api/pom.xml b/yang/odlext-model-api/pom.xml index e22bfc125e..cedf94fecc 100644 --- a/yang/odlext-model-api/pom.xml +++ b/yang/odlext-model-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/odlext-parser-support/pom.xml b/yang/odlext-parser-support/pom.xml index 3c0a51c29e..801c695ef2 100644 --- a/yang/odlext-parser-support/pom.xml +++ b/yang/odlext-parser-support/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/openconfig-model-api/pom.xml b/yang/openconfig-model-api/pom.xml index ab51b43c35..81bd201bb6 100644 --- a/yang/openconfig-model-api/pom.xml +++ b/yang/openconfig-model-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/openconfig-parser-support/pom.xml b/yang/openconfig-parser-support/pom.xml index 7042be319e..119a6c77dd 100644 --- a/yang/openconfig-parser-support/pom.xml +++ b/yang/openconfig-parser-support/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/pom.xml b/yang/pom.xml index 806b452c07..e9e0d025c5 100644 --- a/yang/pom.xml +++ b/yang/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/rfc7952-model-api/pom.xml b/yang/rfc7952-model-api/pom.xml index c00fbe5454..49cb0db2e0 100644 --- a/yang/rfc7952-model-api/pom.xml +++ b/yang/rfc7952-model-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/rfc7952-parser-support/pom.xml b/yang/rfc7952-parser-support/pom.xml index d28f60f830..5dd3937a16 100644 --- a/yang/rfc7952-parser-support/pom.xml +++ b/yang/rfc7952-parser-support/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/rfc8040-model-api/pom.xml b/yang/rfc8040-model-api/pom.xml index 36777b342f..6f1e0b6a2f 100644 --- a/yang/rfc8040-model-api/pom.xml +++ b/yang/rfc8040-model-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/rfc8040-parser-support/pom.xml b/yang/rfc8040-parser-support/pom.xml index 6c313916d5..5462ecf720 100644 --- a/yang/rfc8040-parser-support/pom.xml +++ b/yang/rfc8040-parser-support/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-common/pom.xml b/yang/yang-common/pom.xml index 9e7d058ff7..0a2e7d1c33 100644 --- a/yang/yang-common/pom.xml +++ b/yang/yang-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-data-api/pom.xml b/yang/yang-data-api/pom.xml index 6345d03aee..c4e6fde806 100644 --- a/yang/yang-data-api/pom.xml +++ b/yang/yang-data-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-data-codec-gson/pom.xml b/yang/yang-data-codec-gson/pom.xml index 0586d96264..9f07508e31 100644 --- a/yang/yang-data-codec-gson/pom.xml +++ b/yang/yang-data-codec-gson/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-data-codec-xml/pom.xml b/yang/yang-data-codec-xml/pom.xml index cbf2c42504..307c1b8f00 100644 --- a/yang/yang-data-codec-xml/pom.xml +++ b/yang/yang-data-codec-xml/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index 6c4b0c6b94..f5fbeade5b 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-data-jaxen/pom.xml b/yang/yang-data-jaxen/pom.xml index 636d9424be..6f81770a20 100644 --- a/yang/yang-data-jaxen/pom.xml +++ b/yang/yang-data-jaxen/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-data-transform/pom.xml b/yang/yang-data-transform/pom.xml index e35d02c0d0..5b9da19a4d 100644 --- a/yang/yang-data-transform/pom.xml +++ b/yang/yang-data-transform/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-data-util/pom.xml b/yang/yang-data-util/pom.xml index 5f2fd161d8..9100c9bf0a 100644 --- a/yang/yang-data-util/pom.xml +++ b/yang/yang-data-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-maven-plugin-it/pom.xml b/yang/yang-maven-plugin-it/pom.xml index 72528d4456..520430adf8 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 - 2.0.5 + 3.0.0-SNAPSHOT @@ -27,6 +27,13 @@ maven-verifier 1.6 test + + + com.google.code.findbugs + + jsr305 + + com.google.guava diff --git a/yang/yang-maven-plugin-spi/pom.xml b/yang/yang-maven-plugin-spi/pom.xml index 20efd10c8e..d1a283279a 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 - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-maven-plugin/pom.xml b/yang/yang-maven-plugin/pom.xml index c6a7b087be..acd6d081d3 100644 --- a/yang/yang-maven-plugin/pom.xml +++ b/yang/yang-maven-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-model-api/pom.xml b/yang/yang-model-api/pom.xml index 39bce532dc..e0ce3f3497 100644 --- a/yang/yang-model-api/pom.xml +++ b/yang/yang-model-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-model-export/pom.xml b/yang/yang-model-export/pom.xml index 3f773b4923..d019273037 100644 --- a/yang/yang-model-export/pom.xml +++ b/yang/yang-model-export/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-model-immutable/pom.xml b/yang/yang-model-immutable/pom.xml index 857abe8cc0..edc2b596d9 100644 --- a/yang/yang-model-immutable/pom.xml +++ b/yang/yang-model-immutable/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-model-util/pom.xml b/yang/yang-model-util/pom.xml index 85d4353057..6b4e1e72eb 100644 --- a/yang/yang-model-util/pom.xml +++ b/yang/yang-model-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-model-validator/pom.xml b/yang/yang-model-validator/pom.xml index eb32c3cd2d..20f84ece0e 100644 --- a/yang/yang-model-validator/pom.xml +++ b/yang/yang-model-validator/pom.xml @@ -4,7 +4,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-parser-api/pom.xml b/yang/yang-parser-api/pom.xml index e49c7924d2..88643cfd45 100644 --- a/yang/yang-parser-api/pom.xml +++ b/yang/yang-parser-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-parser-impl/pom.xml b/yang/yang-parser-impl/pom.xml index b62609622f..6ce01b6741 100644 --- a/yang/yang-parser-impl/pom.xml +++ b/yang/yang-parser-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-parser-reactor/pom.xml b/yang/yang-parser-reactor/pom.xml index bfcdd1fc8d..494ea3357b 100644 --- a/yang/yang-parser-reactor/pom.xml +++ b/yang/yang-parser-reactor/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-parser-rfc7950/pom.xml b/yang/yang-parser-rfc7950/pom.xml index b9ff68c402..c5535e44cb 100644 --- a/yang/yang-parser-rfc7950/pom.xml +++ b/yang/yang-parser-rfc7950/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-parser-spi/pom.xml b/yang/yang-parser-spi/pom.xml index 1795d1f10b..0e3f3ab83e 100644 --- a/yang/yang-parser-spi/pom.xml +++ b/yang/yang-parser-spi/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT diff --git a/yang/yang-test-util/pom.xml b/yang/yang-test-util/pom.xml index 792f82ea48..c90b022444 100644 --- a/yang/yang-test-util/pom.xml +++ b/yang/yang-test-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 2.0.5 + 3.0.0-SNAPSHOT -- 2.36.6