From 6b4a635bc4a9dee90fd2c1cfa3f3a29e231a5a56 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 23 Aug 2021 10:53:08 +0200 Subject: [PATCH] Bump MRI upstreams Adopt: - odlparent-9.0.5 - yangtools-7.0.7 - mdsal-8.0.4 - controller-4.0.2 - infrautils-2.0.5 - aaa-0.14.2 Change-Id: I525bcbd1c137cfe00c98b0d31c23de92035a98de Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- .../netconf-connector/features-netconf-connector/pom.xml | 2 +- features/netconf-connector/pom.xml | 2 +- features/netconf/features-netconf-testing/pom.xml | 2 +- features/netconf/features-netconf/pom.xml | 2 +- features/netconf/pom.xml | 2 +- features/parent/pom.xml | 2 +- features/pom.xml | 2 +- features/restconf/features-restconf/pom.xml | 2 +- features/restconf/pom.xml | 2 +- features/yanglib/features-yanglib/pom.xml | 2 +- features/yanglib/pom.xml | 2 +- karaf-static/pom.xml | 2 +- karaf/pom.xml | 6 +++--- .../netconf/mdsal/connector/ops/AbstractEdit.java | 4 ++-- .../netconf/mdsal/connector/ops/RuntimeRpc.java | 4 ++-- netconf/models/pom.xml | 2 +- .../org/opendaylight/netconf/api/DocumentedException.java | 6 ------ netconf/netconf-config/pom.xml | 2 +- .../netconf/impl/util/DeserializerExceptionHandler.java | 3 ++- .../util/mapping/AbstractLastNetconfOperation.java | 7 ++++--- netconf/pom.xml | 2 +- .../connect/netconf/util/NetconfMessageTransformUtil.java | 2 +- netconf/shaded-exificient-jar/pom.xml | 2 +- netconf/shaded-exificient/pom.xml | 2 +- netconf/shaded-sshd-jar/pom.xml | 2 +- netconf/shaded-sshd/pom.xml | 2 +- netconf/tools/pom.xml | 2 +- parent/pom.xml | 8 ++++---- pom.xml | 2 +- restconf/pom.xml | 2 +- restconf/restconf-models/pom.xml | 2 +- restconf/sal-rest-connector-config/pom.xml | 2 +- 33 files changed, 43 insertions(+), 47 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index e94684f893..d4739857e3 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml index af15960c12..265ab8befc 100644 --- a/features/netconf-connector/features-netconf-connector/pom.xml +++ b/features/netconf-connector/features-netconf-connector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 9.0.2 + 9.0.5 diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index 74b13d9253..81852bbd56 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml index f6d42d2893..fa68fa706b 100644 --- a/features/netconf/features-netconf-testing/pom.xml +++ b/features/netconf/features-netconf-testing/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 9.0.2 + 9.0.5 diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml index 1d5bf228f1..2b3bc8142b 100644 --- a/features/netconf/features-netconf/pom.xml +++ b/features/netconf/features-netconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 9.0.2 + 9.0.5 diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index cf366e778b..6b379c7269 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/features/parent/pom.xml b/features/parent/pom.xml index a78178eddb..32e0ea7136 100644 --- a/features/parent/pom.xml +++ b/features/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 9.0.2 + 9.0.5 diff --git a/features/pom.xml b/features/pom.xml index 75f6031bc2..c1482a7183 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml index a5f557bc68..4e4b0606c6 100644 --- a/features/restconf/features-restconf/pom.xml +++ b/features/restconf/features-restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent feature-repo-parent - 9.0.2 + 9.0.5 diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml index cffb04ea44..b1043cefd4 100644 --- a/features/restconf/pom.xml +++ b/features/restconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml index 52eec3b7d9..6d59f97b92 100644 --- a/features/yanglib/features-yanglib/pom.xml +++ b/features/yanglib/features-yanglib/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent feature-repo-parent - 9.0.2 + 9.0.5 diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml index 36bcf0d557..19ff0aa6ec 100644 --- a/features/yanglib/pom.xml +++ b/features/yanglib/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml index 7dfabb2e66..c27d374972 100644 --- a/karaf-static/pom.xml +++ b/karaf-static/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf-dist-static - 9.0.2 + 9.0.5 diff --git a/karaf/pom.xml b/karaf/pom.xml index 62d10ce7e3..bf29db417e 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 9.0.2 + 9.0.5 org.opendaylight.netconf @@ -24,7 +24,7 @@ org.opendaylight.controller controller-artifacts - 4.0.1 + 4.0.2 pom import @@ -40,7 +40,7 @@ org.opendaylight.infrautils infrautils-artifacts - 2.0.2 + 2.0.5 pom import diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java index 41ac93f9fd..5611ef88bc 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractEdit.java @@ -61,8 +61,8 @@ abstract class AbstractEdit extends AbstractConfigOperation { try { xmlParser.traverse(new DOMSource(element.getDomElement())); } catch (final XMLStreamException | URISyntaxException | IOException | SAXException ex) { - throw new NetconfDocumentedException("Error parsing input: " + ex.getMessage(), ex, ErrorType.PROTOCOL, - DocumentedException.MALFORMED_MESSAGE, ErrorSeverity.ERROR); + throw new NetconfDocumentedException("Error parsing input: " + ex.getMessage(), ex, + ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE, ErrorSeverity.ERROR); } } diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java index 8159382c36..ef0bcfadf4 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java @@ -259,8 +259,8 @@ public class RuntimeRpc extends AbstractSingletonNetconfOperation { try { xmlParser.traverse(new DOMSource(element.getDomElement())); } catch (final XMLStreamException | URISyntaxException | IOException | SAXException ex) { - throw new NetconfDocumentedException("Error parsing input: " + ex.getMessage(), ex, ErrorType.PROTOCOL, - DocumentedException.MALFORMED_MESSAGE, ErrorSeverity.ERROR); + throw new NetconfDocumentedException("Error parsing input: " + ex.getMessage(), ex, + ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE, ErrorSeverity.ERROR); } return (ContainerNode) resultHolder.getResult(); diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml index 55c6b6d8b8..93ea53a405 100644 --- a/netconf/models/pom.xml +++ b/netconf/models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java index 4007d0aa9f..594a02e37f 100644 --- a/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java +++ b/netconf/netconf-api/src/main/java/org/opendaylight/netconf/api/DocumentedException.java @@ -10,7 +10,6 @@ package org.opendaylight.netconf.api; import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.RPC_REPLY_KEY; import static org.opendaylight.netconf.api.xml.XmlNetconfConstants.URN_IETF_PARAMS_XML_NS_NETCONF_BASE_1_0; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; @@ -41,10 +40,6 @@ public class DocumentedException extends Exception { public static final String ERROR_MESSAGE = "error-message"; public static final String ERROR_INFO = "error-info"; - // FIXME: This is an RFC6241 definition, remove it once we have yangtools-7.0.5 - @Deprecated(forRemoval = true) - public static final ErrorTag MALFORMED_MESSAGE = new ErrorTag("malformed-message"); - private static final long serialVersionUID = 1L; private static final Logger LOG = LoggerFactory.getLogger(DocumentedException.class); private static final DocumentBuilderFactory BUILDER_FACTORY; @@ -67,7 +62,6 @@ public class DocumentedException extends Exception { } private final ErrorType errorType; - @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "FIXME: should not be necessary with yangtools-7.0.5") private final ErrorTag errorTag; private final ErrorSeverity errorSeverity; private final Map errorInfo; diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml index 1a1c40bc9e..fc496a1b9d 100644 --- a/netconf/netconf-config/pom.xml +++ b/netconf/netconf-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 9.0.2 + 9.0.5 diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java index bd2561d3ed..4c7c0b8964 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/util/DeserializerExceptionHandler.java @@ -13,6 +13,7 @@ import java.util.Map; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.util.messages.SendErrorExceptionUtil; import org.opendaylight.yangtools.yang.common.ErrorSeverity; +import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +30,7 @@ public final class DeserializerExceptionHandler extends ChannelInboundHandlerAda private static void handleDeserializerException(final ChannelHandlerContext ctx, final Throwable cause) { final String message = cause.getMessage(); SendErrorExceptionUtil.sendErrorMessage(ctx.channel(), new DocumentedException(message, - ErrorType.RPC, DocumentedException.MALFORMED_MESSAGE, ErrorSeverity.ERROR, + ErrorType.RPC, ErrorTag.MALFORMED_MESSAGE, ErrorSeverity.ERROR, message != null ? Map.of("cause", message) : Map.of())); } } diff --git a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java index f4414fb295..2e6f6410cb 100644 --- a/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java +++ b/netconf/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java @@ -12,6 +12,7 @@ import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.mapping.api.HandlingPriority; import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.yangtools.yang.common.ErrorSeverity; +import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -27,7 +28,7 @@ public abstract class AbstractLastNetconfOperation extends AbstractNetconfOperat if (!subsequentOperation.isExecutionTermination()) { throw new DocumentedException(String.format( "No netconf operation expected to be subsequent to %s, but is %s", this, subsequentOperation), - ErrorType.APPLICATION, DocumentedException.MALFORMED_MESSAGE, ErrorSeverity.ERROR); + ErrorType.APPLICATION, ErrorTag.MALFORMED_MESSAGE, ErrorSeverity.ERROR); } return handleWithNoSubsequentOperations(document, operationElement); @@ -38,6 +39,6 @@ public abstract class AbstractLastNetconfOperation extends AbstractNetconfOperat return HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY; } - protected abstract Element handleWithNoSubsequentOperations(Document document, - XmlElement operationElement) throws DocumentedException; + protected abstract Element handleWithNoSubsequentOperations(Document document, XmlElement operationElement) + throws DocumentedException; } diff --git a/netconf/pom.xml b/netconf/pom.xml index 47509dae8c..ebc2fe59e8 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java index 6e4d1f8c2d..63ec832164 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfMessageTransformUtil.java @@ -544,7 +544,7 @@ public final class NetconfMessageTransformUtil { public static RpcResult toRpcResult(final FailedNetconfMessage message) { return RpcResultBuilder.failed() .withRpcError(toRpcError(new NetconfDocumentedException(message.getException().getMessage(), - ErrorType.APPLICATION, DocumentedException.MALFORMED_MESSAGE, ErrorSeverity.ERROR))) + ErrorType.APPLICATION, ErrorTag.MALFORMED_MESSAGE, ErrorSeverity.ERROR))) .build(); } } diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml index c9870c3558..03489e0945 100644 --- a/netconf/shaded-exificient-jar/pom.xml +++ b/netconf/shaded-exificient-jar/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 9.0.2 + 9.0.5 diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml index 1fd091e790..030065999c 100644 --- a/netconf/shaded-exificient/pom.xml +++ b/netconf/shaded-exificient/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 9.0.2 + 9.0.5 diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml index 2166ab4902..8477b7e6cb 100644 --- a/netconf/shaded-sshd-jar/pom.xml +++ b/netconf/shaded-sshd-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 9.0.2 + 9.0.5 diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml index 9b1645f394..9be879ccc6 100644 --- a/netconf/shaded-sshd/pom.xml +++ b/netconf/shaded-sshd/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 9.0.2 + 9.0.5 diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml index 1ba18c7100..af4180027c 100644 --- a/netconf/tools/pom.xml +++ b/netconf/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/parent/pom.xml b/parent/pom.xml index b90f87d6f3..befc271f28 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 8.0.1 + 8.0.2 @@ -25,21 +25,21 @@ org.opendaylight.aaa aaa-artifacts - 0.14.1 + 0.14.2 pom import org.opendaylight.controller bundle-parent - 4.0.1 + 4.0.2 pom import org.opendaylight.infrautils infrautils-artifacts - 2.0.2 + 2.0.5 pom import diff --git a/pom.xml b/pom.xml index 03cd5b56b2..449887eb48 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/restconf/pom.xml b/restconf/pom.xml index d7a211ddc4..212ed640aa 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml index 294dc48e85..c476714b58 100644 --- a/restconf/restconf-models/pom.xml +++ b/restconf/restconf-models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml index 392a2c6af0..b62b6480e9 100644 --- a/restconf/sal-rest-connector-config/pom.xml +++ b/restconf/sal-rest-connector-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 9.0.2 + 9.0.5 -- 2.36.6