From: Robert Varga Date: Fri, 4 Nov 2022 14:40:05 +0000 (+0100) Subject: Bump upstrems X-Git-Tag: v4.0.3~7 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=965fc7a5860194cf6d4fce8dd1e2bbaefd2788c8;hp=b0441fda6b0f5efbc7c45f19e26ce23e2974d1ea;p=netconf.git Bump upstrems Adopt: - odlparent-11.0.2 - infrautils-4.0.2 - yangtools-9.0.2 - mdsal-10.0.3 - controller-6.0.3 - aaa-0.16.4 Change-Id: I58f8179456cb8f0b2adc300bb0397b2636612d57 Signed-off-by: Robert Varga --- diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 6a8a7d00ab..8d81654470 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml index 49a2f565ad..4de36a92c0 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 - 11.0.1 + 11.0.2 diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index d20034305d..5a38d380a4 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml index c9f162ed23..4d82c19744 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 - 11.0.1 + 11.0.2 diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml index 29eb115c2b..a7cb8aac5d 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 - 11.0.1 + 11.0.2 diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index fd89fc0398..b6688e61fe 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/features/parent/pom.xml b/features/parent/pom.xml index 21e5a99847..5e9717b0aa 100644 --- a/features/parent/pom.xml +++ b/features/parent/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 11.0.1 + 11.0.2 diff --git a/features/pom.xml b/features/pom.xml index fe72dd64d3..7f055a924a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml index 8527c0b5d1..4b9733416a 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 - 11.0.1 + 11.0.2 diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml index 10f25819da..724e560c40 100644 --- a/features/restconf/pom.xml +++ b/features/restconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml index 18808bef2a..d1d1152fa9 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 - 11.0.1 + 11.0.2 diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml index 429f331ce1..62adee614c 100644 --- a/features/yanglib/pom.xml +++ b/features/yanglib/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/karaf-static/pom.xml b/karaf-static/pom.xml index 3d4ee75a85..26faa8fe96 100644 --- a/karaf-static/pom.xml +++ b/karaf-static/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf-dist-static - 11.0.1 + 11.0.2 diff --git a/karaf/pom.xml b/karaf/pom.xml index 69809f186f..540e808a25 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 11.0.1 + 11.0.2 org.opendaylight.netconf @@ -24,14 +24,14 @@ org.opendaylight.infrautils infrautils-artifacts - 4.0.1 + 4.0.2 pom import org.opendaylight.controller controller-artifacts - 6.0.2 + 6.0.3 pom import diff --git a/keystore/pom.xml b/keystore/pom.xml index 55a567ae2b..9163dabc62 100644 --- a/keystore/pom.xml +++ b/keystore/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/model/pom.xml b/model/pom.xml index ed5cbee643..4cc626b5a9 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 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 594a02e37f..b8224def10 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 @@ -118,7 +118,7 @@ public class DocumentedException extends Exception { ErrorSeverity errorSeverity = ErrorSeverity.ERROR; Map errorInfo = null; String errorMessage = ""; - String allErrorMessages = ""; + StringBuilder allErrorMessages = new StringBuilder(); Node rpcReply = fromDoc.getDocumentElement(); @@ -150,7 +150,7 @@ public class DocumentedException extends Exception { errorSeverity = sev != null ? sev : ErrorSeverity.ERROR; } else if (ERROR_MESSAGE.equals(rpcErrorChild.getLocalName())) { errorMessage = rpcErrorChild.getTextContent(); - allErrorMessages = allErrorMessages + errorMessage; + allErrorMessages.append(errorMessage); } else if (ERROR_INFO.equals(rpcErrorChild.getLocalName())) { errorInfo = parseErrorInfo(rpcErrorChild); } @@ -162,7 +162,7 @@ public class DocumentedException extends Exception { if (errorInfo == null) { errorInfo = new HashMap<>(); } - errorInfo.put("Multiple Errors Found", allErrorMessages); + errorInfo.put("Multiple Errors Found", allErrorMessages.toString()); } return new DocumentedException(errorMessage, errorType, errorTag, errorSeverity, errorInfo); diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml index 27a17c9ec8..d7c3c3fc86 100644 --- a/netconf/netconf-config/pom.xml +++ b/netconf/netconf-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 11.0.1 + 11.0.2 diff --git a/netconf/pom.xml b/netconf/pom.xml index d53402d8dd..eddce3155b 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml index a65bd04aea..da7e0589a4 100644 --- a/netconf/shaded-exificient-jar/pom.xml +++ b/netconf/shaded-exificient-jar/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 11.0.1 + 11.0.2 diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml index 16fdf3515d..498f1bf3a6 100644 --- a/netconf/shaded-exificient/pom.xml +++ b/netconf/shaded-exificient/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 11.0.1 + 11.0.2 diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml index 8fda458149..cb592a58a2 100644 --- a/netconf/shaded-sshd-jar/pom.xml +++ b/netconf/shaded-sshd-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 11.0.1 + 11.0.2 diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml index 7c50ddb511..7a849afffa 100644 --- a/netconf/shaded-sshd/pom.xml +++ b/netconf/shaded-sshd/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 11.0.1 + 11.0.2 diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml index 03cbba7732..c946848a1f 100644 --- a/netconf/tools/pom.xml +++ b/netconf/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/parent/pom.xml b/parent/pom.xml index ea6ffce953..1f6c60369b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 10.0.2 + 10.0.3 @@ -25,21 +25,21 @@ org.opendaylight.infrautils infrautils-artifacts - 4.0.1 + 4.0.2 pom import org.opendaylight.aaa aaa-artifacts - 0.16.3 + 0.16.4 pom import org.opendaylight.controller bundle-parent - 6.0.2 + 6.0.3 pom import diff --git a/pom.xml b/pom.xml index 0b833a48d3..be38700b55 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/restconf/pom.xml b/restconf/pom.xml index ff939ee055..3f77fe4b2c 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml index cd764a664a..618d987d22 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 - 11.0.1 + 11.0.2 diff --git a/transport/pom.xml b/transport/pom.xml index 472435a126..b2678f25af 100644 --- a/transport/pom.xml +++ b/transport/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2 diff --git a/truststore/pom.xml b/truststore/pom.xml index a7a33c7c54..b3e27b07ae 100644 --- a/truststore/pom.xml +++ b/truststore/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 11.0.1 + 11.0.2