Bump upstreams 27/107627/5
authorRobert Varga <robert.varga@pantheon.tech>
Thu, 31 Aug 2023 09:36:41 +0000 (11:36 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Thu, 31 Aug 2023 11:44:12 +0000 (13:44 +0200)
Adopt:
- odlparent-13.0.4
- infrautils-6.0.2
- yangtools-11.0.1
- mdsal-12.0.1
- controller-8.0.1
- aaa-0.18.1

Change-Id: I7bc5776b8963ebbaa52b961cc3b2cfa6757b0ca3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
30 files changed:
apps/pom.xml
artifacts/pom.xml
features/features-netconf-experimental/pom.xml
features/features-netconf-testing/pom.xml
features/features-netconf/pom.xml
features/parent/pom.xml
features/pom.xml
karaf-static/pom.xml
karaf/pom.xml
keystore/pom.xml
model/pom.xml
netconf/pom.xml
netconf/tools/pom.xml
parent/pom.xml
plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java
plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java
plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/AbstractEdit.java
plugins/netconf-server-mdsal/src/main/java/org/opendaylight/netconf/server/mdsal/operations/RuntimeRpc.java
plugins/pom.xml
pom.xml
protocol/pom.xml
restconf/pom.xml
restconf/sal-rest-connector-config/pom.xml
third-party/pom.xml
third-party/shaded-exificient-jar/pom.xml
third-party/shaded-exificient/pom.xml
third-party/shaded-sshd-jar/pom.xml
third-party/shaded-sshd/pom.xml
transport/pom.xml
truststore/pom.xml

index a720fd5151eaa3c4f611583bdb36e8d997acc4de..8fac7ed3c80384b60027b5e85799308a3cb48e10 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 4bb60acbba2e6f321a0207a19f9d869ecc4ab216..f8288dd67eadaad68c5938aa336c94c73ea743d5 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>13.0.3</version>
+      <version>13.0.4</version>
       <relativePath/>
     </parent>
 
index f8820c7a1ebbdea1e195a996bb3264de37494f47..58715162cb648f79b62f26d950a5d41e83acf435 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 6a82ceaacf4da9e469e141099a036c0cbf152a7b..c1c5215d67f341b63376df265c66570a876ef587 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>feature-repo-parent</artifactId>
-      <version>13.0.3</version>
+      <version>13.0.4</version>
       <relativePath/>
   </parent>
 
index 4ff56c65613c2da4ab14455948f770509e4d86c5..9cad8b42bdc7d3ab10c717eafa620ed08ce9c6cf 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 2f43152b0d69a107cea43225f37eae93408dee8f..7088ffda9bfd0e27128371af375c8705460ad99c 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 1033d93aa22cdec3f0ab528d31dab450ad98671f..508e552c060c44368911d5b2bbb43c97739bd572 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 02978df4e573ff3297b37dc77cfb73d5da86dbad..0290fc5becb6b0456692a0a8ee2cce4668ccabda 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf-dist-static</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 52d3cc6b9be560fe74ae007673d115e016837105..f729f4a2fbab0d2184f3224821bf5a346d298428 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>13.0.3</version>
+    <version>13.0.4</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
index 6c086c02710ee39b2284597369a131bab2182057..ea6b295eb7aac6d36767a2722818115b139ee1ab 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index fb3721bf450d710d66dbf2b061c65b4b6e480445..77e3274d875968459bae052e8de7d7c4c1bbbcd3 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 63ad7ce3fb2836c629f4d39587ff321ad2cbc040..f3544ed6da9ec7fcbbcb1c846fa32ee971068366 100644 (file)
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.3</version>
+    <version>13.0.4</version>
     <relativePath/>
   </parent>
 
index 431a7a80e0f086d2c36c1d41d55f85d4b5190254..baedd03702857f9fe41a4283e684ae35e9a22814 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.3</version>
+    <version>13.0.4</version>
     <relativePath/>
   </parent>
 
index 8f95ee11a14635b29e9af9409af10655f345d6a9..c91db9ba2fc6d37756fd9ad2387af6cc8c01e026 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>12.0.0</version>
+    <version>12.0.1</version>
     <relativePath/>
   </parent>
 
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>6.0.1</version>
+        <version>6.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.18.0</version>
+        <version>0.18.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
index 4e25566a075bb7f4656408d2e723c6ddb136e517..3b69dfc417917dd63b368b64b4064dddfd72708a 100644 (file)
@@ -22,7 +22,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.nio.charset.Charset;
@@ -327,7 +326,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas {
             final XmlParserStream xmlParser = XmlParserStream.create(writer, MODULES_STATE_INFERENCE);
             xmlParser.traverse(new DOMSource(doc.getDocumentElement()));
             return Optional.of(resultHolder.getResult().data());
-        } catch (XMLStreamException | URISyntaxException | IOException | SAXException e) {
+        } catch (XMLStreamException | IOException | SAXException e) {
             LOG.warn("Unable to parse yang library xml content", e);
         }
 
index 17bd3d6b6fa4ab8933ede85dcf92a5fe5b8a2280..0b64605daa1a681ee31aa6d5e47999a1ce0ac2e8 100644 (file)
@@ -25,7 +25,6 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import com.google.common.collect.Streams;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.time.Instant;
 import java.util.AbstractMap;
 import java.util.ArrayDeque;
@@ -99,7 +98,6 @@ import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
 
 public class NetconfMessageTransformer
         implements ActionTransformer, NotificationTransformer, RpcTransformer<ContainerNode, DOMRpcResult> {
@@ -206,8 +204,7 @@ public class NetconfMessageTransformer
                     SchemaInferenceStack.of(mountContext.getEffectiveModelContext(), notificationPath).toInference(),
                     strictParsing);
             xmlParser.traverse(new DOMSource(element));
-        } catch (XMLStreamException | URISyntaxException | IOException | SAXException
-                | UnsupportedOperationException e) {
+        } catch (XMLStreamException | IOException | UnsupportedOperationException e) {
             throw new IllegalArgumentException(String.format("Failed to parse notification %s", element), e);
         }
         return (ContainerNode) resultHolder.getResult().data();
@@ -482,7 +479,7 @@ public class NetconfMessageTransformer
             final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder);
             final XmlParserStream xmlParser = XmlParserStream.create(writer, mountContext, inference, strictParsing);
             xmlParser.traverse(new DOMSource(element));
-        } catch (XMLStreamException | URISyntaxException | IOException | SAXException e) {
+        } catch (XMLStreamException | IOException e) {
             throw new IllegalArgumentException(String.format("Failed to parse RPC response %s", element), e);
         }
         return (ContainerNode) resultHolder.getResult().data();
index 3125584f32d42a8f2b86192f3870be2f27b1dc3e..d50434102d4db3c6e7db9a42517fccbad6e2a460 100644 (file)
@@ -9,7 +9,6 @@ package org.opendaylight.netconf.server.mdsal.operations;
 
 import com.google.common.collect.ImmutableMap;
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.Iterator;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.dom.DOMSource;
@@ -36,7 +35,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
 
 abstract class AbstractEdit extends AbstractConfigOperation {
     private static final Logger LOG = LoggerFactory.getLogger(AbstractEdit.class);
@@ -63,7 +61,7 @@ abstract class AbstractEdit extends AbstractConfigOperation {
         final XmlParserStream xmlParser = XmlParserStream.create(writer, inference);
         try {
             xmlParser.traverse(new DOMSource(element.getDomElement()));
-        } catch (final XMLStreamException | URISyntaxException | IOException | SAXException ex) {
+        } catch (final XMLStreamException | IOException ex) {
             throw new NetconfDocumentedException("Error parsing input: " + ex.getMessage(), ex,
                 ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE, ErrorSeverity.ERROR);
         }
index 992cddd5b44da1e6a36a7ca4fa20a3ce7848ca19..24503f00aa307c9a37c9cd20955f1d26b7e2fde1 100644 (file)
@@ -8,7 +8,6 @@
 package org.opendaylight.netconf.server.mdsal.operations;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ExecutionException;
@@ -54,7 +53,6 @@ import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
 
 public class RuntimeRpc extends AbstractSingletonNetconfOperation {
     private static final Logger LOG = LoggerFactory.getLogger(RuntimeRpc.class);
@@ -256,7 +254,7 @@ public class RuntimeRpc extends AbstractSingletonNetconfOperation {
 
         try {
             xmlParser.traverse(new DOMSource(element.getDomElement()));
-        } catch (final XMLStreamException | URISyntaxException | IOException | SAXException ex) {
+        } catch (final XMLStreamException | IOException ex) {
             throw new NetconfDocumentedException("Error parsing input: " + ex.getMessage(), ex,
                 ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE, ErrorSeverity.ERROR);
         }
index 8f2a29ff6f177754e29332d3eecdce6d925ce932..a11e7ae817c90138985b100d4b9581242d646ce3 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 0ef38d2d47d0be9f8e62d70242bbbf623d876c70..f9e121c7f8a7d75ff8ab42980d8ffd5f38cff903 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 4c5f365e65985920c84fb69c2743b79d7a3ac692..8c5512b94341cef13755801b58378c16879d6291 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index f68c81aaac0984e6530a25b6c9a9db102c03b139..d5fa8652eb1fbb67785e3ed23cced911db9edd41 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index d41d398b3b03682b431ff01b84411e25382a3673..0a84dcba0f182e1c578063b62938e18a426082bf 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>13.0.3</version>
+    <version>13.0.4</version>
     <relativePath/>
   </parent>
 
index 2241152dd709cd97f74835cbf69734d7faa27025..a8f0fb7c6e71fc769f165084bf60a487d6feb67e 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index d731a0629c15f3a356416daaa7f5b000f017be29..7c00f2767921f8f44798aed4f0a2d9d4eb9c74eb 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 1d36e8b5a9a587b66c0da7762e7a20d8682fd9bc..dde2b212fafe1d2b31330b191a9a8023a9ba9042 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index a792f5722079ed22d95c5a00b01b0a0620746b35..e1ec6135eed0c653d0a29ae05619cc01eca30d2c 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 9f927b3d74b1ab4736912b9666910b86a3daa094..7e4a2f364a20a32ff9d0e7a15ffa7ee8e28e415b 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 3116d27fe6837ffa760dc551296f3f1a9a350816..d1975969a33efffa3b34850441a89963b7bbc586 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>
 
index 1043013cb2def28fc1f842c7624265f109a95563..0ebbfbd78cdb4f1f0e2e95660665944e95551f7d 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
+        <version>13.0.4</version>
         <relativePath/>
     </parent>