From b9eb640d81809d00137d42b3a102df74afdfb143 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Wed, 11 Jul 2018 16:19:12 +0200 Subject: [PATCH] Upgrade to Fluorine dependencies This switches all the ODL dependencies to the appropriate versions for Fluorine. Note that due to the rfc8345 ietf-network migration, openroadm imports of 2015-06-08 ietf-network-* models are no more available so this fails to build until those obsolete draft models are repackaged inside tpce. https://git.opendaylight.org/gerrit/#/c/73591/ JIRA: NETCONF-550 JIRA: TSC-124 JIRA: TRNSPRTPCE-29 Change-Id: I288e560cc9eb376facc61c34a098b3fba5f524d8 Signed-off-by: Stephen Kitt --- api/pom.xml | 2 +- artifacts/pom.xml | 2 +- common/pom.xml | 10 +++--- features/features-transportpce/pom.xml | 2 +- features/odl-transportpce-api/pom.xml | 12 +++---- features/odl-transportpce-inventory/pom.xml | 2 +- features/odl-transportpce-ordmodels/pom.xml | 12 +++---- features/odl-transportpce-stubmodels/pom.xml | 4 +-- features/odl-transportpce/pom.xml | 10 +++--- inventory/pom.xml | 12 +++---- karaf/pom.xml | 2 +- networkmodel/pom.xml | 8 ++--- olm/pom.xml | 10 +++--- ordmodels/common/pom.xml | 4 +-- ordmodels/device/pom.xml | 6 ++-- ordmodels/network/pom.xml | 23 ++++++++++++-- ordmodels/pom.xml | 31 ++++++++++++------- ordmodels/service/pom.xml | 4 +-- pce/pom.xml | 7 +++-- pom.xml | 2 +- renderer/pom.xml | 10 +++--- servicehandler/pom.xml | 9 +++--- test-common/pom.xml | 4 +-- .../AbstractDataObjectConverter.java | 2 +- .../transportpce/test/DeviceWrapper.java | 2 +- tests/pom.xml | 2 +- tests/stubmodels/pom.xml | 2 +- tests/stubpce/pom.xml | 6 ++-- tests/stubrenderer/pom.xml | 6 ++-- 29 files changed, 118 insertions(+), 90 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 400e544e8..ee4f2f999 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT diff --git a/artifacts/pom.xml b/artifacts/pom.xml index e3182c5a3..4de4129d2 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.odlparent odlparent-lite - 3.1.0 + 3.1.2 diff --git a/common/pom.xml b/common/pom.xml index 0b2fef726..abe279f6d 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -10,7 +10,7 @@ org.opendaylight.odlparent bundle-parent - 3.1.0 + 3.1.2 @@ -24,21 +24,21 @@ org.opendaylight.controller mdsal-artifacts - 1.7.3-SNAPSHOT + 1.8.0-SNAPSHOT import pom org.opendaylight.netconf netconf-artifacts - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT import pom org.opendaylight.mdsal.model mdsal-model-artifacts - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT import pom @@ -59,10 +59,12 @@ org.opendaylight.controller.model model-topology + org.opendaylight.netconf sal-netconf-connector diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml index 8c3d652b0..a9d52281d 100644 --- a/features/features-transportpce/pom.xml +++ b/features/features-transportpce/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent feature-repo-parent - 3.1.0 + 3.1.2 diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml index 076206eec..af54d8261 100644 --- a/features/odl-transportpce-api/pom.xml +++ b/features/odl-transportpce-api/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 3.1.0 + 3.1.2 @@ -23,11 +23,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - 0.12.3-SNAPSHOT - 1.7.3-SNAPSHOT - 1.7.3-SNAPSHOT - 1.3.0-SNAPSHOT - 1.4.3-SNAPSHOT + 0.13.0-SNAPSHOT + 1.8.0-SNAPSHOT + 1.8.0-SNAPSHOT + 2.0.7 + 1.5.0-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml index f713b1f18..c7d527a16 100644 --- a/features/odl-transportpce-inventory/pom.xml +++ b/features/odl-transportpce-inventory/pom.xml @@ -9,7 +9,7 @@ org.opendaylight.odlparent single-feature-parent - 3.1.0 + 3.1.2 diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml index 984ceaf00..cd2d5ba0f 100644 --- a/features/odl-transportpce-ordmodels/pom.xml +++ b/features/odl-transportpce-ordmodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 3.1.0 + 3.1.2 @@ -22,11 +22,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature - 0.12.3-SNAPSHOT - 1.7.3-SNAPSHOT - 1.7.3-SNAPSHOT - 1.3.0-SNAPSHOT - 1.4.3-SNAPSHOT + 0.13.0-SNAPSHOT + 1.8.0-SNAPSHOT + 1.8.0-SNAPSHOT + 2.0.7 + 1.5.0-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml index 637bee3fc..8af42f65e 100644 --- a/features/odl-transportpce-stubmodels/pom.xml +++ b/features/odl-transportpce-stubmodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 3.1.0 + 3.1.2 @@ -23,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT etc/opendaylight/karaf diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index cbe1e43a7..07f6a58f3 100644 --- a/features/odl-transportpce/pom.xml +++ b/features/odl-transportpce/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent single-feature-parent - 3.1.0 + 3.1.2 @@ -23,10 +23,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - 0.12.3-SNAPSHOT - 1.7.3-SNAPSHOT - 1.3.0-SNAPSHOT - 1.4.3-SNAPSHOT + 0.13.0-SNAPSHOT + 1.8.0-SNAPSHOT + 2.0.7 + 1.5.0-SNAPSHOT etc/opendaylight/karaf diff --git a/inventory/pom.xml b/inventory/pom.xml index 5f2658ff8..0539a2062 100644 --- a/inventory/pom.xml +++ b/inventory/pom.xml @@ -8,9 +8,9 @@ 4.0.0 - org.opendaylight.controller - config-parent - 0.8.3-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 3.1.2 @@ -24,14 +24,14 @@ org.opendaylight.controller mdsal-artifacts - 1.7.3-SNAPSHOT + 1.8.0-SNAPSHOT import pom org.opendaylight.netconf netconf-artifacts - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT import pom @@ -74,7 +74,7 @@ org.apache.karaf.scheduler org.apache.karaf.scheduler.core - 4.0.9 + ${karaf.version} provided diff --git a/karaf/pom.xml b/karaf/pom.xml index 087099242..ed689b708 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent karaf4-parent - 3.1.0 + 3.1.2 diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index e7805e31d..bcc5066f6 100644 --- a/networkmodel/pom.xml +++ b/networkmodel/pom.xml @@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.controller - config-parent - 0.8.3-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 3.1.2 @@ -27,7 +27,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT import pom diff --git a/olm/pom.xml b/olm/pom.xml index 46e2401d0..7671215df 100644 --- a/olm/pom.xml +++ b/olm/pom.xml @@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.controller - config-parent - 0.8.3-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.13.0-SNAPSHOT @@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-artifacts - 1.7.3-SNAPSHOT + 1.8.0-SNAPSHOT import pom org.opendaylight.netconf netconf-artifacts - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT import pom diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml index 9572a9bb4..9bb422d21 100644 --- a/ordmodels/common/pom.xml +++ b/ordmodels/common/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal.model mdsal-model-artifacts - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT import pom diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml index 1fa230f92..f438c66ee 100644 --- a/ordmodels/device/pom.xml +++ b/ordmodels/device/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT @@ -26,14 +26,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.netconf netconf-artifacts - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT import pom org.opendaylight.mdsal.model mdsal-model-artifacts - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT import pom diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml index 71824cf1c..64c115707 100644 --- a/ordmodels/network/pom.xml +++ b/ordmodels/network/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal.model mdsal-model-artifacts - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT import pom @@ -51,8 +51,25 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc8345 + + + org.opendaylight.mdsal.binding.model.ietf + rfc8345-ietf-network + + + org.opendaylight.mdsal.binding.model.ietf + rfc8345-ietf-network-topology + + + org.opendaylight.mdsal.binding.model.ietf + rfc8345-ietf-network-topology-state + + diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index 8e011735c..b85177387 100644 --- a/ordmodels/pom.xml +++ b/ordmodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT @@ -77,49 +77,58 @@ and is available at http://www.eclipse.org/legal/epl-v10.html + + + + org.opendaylight.netconf + netconf-artifacts + 1.5.0-SNAPSHOT + pom + import + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.13.0-SNAPSHOT + pom + import + + + + org.opendaylight.netconf ietf-netconf - 1.4.3-SNAPSHOT org.opendaylight.mdsal.model ietf-inet-types-2013-07-15 - 1.4.3-SNAPSHOT org.opendaylight.mdsal.model iana-afn-safi - 2013.07.04.12.3-SNAPSHOT org.opendaylight.mdsal.model ietf-access-control-list - 0.10.3-SNAPSHOT org.opendaylight.mdsal.model iana-if-type-2014-05-08 - 2014.05.08.12.3-SNAPSHOT org.opendaylight.mdsal.model ietf-yang-types-20130715 - 2013.07.15.12.3-SNAPSHOT org.opendaylight.mdsal.model ietf-interfaces - 2014.05.08.12.3-SNAPSHOT org.opendaylight.mdsal.model ietf-packet-fields - 0.10.3-SNAPSHOT - - diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml index e7176de15..e243d2cab 100644 --- a/ordmodels/service/pom.xml +++ b/ordmodels/service/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT @@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal.model mdsal-model-artifacts - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT import pom diff --git a/pce/pom.xml b/pce/pom.xml index 2c59463ae..677d51c12 100755 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -15,9 +15,9 @@ Author: Martial Coulibaly on behalf of Orange 4.0.0 - org.opendaylight.controller - config-parent - 0.8.3-SNAPSHOT + org.opendaylight.odlparent + bundle-parent + 3.1.2 @@ -80,6 +80,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.controller sal-binding-broker-impl + 1.8.0-SNAPSHOT test diff --git a/pom.xml b/pom.xml index 76be13e56..9ed4041e5 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 3.1.0 + 3.1.2 diff --git a/renderer/pom.xml b/renderer/pom.xml index a571b97ca..69dcc6eb4 100644 --- a/renderer/pom.xml +++ b/renderer/pom.xml @@ -11,9 +11,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 4.0.0 - org.opendaylight.controller - config-parent - 0.8.3-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.13.0-SNAPSHOT @@ -27,14 +27,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.controller mdsal-artifacts - 1.7.3-SNAPSHOT + 1.8.0-SNAPSHOT import pom org.opendaylight.netconf netconf-artifacts - 1.4.3-SNAPSHOT + 1.5.0-SNAPSHOT import pom diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index 43085f679..4f4cf1afb 100644 --- a/servicehandler/pom.xml +++ b/servicehandler/pom.xml @@ -13,9 +13,9 @@ Author: Martial Coulibaly on behalf of Orange 4.0.0 - org.opendaylight.controller - config-parent - 0.8.3-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.13.0-SNAPSHOT @@ -29,7 +29,7 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.controller mdsal-artifacts - 1.7.3-SNAPSHOT + 1.8.0-SNAPSHOT import pom @@ -83,7 +83,6 @@ Author: Martial Coulibaly on behalf of Orange org.opendaylight.controller sal-binding-broker-impl - 1.7.3-SNAPSHOT test diff --git a/test-common/pom.xml b/test-common/pom.xml index 1933e4acf..53e26b757 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.odlparent bundle-parent - 3.1.0 + 3.1.2 @@ -25,7 +25,7 @@ org.opendaylight.controller mdsal-artifacts - 1.7.3-SNAPSHOT + 1.8.0-SNAPSHOT pom import diff --git a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java index b050095d6..6a44ebfe8 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/binding/converter/AbstractDataObjectConverter.java @@ -80,7 +80,7 @@ public abstract class AbstractDataObjectConverter implements DataObjectConverter YangInstanceIdentifier.PathArgument directChildIdentifier = YangInstanceIdentifier.of(rootNode).getLastPathArgument(); Optional> directChild = - NormalizedNodes.getDirectChild(normalizedNode, directChildIdentifier);//.toJavaUtil(); + NormalizedNodes.getDirectChild(normalizedNode, directChildIdentifier); if (!directChild.isPresent()) { throw new IllegalStateException(String.format("Could not get the direct child of %s", rootNode)); } diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java index 5c2d73716..833de2289 100644 --- a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java +++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java @@ -135,7 +135,7 @@ public final class DeviceWrapper { YangInstanceIdentifier initialDataIi = YangInstanceIdentifier.of(dataQName); LOG.debug("Searching for {} inside {}", initialDataIi, initialDataNormalizedNodes.get()); Optional> dataNormalizedNodes = - NormalizedNodes.findNode(initialDataNormalizedNodes.get(), initialDataIi);//.toJavaUtil(); + NormalizedNodes.findNode(initialDataNormalizedNodes.get(), initialDataIi); Preconditions.checkArgument(dataNormalizedNodes.isPresent()); LOG.info("Initial data was successfully stored into ds"); DOMDataWriteTransaction writeOnlyTransaction = domDataBroker.newWriteOnlyTransaction(); diff --git a/tests/pom.xml b/tests/pom.xml index 09dff6a1d..15ebc4e36 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent - 3.1.0 + 3.1.2 diff --git a/tests/stubmodels/pom.xml b/tests/stubmodels/pom.xml index 835f45ff9..4d8f74fea 100644 --- a/tests/stubmodels/pom.xml +++ b/tests/stubmodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 0.12.3-SNAPSHOT + 0.13.0-SNAPSHOT diff --git a/tests/stubpce/pom.xml b/tests/stubpce/pom.xml index 3d4efaa5d..755a4a0f3 100644 --- a/tests/stubpce/pom.xml +++ b/tests/stubpce/pom.xml @@ -15,9 +15,9 @@ Author: Martial Coulibaly on behalf of Orange 4.0.0 - org.opendaylight.controller - config-parent - 0.8.3-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.13.0-SNAPSHOT diff --git a/tests/stubrenderer/pom.xml b/tests/stubrenderer/pom.xml index 81f168299..aa6e9eabc 100644 --- a/tests/stubrenderer/pom.xml +++ b/tests/stubrenderer/pom.xml @@ -13,9 +13,9 @@ Author: Martial Coulibaly on behalf of Orange 4.0.0 - org.opendaylight.controller - config-parent - 0.8.3-SNAPSHOT + org.opendaylight.mdsal + binding-parent + 0.13.0-SNAPSHOT -- 2.36.6