From 660170da0da2c46eaa0ad8449a5d83c11dee4c2c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 22 Sep 2020 17:45:10 +0200 Subject: [PATCH] Bump MRI projects This patch adopts: - odlparent-7.0.6 - infrautils-1.8.1 - yangtools-5.0.6 - mdsal-6.0.5 - controller-2.0.4 Also adjust schema managers to work with IRSchemaSource instead of ASTSchemaSource. Change-Id: If1658111aad5f4c39a6e9dff844d3193994e943d Signed-off-by: Robert Varga --- artifacts/pom.xml | 2 +- .../features-netconf-connector/pom.xml | 2 +- features/netconf-connector/odl-message-bus/pom.xml | 4 ++-- .../odl-netconf-callhome-ssh/pom.xml | 2 +- .../odl-netconf-clustered-topology/pom.xml | 2 +- .../odl-netconf-connector-all/pom.xml | 2 +- .../netconf-connector/odl-netconf-connector/pom.xml | 6 +++--- .../netconf-connector/odl-netconf-console/pom.xml | 2 +- .../netconf-connector/odl-netconf-topology/pom.xml | 2 +- features/netconf-connector/pom.xml | 2 +- features/netconf/features-netconf/pom.xml | 2 +- .../odl-aaa-netconf-plugin-no-cluster/pom.xml | 2 +- features/netconf/odl-aaa-netconf-plugin/pom.xml | 2 +- features/netconf/odl-netconf-all/pom.xml | 2 +- features/netconf/odl-netconf-api/pom.xml | 6 +++--- features/netconf/odl-netconf-client/pom.xml | 4 ++-- features/netconf/odl-netconf-impl/pom.xml | 4 ++-- features/netconf/odl-netconf-mapping-api/pom.xml | 2 +- features/netconf/odl-netconf-mdsal/pom.xml | 2 +- features/netconf/odl-netconf-netty-util/pom.xml | 2 +- .../netconf/odl-netconf-notifications-api/pom.xml | 2 +- .../netconf/odl-netconf-notifications-impl/pom.xml | 4 ++-- features/netconf/odl-netconf-ssh/pom.xml | 2 +- features/netconf/odl-netconf-tcp/pom.xml | 2 +- features/netconf/odl-netconf-util/pom.xml | 4 ++-- features/netconf/pom.xml | 2 +- features/pom.xml | 2 +- features/restconf/features-restconf/pom.xml | 2 +- features/restconf/odl-mdsal-apidocs/pom.xml | 4 ++-- features/restconf/odl-restconf-all/pom.xml | 2 +- features/restconf/odl-restconf-common/pom.xml | 8 ++++---- features/restconf/odl-restconf-nb-bierman02/pom.xml | 4 ++-- features/restconf/odl-restconf-nb-rfc8040/pom.xml | 4 ++-- features/restconf/odl-restconf/pom.xml | 2 +- features/restconf/pom.xml | 2 +- features/yanglib/features-yanglib/pom.xml | 2 +- features/yanglib/odl-yanglib/pom.xml | 2 +- features/yanglib/pom.xml | 2 +- karaf/pom.xml | 2 +- netconf/models/pom.xml | 2 +- netconf/netconf-config/pom.xml | 2 +- .../singleton/impl/NetconfNodeActorTest.java | 4 ++-- .../singleton/impl/NetconfNodeManagerTest.java | 6 +++--- netconf/pom.xml | 2 +- .../connect/impl/DefaultSchemaResourceManager.java | 12 ++++++------ 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/test/tool/NetconfDeviceSimulator.java | 4 ++-- netconf/tools/pom.xml | 2 +- .../yanglib/impl/YangLibProviderTest.java | 4 ++-- parent/pom.xml | 6 +++--- pom.xml | 2 +- restconf/pom.xml | 2 +- restconf/restconf-models/pom.xml | 2 +- restconf/sal-rest-connector-config/pom.xml | 2 +- 57 files changed, 84 insertions(+), 84 deletions(-) diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 42e23e55f6..d2fb39d8cc 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -14,7 +14,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/features/netconf-connector/features-netconf-connector/pom.xml b/features/netconf-connector/features-netconf-connector/pom.xml index 69a544fc4d..c0ee6d4981 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 - 7.0.5 + 7.0.6 diff --git a/features/netconf-connector/odl-message-bus/pom.xml b/features/netconf-connector/odl-message-bus/pom.xml index 421d505399..1640c00421 100644 --- a/features/netconf-connector/odl-message-bus/pom.xml +++ b/features/netconf-connector/odl-message-bus/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -34,7 +34,7 @@ org.opendaylight.controller odl-controller-exp-messagebus - 2.0.3 + 2.0.4 xml features diff --git a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml index d38ef1e6b3..e3293a1f42 100644 --- a/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml +++ b/features/netconf-connector/odl-netconf-callhome-ssh/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml index 81363a976a..5ba1fbd145 100644 --- a/features/netconf-connector/odl-netconf-clustered-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-clustered-topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf-connector/odl-netconf-connector-all/pom.xml b/features/netconf-connector/odl-netconf-connector-all/pom.xml index 411577c3cb..cf2f66b978 100644 --- a/features/netconf-connector/odl-netconf-connector-all/pom.xml +++ b/features/netconf-connector/odl-netconf-connector-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml index 5c67078053..a8c48e4809 100644 --- a/features/netconf-connector/odl-netconf-connector/pom.xml +++ b/features/netconf-connector/odl-netconf-connector/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -28,14 +28,14 @@ org.opendaylight.mdsal mdsal-artifacts - 6.0.4 + 6.0.5 pom import org.opendaylight.controller controller-artifacts - 2.0.3 + 2.0.4 pom import diff --git a/features/netconf-connector/odl-netconf-console/pom.xml b/features/netconf-connector/odl-netconf-console/pom.xml index 0860e2cc85..df9b316274 100644 --- a/features/netconf-connector/odl-netconf-console/pom.xml +++ b/features/netconf-connector/odl-netconf-console/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf-connector/odl-netconf-topology/pom.xml b/features/netconf-connector/odl-netconf-topology/pom.xml index 76f593137d..d253d3f83f 100644 --- a/features/netconf-connector/odl-netconf-topology/pom.xml +++ b/features/netconf-connector/odl-netconf-topology/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index 8c3152ce63..725dc31126 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml index 02cbce0c5f..3d343fd86c 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 - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml index 71a3e20355..d5500c8b37 100644 --- a/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-aaa-netconf-plugin/pom.xml b/features/netconf/odl-aaa-netconf-plugin/pom.xml index eccb967467..ed39a3db04 100644 --- a/features/netconf/odl-aaa-netconf-plugin/pom.xml +++ b/features/netconf/odl-aaa-netconf-plugin/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-netconf-all/pom.xml b/features/netconf/odl-netconf-all/pom.xml index 92fb10caeb..a03261716b 100644 --- a/features/netconf/odl-netconf-all/pom.xml +++ b/features/netconf/odl-netconf-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml index 5555aa31d2..32074d441d 100644 --- a/features/netconf/odl-netconf-api/pom.xml +++ b/features/netconf/odl-netconf-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -28,14 +28,14 @@ org.opendaylight.yangtools yangtools-artifacts - 5.0.5 + 5.0.6 pom import org.opendaylight.mdsal mdsal-artifacts - 6.0.4 + 6.0.5 pom import diff --git a/features/netconf/odl-netconf-client/pom.xml b/features/netconf/odl-netconf-client/pom.xml index 52b7490642..27714707b0 100644 --- a/features/netconf/odl-netconf-client/pom.xml +++ b/features/netconf/odl-netconf-client/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -25,7 +25,7 @@ org.opendaylight.controller odl-controller-exp-netty-config - 2.0.3 + 2.0.4 xml features diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml index 6817145ce0..cffec258eb 100644 --- a/features/netconf/odl-netconf-impl/pom.xml +++ b/features/netconf/odl-netconf-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -28,7 +28,7 @@ org.opendaylight.controller controller-artifacts - 2.0.3 + 2.0.4 pom import diff --git a/features/netconf/odl-netconf-mapping-api/pom.xml b/features/netconf/odl-netconf-mapping-api/pom.xml index 3251dd89a6..33a5615cae 100644 --- a/features/netconf/odl-netconf-mapping-api/pom.xml +++ b/features/netconf/odl-netconf-mapping-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-netconf-mdsal/pom.xml b/features/netconf/odl-netconf-mdsal/pom.xml index cf5d95e679..5951f0a85e 100644 --- a/features/netconf/odl-netconf-mdsal/pom.xml +++ b/features/netconf/odl-netconf-mdsal/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml index 338d49ee34..9b35f9c1e5 100644 --- a/features/netconf/odl-netconf-netty-util/pom.xml +++ b/features/netconf/odl-netconf-netty-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-netconf-notifications-api/pom.xml b/features/netconf/odl-netconf-notifications-api/pom.xml index d1b735d280..a9921c8ccf 100644 --- a/features/netconf/odl-netconf-notifications-api/pom.xml +++ b/features/netconf/odl-netconf-notifications-api/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-netconf-notifications-impl/pom.xml b/features/netconf/odl-netconf-notifications-impl/pom.xml index 82835c643f..ae4836adef 100644 --- a/features/netconf/odl-netconf-notifications-impl/pom.xml +++ b/features/netconf/odl-netconf-notifications-impl/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 6.0.4 + 6.0.5 pom import diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml index 64c6214c74..c3e7c848bb 100644 --- a/features/netconf/odl-netconf-ssh/pom.xml +++ b/features/netconf/odl-netconf-ssh/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-netconf-tcp/pom.xml b/features/netconf/odl-netconf-tcp/pom.xml index 4e97f37423..3c0159b975 100644 --- a/features/netconf/odl-netconf-tcp/pom.xml +++ b/features/netconf/odl-netconf-tcp/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml index e68e877d0c..e9e75afe1b 100644 --- a/features/netconf/odl-netconf-util/pom.xml +++ b/features/netconf/odl-netconf-util/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -32,7 +32,7 @@ org.opendaylight.yangtools odl-yangtools-codec - 5.0.5 + 5.0.6 xml features diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index debcffb892..f6d2a99760 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/features/pom.xml b/features/pom.xml index 7b8039a0ac..3c7ef89879 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/features/restconf/features-restconf/pom.xml b/features/restconf/features-restconf/pom.xml index 686ffc885e..0e554807ea 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 - 7.0.5 + 7.0.6 diff --git a/features/restconf/odl-mdsal-apidocs/pom.xml b/features/restconf/odl-mdsal-apidocs/pom.xml index b5bf919fa6..b2f8e1dc01 100644 --- a/features/restconf/odl-mdsal-apidocs/pom.xml +++ b/features/restconf/odl-mdsal-apidocs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -27,7 +27,7 @@ org.opendaylight.odlparent odl-jackson-2.10 - 7.0.5 + 7.0.6 xml features diff --git a/features/restconf/odl-restconf-all/pom.xml b/features/restconf/odl-restconf-all/pom.xml index af2a0fd70b..91fb5a04c7 100644 --- a/features/restconf/odl-restconf-all/pom.xml +++ b/features/restconf/odl-restconf-all/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml index 0e7c6f312c..160b1d5e91 100644 --- a/features/restconf/odl-restconf-common/pom.xml +++ b/features/restconf/odl-restconf-common/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -28,21 +28,21 @@ org.opendaylight.yangtools yangtools-artifacts - 5.0.5 + 5.0.6 pom import org.opendaylight.mdsal mdsal-artifacts - 6.0.4 + 6.0.5 pom import org.opendaylight.controller controller-artifacts - 2.0.3 + 2.0.4 pom import diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml index 039823f961..c4a240384a 100644 --- a/features/restconf/odl-restconf-nb-bierman02/pom.xml +++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 6.0.4 + 6.0.5 pom import diff --git a/features/restconf/odl-restconf-nb-rfc8040/pom.xml b/features/restconf/odl-restconf-nb-rfc8040/pom.xml index 5773724df0..81f76f35d2 100644 --- a/features/restconf/odl-restconf-nb-rfc8040/pom.xml +++ b/features/restconf/odl-restconf-nb-rfc8040/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 @@ -28,7 +28,7 @@ org.opendaylight.controller controller-artifacts - 2.0.3 + 2.0.4 pom import diff --git a/features/restconf/odl-restconf/pom.xml b/features/restconf/odl-restconf/pom.xml index 14e5767d25..c73ae27ecc 100644 --- a/features/restconf/odl-restconf/pom.xml +++ b/features/restconf/odl-restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml index 34a6e765f0..a8a3f28250 100644 --- a/features/restconf/pom.xml +++ b/features/restconf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/features/yanglib/features-yanglib/pom.xml b/features/yanglib/features-yanglib/pom.xml index 89434e5dda..75e4f8f04a 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 - 7.0.5 + 7.0.6 diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml index 822cc339ec..7e32726653 100644 --- a/features/yanglib/odl-yanglib/pom.xml +++ b/features/yanglib/odl-yanglib/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent single-feature-parent - 7.0.5 + 7.0.6 diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml index c1fa42a862..3e839b5b24 100644 --- a/features/yanglib/pom.xml +++ b/features/yanglib/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/karaf/pom.xml b/karaf/pom.xml index 4e325d2393..aeceb4cf11 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent karaf4-parent - 7.0.5 + 7.0.6 org.opendaylight.netconf diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml index 89566dc0ae..f96720b735 100644 --- a/netconf/models/pom.xml +++ b/netconf/models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml index 55bca5096c..6c00a55f19 100644 --- a/netconf/netconf-config/pom.xml +++ b/netconf/netconf-config/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.5 + 7.0.6 diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java index 106af752bf..db0c42582d 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeActorTest.java @@ -125,7 +125,7 @@ import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource; import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistration; import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceRegistry; import org.opendaylight.yangtools.yang.parser.repo.SharedSchemaRepository; -import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToASTTransformer; +import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToIRTransformer; import scala.concurrent.Await; import scala.concurrent.Future; import scala.concurrent.duration.Duration; @@ -192,7 +192,7 @@ public class NetconfNodeActorTest extends AbstractBaseSchemasTest { new InetSocketAddress(InetAddresses.forString("127.0.0.1"), 9999)); masterSchemaRepository.registerSchemaSourceListener( - TextToASTTransformer.create(masterSchemaRepository, masterSchemaRepository)); + TextToIRTransformer.create(masterSchemaRepository, masterSchemaRepository)); doReturn(masterSchemaRepository).when(schemaResourceDTO).getSchemaRepository(); doReturn(mockRegistry).when(schemaResourceDTO).getSchemaRegistry(); diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java index 76a821052a..fa6d7c5148 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/NetconfNodeManagerTest.java @@ -92,7 +92,7 @@ import org.opendaylight.yangtools.yang.model.repo.api.SourceIdentifier; import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource; import org.opendaylight.yangtools.yang.parser.repo.SharedSchemaRepository; -import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToASTTransformer; +import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToIRTransformer; /** * Unit tests for NetconfNodeManager. @@ -154,7 +154,7 @@ public class NetconfNodeManagerTest extends AbstractBaseSchemasTest { SharedSchemaRepository masterSchemaRepository = new SharedSchemaRepository("master"); masterSchemaRepository.registerSchemaSourceListener( - TextToASTTransformer.create(masterSchemaRepository, masterSchemaRepository)); + TextToIRTransformer.create(masterSchemaRepository, masterSchemaRepository)); String yangTemplate = "module ID {" @@ -180,7 +180,7 @@ public class NetconfNodeManagerTest extends AbstractBaseSchemasTest { SharedSchemaRepository slaveSchemaRepository = new SharedSchemaRepository("slave"); slaveSchemaRepository.registerSchemaSourceListener( - TextToASTTransformer.create(slaveSchemaRepository, slaveSchemaRepository)); + TextToIRTransformer.create(slaveSchemaRepository, slaveSchemaRepository)); NetconfTopologySetup slaveSetup = new NetconfTopologySetup.NetconfTopologySetupBuilder() .setActorSystem(slaveSystem).setDataBroker(mockDataBroker).setSchemaResourceDTO( diff --git a/netconf/pom.xml b/netconf/pom.xml index 5ae8f13836..450ff03416 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/impl/DefaultSchemaResourceManager.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/impl/DefaultSchemaResourceManager.java index 9c57490407..04eb9d8f87 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/impl/DefaultSchemaResourceManager.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/impl/DefaultSchemaResourceManager.java @@ -28,8 +28,8 @@ import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.repo.util.FilesystemSchemaSourceCache; import org.opendaylight.yangtools.yang.model.repo.util.InMemorySchemaSourceCache; import org.opendaylight.yangtools.yang.parser.repo.SharedSchemaRepository; -import org.opendaylight.yangtools.yang.parser.rfc7950.repo.ASTSchemaSource; -import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToASTTransformer; +import org.opendaylight.yangtools.yang.parser.rfc7950.ir.IRSchemaSource; +import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToIRTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -100,15 +100,15 @@ public final class DefaultSchemaResourceManager implements SchemaResourceManager // Setup the baseline empty registry final SharedSchemaRepository repository = new SharedSchemaRepository(subdir, parserFactory); - // Teach the registry how to transform YANG text to ASTSchemaSource internally - repository.registerSchemaSourceListener(TextToASTTransformer.create(repository, repository)); + // Teach the registry how to transform YANG text to IRSchemaSource internally + repository.registerSchemaSourceListener(TextToIRTransformer.create(repository, repository)); - // Attach a soft cache of ASTSchemaSource instances. This is important during convergence when we are fishing + // Attach a soft cache of IRSchemaSource instances. This is important during convergence when we are fishing // for a consistent set of modules, as it skips the need to re-parse the text sources multiple times. It also // helps establishing different sets of contexts, as they can share this pre-made cache. repository.registerSchemaSourceListener( // FIXME: add knobs to control cache lifetime explicitly - InMemorySchemaSourceCache.createSoftCache(repository, ASTSchemaSource.class)); + InMemorySchemaSourceCache.createSoftCache(repository, IRSchemaSource.class)); // Attach the filesystem cache, providing persistence capability, so that restarts do not require us to // re-populate the cache. This also acts as a side-load capability, as anything pre-populated into that diff --git a/netconf/shaded-exificient-jar/pom.xml b/netconf/shaded-exificient-jar/pom.xml index a7189cc42a..5ffecfdb39 100644 --- a/netconf/shaded-exificient-jar/pom.xml +++ b/netconf/shaded-exificient-jar/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 7.0.5 + 7.0.6 diff --git a/netconf/shaded-exificient/pom.xml b/netconf/shaded-exificient/pom.xml index 8d6538797e..220a1fc730 100644 --- a/netconf/shaded-exificient/pom.xml +++ b/netconf/shaded-exificient/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.5 + 7.0.6 diff --git a/netconf/shaded-sshd-jar/pom.xml b/netconf/shaded-sshd-jar/pom.xml index 8f5e116783..e80443f809 100644 --- a/netconf/shaded-sshd-jar/pom.xml +++ b/netconf/shaded-sshd-jar/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent - 7.0.5 + 7.0.6 diff --git a/netconf/shaded-sshd/pom.xml b/netconf/shaded-sshd/pom.xml index 919b8c1f58..e7f9e0d9b6 100644 --- a/netconf/shaded-sshd/pom.xml +++ b/netconf/shaded-sshd/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent bundle-parent - 7.0.5 + 7.0.6 diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java index ea16c28140..df12515093 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java @@ -69,7 +69,7 @@ import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceListener; import org.opendaylight.yangtools.yang.model.repo.spi.SchemaSourceProvider; import org.opendaylight.yangtools.yang.model.repo.util.FilesystemSchemaSourceCache; import org.opendaylight.yangtools.yang.parser.repo.SharedSchemaRepository; -import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToASTTransformer; +import org.opendaylight.yangtools.yang.parser.rfc7950.repo.TextToIRTransformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -285,7 +285,7 @@ public class NetconfDeviceSimulator implements Closeable { private Set parseSchemasToModuleCapabilities(final SharedSchemaRepository consumer) { final Set loadedSources = new HashSet<>(); - consumer.registerSchemaSourceListener(TextToASTTransformer.create(consumer, consumer)); + consumer.registerSchemaSourceListener(TextToIRTransformer.create(consumer, consumer)); consumer.registerSchemaSourceListener(new SchemaSourceListener() { @Override public void schemaSourceEncountered(final SchemaSourceRepresentation schemaSourceRepresentation) { diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml index 21799d845b..54e21d0c09 100644 --- a/netconf/tools/pom.xml +++ b/netconf/tools/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java index f47a74a2b2..e78e8195d5 100644 --- a/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java +++ b/netconf/yanglib/src/test/java/org/opendaylight/yanglib/impl/YangLibProviderTest.java @@ -56,7 +56,7 @@ import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; import org.opendaylight.yangtools.yang.model.repo.api.YinSchemaSourceRepresentation; import org.opendaylight.yangtools.yang.model.repo.spi.PotentialSchemaSource; import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; -import org.opendaylight.yangtools.yang.parser.rfc7950.repo.ASTSchemaSource; +import org.opendaylight.yangtools.yang.parser.rfc7950.ir.IRSchemaSource; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class YangLibProviderTest { @@ -165,7 +165,7 @@ public class YangLibProviderTest { potentialSources.add( PotentialSchemaSource.create( RevisionSourceIdentifier.create("asts-schema-source"), - ASTSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); + IRSchemaSource.class, PotentialSchemaSource.Costs.IMMEDIATE.getValue())); yangLibProvider.schemaSourceRegistered(potentialSources); verifyNoMoreInteractions(dataBroker, writeTransaction); diff --git a/parent/pom.xml b/parent/pom.xml index 4aa6aca071..373240e163 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 6.0.4 + 6.0.5 @@ -32,14 +32,14 @@ org.opendaylight.controller controller-artifacts - 2.0.3 + 2.0.4 pom import org.opendaylight.infrautils infrautils-artifacts - 1.8.0 + 1.8.1 pom import diff --git a/pom.xml b/pom.xml index db746d9dad..77aee4eeea 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/restconf/pom.xml b/restconf/pom.xml index 41530bc030..8cad9539d1 100644 --- a/restconf/pom.xml +++ b/restconf/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/restconf/restconf-models/pom.xml b/restconf/restconf-models/pom.xml index 1d98fcd17d..dfe429a42b 100644 --- a/restconf/restconf-models/pom.xml +++ b/restconf/restconf-models/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent-lite - 7.0.5 + 7.0.6 diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml index a711f6cc0c..38ebc45ea2 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 - 7.0.5 + 7.0.6 -- 2.36.6