From 25c04325db99998074a502ef4ebf82fbb1ca97aa Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 17 Jan 2018 23:54:03 +0100 Subject: [PATCH] Minimize yangtools dependencies and bump to 2.0.1 Squash dependencies so that netconf features are pulling in the bare minimum set of yangtools features directly and use version ranges for them. Properties should be avoided and inter-project dependencies should be expressed via ${upstream}-artifacts dependencyManagement import. yangtools-2.0.1 contains a fix to multi-revision modules, which are badly broken in 2.0.0. It also introduces APIs we require to fix compliance with RFC8040 (i.e. follow RFC7159). Change-Id: I0e0e63841d511123243560f166db50c2fc9270fb Signed-off-by: Robert Varga --- features/netconf-connector/pom.xml | 9 +++++++-- features/netconf/odl-netconf-api/pom.xml | 4 ++-- .../netconf/odl-netconf-api/src/main/feature/feature.xml | 6 ++++++ features/netconf/odl-netconf-util/pom.xml | 4 ++-- .../odl-netconf-util/src/main/feature/feature.xml | 1 + features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml | 2 +- features/restconf/odl-restconf-noauth/pom.xml | 2 +- features/yanglib/odl-yanglib/pom.xml | 7 ------- netconf/config-netconf-connector/pom.xml | 2 +- netconf/mdsal-netconf-connector/pom.xml | 2 +- netconf/mdsal-netconf-monitoring/pom.xml | 2 +- netconf/mdsal-netconf-notification/pom.xml | 2 +- netconf/mdsal-netconf-yang-library/pom.xml | 2 +- netconf/messagebus-netconf/pom.xml | 2 +- netconf/netconf-api/pom.xml | 2 +- netconf/netconf-client/pom.xml | 2 +- netconf/netconf-console/pom.xml | 2 +- netconf/netconf-impl/pom.xml | 2 +- netconf/netconf-monitoring/pom.xml | 2 +- netconf/netconf-netty-util/pom.xml | 2 +- netconf/netconf-notifications-impl/pom.xml | 2 +- netconf/netconf-ssh/pom.xml | 2 +- netconf/netconf-tcp/pom.xml | 2 +- netconf/netconf-topology/pom.xml | 2 +- netconf/netconf-util/pom.xml | 2 +- netconf/tools/netconf-testtool/pom.xml | 2 +- protocol-framework/pom.xml | 2 +- restconf/sal-rest-docgen-maven/pom.xml | 2 +- restconf/sal-rest-docgen/pom.xml | 2 +- 29 files changed, 41 insertions(+), 36 deletions(-) create mode 100644 features/netconf/odl-netconf-api/src/main/feature/feature.xml diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml index 068b7595a3..1a96e17afb 100644 --- a/features/netconf-connector/pom.xml +++ b/features/netconf-connector/pom.xml @@ -28,7 +28,6 @@ 0.12.0-SNAPSHOT 1.4.0-SNAPSHOT 1.7.0-SNAPSHOT - 2.0.0 @@ -52,6 +51,13 @@ pom import + + org.opendaylight.yangtools + yangtools-artifacts + 2.0.1 + pom + import + @@ -59,7 +65,6 @@ org.opendaylight.yangtools features-yangtools - ${yangtools.version} features xml diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml index 5821f68c64..9bd02bbb25 100644 --- a/features/netconf/odl-netconf-api/pom.xml +++ b/features/netconf/odl-netconf-api/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import @@ -53,7 +53,7 @@ org.opendaylight.yangtools - odl-yangtools-data + odl-yangtools-data-api xml features diff --git a/features/netconf/odl-netconf-api/src/main/feature/feature.xml b/features/netconf/odl-netconf-api/src/main/feature/feature.xml new file mode 100644 index 0000000000..332ef135ae --- /dev/null +++ b/features/netconf/odl-netconf-api/src/main/feature/feature.xml @@ -0,0 +1,6 @@ + + + + odl-yangtools-data-api + + diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml index c3e555dfdd..e4259f345d 100644 --- a/features/netconf/odl-netconf-util/pom.xml +++ b/features/netconf/odl-netconf-util/pom.xml @@ -33,8 +33,8 @@ org.opendaylight.yangtools - odl-yangtools-data - 2.0.0 + odl-yangtools-codec + 2.0.1 xml features diff --git a/features/netconf/odl-netconf-util/src/main/feature/feature.xml b/features/netconf/odl-netconf-util/src/main/feature/feature.xml index 2735392ec3..0a3d259eac 100644 --- a/features/netconf/odl-netconf-util/src/main/feature/feature.xml +++ b/features/netconf/odl-netconf-util/src/main/feature/feature.xml @@ -11,5 +11,6 @@ mvn:org.opendaylight.netconf/netconf-util/${project.version}/cfg/config + odl-yangtools-codec diff --git a/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml b/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml index 2b6dba1bc6..0cb5872df2 100644 --- a/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml +++ b/features/restconf/odl-restconf-nb-rfc8040-noauth/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/features/restconf/odl-restconf-noauth/pom.xml b/features/restconf/odl-restconf-noauth/pom.xml index 204e198a71..6feee9e648 100644 --- a/features/restconf/odl-restconf-noauth/pom.xml +++ b/features/restconf/odl-restconf-noauth/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/features/yanglib/odl-yanglib/pom.xml b/features/yanglib/odl-yanglib/pom.xml index 65d02262e4..0bddb9eb65 100644 --- a/features/yanglib/odl-yanglib/pom.xml +++ b/features/yanglib/odl-yanglib/pom.xml @@ -31,13 +31,6 @@ yanglib 1.4.0-SNAPSHOT - - org.opendaylight.yangtools - odl-yangtools-data - 2.0.0 - xml - features - org.opendaylight.netconf odl-restconf diff --git a/netconf/config-netconf-connector/pom.xml b/netconf/config-netconf-connector/pom.xml index ed9e8d12fd..73bb311b01 100644 --- a/netconf/config-netconf-connector/pom.xml +++ b/netconf/config-netconf-connector/pom.xml @@ -48,7 +48,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml index cbb002e0ab..a2c1a2ed0b 100644 --- a/netconf/mdsal-netconf-connector/pom.xml +++ b/netconf/mdsal-netconf-connector/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml index 10ec13a47a..1e37ab6fb5 100644 --- a/netconf/mdsal-netconf-monitoring/pom.xml +++ b/netconf/mdsal-netconf-monitoring/pom.xml @@ -40,7 +40,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml index ada4c1b717..ed90e7b064 100644 --- a/netconf/mdsal-netconf-notification/pom.xml +++ b/netconf/mdsal-netconf-notification/pom.xml @@ -40,7 +40,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/mdsal-netconf-yang-library/pom.xml b/netconf/mdsal-netconf-yang-library/pom.xml index 1d2cfe45ab..e6aad7f2ef 100644 --- a/netconf/mdsal-netconf-yang-library/pom.xml +++ b/netconf/mdsal-netconf-yang-library/pom.xml @@ -48,7 +48,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml index 7af2c4eb9e..a7385ee372 100644 --- a/netconf/messagebus-netconf/pom.xml +++ b/netconf/messagebus-netconf/pom.xml @@ -43,7 +43,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml index 6fb4db2a56..520114decb 100644 --- a/netconf/netconf-api/pom.xml +++ b/netconf/netconf-api/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-client/pom.xml b/netconf/netconf-client/pom.xml index 2394c7152d..c9fc7e8b33 100644 --- a/netconf/netconf-client/pom.xml +++ b/netconf/netconf-client/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml index 60b69733d4..3886c03e0f 100644 --- a/netconf/netconf-console/pom.xml +++ b/netconf/netconf-console/pom.xml @@ -40,7 +40,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml index 8e2a890b0d..3892493f8a 100644 --- a/netconf/netconf-impl/pom.xml +++ b/netconf/netconf-impl/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-monitoring/pom.xml b/netconf/netconf-monitoring/pom.xml index fb2fffe23a..cd9650592a 100644 --- a/netconf/netconf-monitoring/pom.xml +++ b/netconf/netconf-monitoring/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml index 37779348d6..038fa09547 100644 --- a/netconf/netconf-netty-util/pom.xml +++ b/netconf/netconf-netty-util/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-notifications-impl/pom.xml b/netconf/netconf-notifications-impl/pom.xml index 8253e09fa5..8e2fc26eb4 100644 --- a/netconf/netconf-notifications-impl/pom.xml +++ b/netconf/netconf-notifications-impl/pom.xml @@ -49,7 +49,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-ssh/pom.xml b/netconf/netconf-ssh/pom.xml index 4e2160b303..58a0f7d927 100644 --- a/netconf/netconf-ssh/pom.xml +++ b/netconf/netconf-ssh/pom.xml @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-tcp/pom.xml b/netconf/netconf-tcp/pom.xml index 7f3e89073d..04cce67209 100644 --- a/netconf/netconf-tcp/pom.xml +++ b/netconf/netconf-tcp/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml index a76c9561ac..79792d39c5 100644 --- a/netconf/netconf-topology/pom.xml +++ b/netconf/netconf-topology/pom.xml @@ -41,7 +41,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml index 35c2133737..3c6c3930d1 100644 --- a/netconf/netconf-util/pom.xml +++ b/netconf/netconf-util/pom.xml @@ -34,7 +34,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index 3763058e7b..55c8df0876 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -40,7 +40,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/protocol-framework/pom.xml b/protocol-framework/pom.xml index fa4245495c..a72b609c29 100644 --- a/protocol-framework/pom.xml +++ b/protocol-framework/pom.xml @@ -48,7 +48,7 @@ org.opendaylight.yangtools mockito-configuration - 2.0.0 + 2.0.1 test diff --git a/restconf/sal-rest-docgen-maven/pom.xml b/restconf/sal-rest-docgen-maven/pom.xml index 4359ba9ac4..bf6ed545b3 100644 --- a/restconf/sal-rest-docgen-maven/pom.xml +++ b/restconf/sal-rest-docgen-maven/pom.xml @@ -33,7 +33,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml index 2c129148e1..687ec614ea 100644 --- a/restconf/sal-rest-docgen/pom.xml +++ b/restconf/sal-rest-docgen/pom.xml @@ -25,7 +25,7 @@ org.opendaylight.yangtools yangtools-artifacts - 2.0.0 + 2.0.1 pom import -- 2.36.6