From a318428a18043e7927b12a46094427241973fc54 Mon Sep 17 00:00:00 2001 From: Christophe Betoule Date: Thu, 9 Jan 2020 14:06:12 +0100 Subject: [PATCH] Cleanup and optimize POM JIRA: TRNSPRTPCE-181 Signed-off-by: Christophe Betoule Co-authored-by: Gilles Thouenon Change-Id: I3229c20ca0df736a9845a4aa782b80bd6ab02317 --- api/pom.xml | 5 - artifacts/pom.xml | 61 ---------- common/pom.xml | 63 ++--------- features/features-transportpce/pom.xml | 61 ---------- features/odl-transportpce-api/pom.xml | 25 +--- features/odl-transportpce-inventory/pom.xml | 113 +++++++++---------- features/odl-transportpce-ordmodels/pom.xml | 12 +- features/odl-transportpce-stubmodels/pom.xml | 93 --------------- features/odl-transportpce/pom.xml | 90 ++++++--------- features/pom.xml | 5 +- inventory/pom.xml | 63 +---------- karaf/pom.xml | 95 ++++++---------- networkmodel/pom.xml | 45 -------- olm/pom.xml | 53 +-------- ordmodels/common/pom.xml | 12 -- ordmodels/device/pom.xml | 7 -- ordmodels/network/pom.xml | 24 ---- ordmodels/pom.xml | 67 ----------- ordmodels/service/pom.xml | 12 -- pce/pom.xml | 73 +++--------- pom.xml | 16 +-- renderer/pom.xml | 50 -------- servicehandler/pom.xml | 59 ---------- tapimodels/pom.xml | 2 +- test-common/pom.xml | 50 -------- 25 files changed, 163 insertions(+), 993 deletions(-) delete mode 100644 artifacts/pom.xml delete mode 100644 features/features-transportpce/pom.xml delete mode 100644 features/odl-transportpce-stubmodels/pom.xml diff --git a/api/pom.xml b/api/pom.xml index af7987fcc..1a23c27c5 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -37,10 +37,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html transportpce-ordmodels-service ${project.version} - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-inet-types - ${project.groupId} transportpce-tapimodels @@ -87,5 +83,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - diff --git a/artifacts/pom.xml b/artifacts/pom.xml deleted file mode 100644 index 54159a187..000000000 --- a/artifacts/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent-lite - 5.0.4 - - - - org.opendaylight.transportpce - transportpce-artifacts - 0.5.0-SNAPSHOT - pom - - - - - ${project.groupId} - transportpce-api - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - - - ${project.groupId} - transportpce-features - ${project.version} - features - xml - - - - diff --git a/common/pom.xml b/common/pom.xml index 7508c44f9..012f3df11 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -21,13 +21,6 @@ - - org.opendaylight.controller - mdsal-artifacts - 1.10.2-SNAPSHOT - import - pom - org.opendaylight.netconf netconf-artifacts @@ -38,7 +31,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.3 + 4.0.8 import pom @@ -46,61 +39,23 @@ - - ${project.groupId} - transportpce-api - ${project.version} - - - org.opendaylight.controller - sal-binding-api - - - org.opendaylight.controller.model - model-topology - - - - org.opendaylight.netconf - sal-netconf-connector - ${project.groupId}.ordmodels transportpce-ordmodels-device ${project.version} - - - org.opendaylight.controller - sal-binding-broker-impl - - - - org.opendaylight.yangtools - yang-data-codec-xml - - - org.opendaylight.yangtools - yang-data-codec-gson + ${project.groupId} + transportpce-api + ${project.version} - - - junit - junit - test + org.opendaylight.netconf + sal-netconf-connector - - org.mockito - mockito-core - test + org.opendaylight.mdsal + mdsal-binding-dom-adapter @@ -124,6 +79,4 @@ - - diff --git a/features/features-transportpce/pom.xml b/features/features-transportpce/pom.xml deleted file mode 100644 index d2ac03be4..000000000 --- a/features/features-transportpce/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - feature-repo-parent - 5.0.4 - - - - org.opendaylight.transportpce - features-transportpce - 0.5.0-SNAPSHOT - feature - - - - ${project.groupId} - odl-transportpce - ${project.version} - features - xml - - - ${project.groupId} - odl-transportpce-api - ${project.version} - features - xml - - - ${project.groupId} - odl-transportpce-ordmodels - ${project.version} - features - xml - - - ${project.groupId} - odl-transportpce-inventory - ${project.version} - features - xml - - - - diff --git a/features/odl-transportpce-api/pom.xml b/features/odl-transportpce-api/pom.xml index 58b7207d2..25e3e06df 100644 --- a/features/odl-transportpce-api/pom.xml +++ b/features/odl-transportpce-api/pom.xml @@ -21,15 +21,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature + OpenDaylight :: transportpce :: api 1.7.2-SNAPSHOT etc/opendaylight/karaf - -OpenDaylight :: transportpce :: api - ${project.groupId} @@ -38,26 +36,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL features xml - - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - ${project.groupId} transportpce-api @@ -78,5 +56,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - diff --git a/features/odl-transportpce-inventory/pom.xml b/features/odl-transportpce-inventory/pom.xml index 74da3a0d6..a6c52cc82 100644 --- a/features/odl-transportpce-inventory/pom.xml +++ b/features/odl-transportpce-inventory/pom.xml @@ -18,6 +18,8 @@ 0.5.0-SNAPSHOT feature + OpenDaylight :: transportpce :: Inventory + localhost:3306 transportpce @@ -30,74 +32,71 @@ true - OpenDaylight :: transportpce :: Inventory org.opendaylight.transportpce - transportpce-inventory + odl-transportpce ${project.version} + features + xml org.opendaylight.transportpce - odl-transportpce + transportpce-inventory ${project.version} - features - xml - - - maven-resources-plugin - - - copy-resources - validate - - copy-resources - - - ${basedir}/target/resources - - - - src/main/resources - - true - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - attach-db-artifact - package - - attach-artifact - - - - - target/resources/org.ops4j.datasource-transporpce.cfg - cfg - datasource - - - target/resources/org.opendaylight.transportpce.job.cfg - cfg - config - - - - - - - + + + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/resources + + + src/main/resources + true + + + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-db-artifact + package + + attach-artifact + + + + + target/resources/org.ops4j.datasource-transporpce.cfg + cfg + datasource + + + target/resources/org.opendaylight.transportpce.job.cfg + cfg + config + + + + + + + diff --git a/features/odl-transportpce-ordmodels/pom.xml b/features/odl-transportpce-ordmodels/pom.xml index 6b8b72bbe..1f69cf788 100644 --- a/features/odl-transportpce-ordmodels/pom.xml +++ b/features/odl-transportpce-ordmodels/pom.xml @@ -21,16 +21,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature - - 1.10.2-SNAPSHOT - 1.10.2-SNAPSHOT - 3.0.7 - 1.7.2-SNAPSHOT - etc/opendaylight/karaf - - - -OpenDaylight :: transportpce :: ordmodels + OpenDaylight :: transportpce :: ordmodels @@ -68,5 +59,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - diff --git a/features/odl-transportpce-stubmodels/pom.xml b/features/odl-transportpce-stubmodels/pom.xml deleted file mode 100644 index 0dee03b95..000000000 --- a/features/odl-transportpce-stubmodels/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.odlparent - single-feature-parent - 5.0.4 - - - - org.opendaylight.transportpce - odl-transportpce-stubmodels - 0.5.0-SNAPSHOT - feature - - - - etc/opendaylight/karaf - - - -OpenDaylight :: transportpce :: stubmodels - - - - ${project.groupId} - odl-transportpce-ordmodels - ${project.version} - features - xml - - - ${project.groupId} - odl-transportpce-api - ${project.version} - features - xml - - - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - - - ${project.groupId} - transportpce-api - ${project.version} - - - ${project.groupId} - transportpce-stubmodels - ${project.version} - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.18.1 - - true - - - - - - diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index 8edc04a39..d6b1670ff 100644 --- a/features/odl-transportpce/pom.xml +++ b/features/odl-transportpce/pom.xml @@ -21,58 +21,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 0.5.0-SNAPSHOT feature + OpenDaylight :: transportpce 1.10.2-SNAPSHOT - 3.0.7 1.7.2-SNAPSHOT 1.10.2-SNAPSHOT etc/opendaylight/karaf - OpenDaylight :: transportpce - - - org.opendaylight.netconf - odl-restconf-all - ${restconf.version} - features - xml - - - org.opendaylight.controller - odl-mdsal-broker - ${mdsal.version} - features - xml - - - org.opendaylight.netconf - odl-netconf-all - ${netconf.version} - features - xml - - - org.opendaylight.netconf - odl-netconf-connector-all - ${netconf.version} - features - xml - - - org.opendaylight.netconf - netconf-console - ${netconf.version} - - - org.opendaylight.netconf - odl-netconf-topology - ${netconf.version} - features - xml - org.opendaylight.transportpce odl-transportpce-api @@ -80,13 +38,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL features xml - - org.opendaylight.transportpce - odl-transportpce-ordmodels - ${project.version} - features - xml - org.opendaylight.transportpce transportpce-common @@ -94,22 +45,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.transportpce - transportpce-networkmodel + transportpce-renderer ${project.version} org.opendaylight.transportpce - transportpce-pce + transportpce-networkmodel ${project.version} org.opendaylight.transportpce - transportpce-renderer + transportpce-olm ${project.version} org.opendaylight.transportpce - transportpce-olm + transportpce-pce ${project.version} @@ -127,6 +78,35 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL transportpce-tapi ${project.version} + + + org.opendaylight.controller + odl-mdsal-broker + ${mdsal.version} + features + xml + + + org.opendaylight.netconf + odl-restconf-all + ${restconf.version} + features + xml + + + org.opendaylight.netconf + odl-netconf-all + ${netconf.version} + features + xml + + + org.opendaylight.netconf + odl-netconf-connector-all + ${netconf.version} + features + xml + @@ -142,6 +122,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - - diff --git a/features/pom.xml b/features/pom.xml index c35d36662..4fcd8f834 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -23,12 +23,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL pom - features-transportpce - odl-transportpce-api odl-transportpce-ordmodels - + odl-transportpce-api odl-transportpce odl-transportpce-inventory - diff --git a/inventory/pom.xml b/inventory/pom.xml index 6b00f1b7f..5b5609eee 100644 --- a/inventory/pom.xml +++ b/inventory/pom.xml @@ -19,64 +19,11 @@ 0.5.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.10.2-SNAPSHOT - import - pom - - - org.opendaylight.netconf - netconf-artifacts - 1.7.2-SNAPSHOT - import - pom - - - - - - ${project.groupId} - transportpce-api - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - - - ${project.groupId} - transportpce-common - ${project.version} - - - ${project.groupId} - transportpce-renderer - ${project.version} - - - org.opendaylight.controller.model - model-topology - - - org.opendaylight.netconf - sal-netconf-connector - - - com.fasterxml.jackson.core - jackson-databind - - + + ${project.groupId} + transportpce-common + ${project.version} + - diff --git a/karaf/pom.xml b/karaf/pom.xml index 722ef13b6..906ebd139 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -19,68 +19,47 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.transportpce transportpce-karaf 0.5.0-SNAPSHOT - ${project.artifactId} pom + ${project.artifactId} - - odl-transportpce - - ${project.build.outputDirectory}/../yang-models/schema - - - ${project.build.outputDirectory}/../assembly/cache/schema - - - - - - - ${project.groupId} - transportpce-artifacts - ${project.version} - pom - import - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - pom - import - - - + + odl-transportpce + + ${project.build.outputDirectory}/../yang-models/schema + + + ${project.build.outputDirectory}/../assembly/cache/schema + + - - - - org.apache.karaf.features - framework - kar - - - - ${project.groupId} - features-transportpce - ${project.version} - features - xml - runtime - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - + org.apache.karaf.features + framework + kar + + + ${project.groupId} + odl-transportpce + ${project.version} + features + xml + runtime + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index 790e57929..61cea4df6 100644 --- a/networkmodel/pom.xml +++ b/networkmodel/pom.xml @@ -22,56 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT bundle - - - - org.opendaylight.netconf - netconf-artifacts - 1.7.2-SNAPSHOT - import - pom - - - - - - ${project.groupId} - transportpce-api - ${project.version} - ${project.groupId} transportpce-common ${project.version} - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - - - ${project.groupId} - transportpce-renderer - ${project.version} - - - org.opendaylight.netconf - sal-netconf-connector - - - - - junit - junit - test - - - - org.mockito - mockito-core - test - @@ -79,6 +35,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html jsr305 true - diff --git a/olm/pom.xml b/olm/pom.xml index 74690a29a..f5ca98208 100644 --- a/olm/pom.xml +++ b/olm/pom.xml @@ -22,56 +22,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.10.2-SNAPSHOT - import - pom - - - org.opendaylight.netconf - netconf-artifacts - 1.7.2-SNAPSHOT - import - pom - - - - + ${project.groupId} - transportpce-api - ${project.version} - - - ${project.groupId} - transportpce-renderer - ${project.version} - - - ${project.groupId} - transportpce-common + test-common ${project.version} - - org.opendaylight.controller.model - model-topology - - - org.opendaylight.netconf - sal-netconf-connector - - - - org.powermock - powermock-core - test - org.powermock powermock-api-mockito2 @@ -83,12 +41,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html test - - ${project.groupId} - test-common - ${project.version} - - com.google.code.findbugs @@ -96,5 +48,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html true - diff --git a/ordmodels/common/pom.xml b/ordmodels/common/pom.xml index 6c0413041..ecc92ed96 100644 --- a/ordmodels/common/pom.xml +++ b/ordmodels/common/pom.xml @@ -21,18 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT bundle - - - - org.opendaylight.mdsal - mdsal-artifacts - 4.0.3 - import - pom - - - - org.opendaylight.mdsal.binding.model.ietf diff --git a/ordmodels/device/pom.xml b/ordmodels/device/pom.xml index 3ae653498..14761e71d 100644 --- a/ordmodels/device/pom.xml +++ b/ordmodels/device/pom.xml @@ -30,13 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html import pom - - org.opendaylight.mdsal - mdsal-artifacts - 4.0.3 - import - pom - diff --git a/ordmodels/network/pom.xml b/ordmodels/network/pom.xml index 36130e422..e6f78405a 100644 --- a/ordmodels/network/pom.xml +++ b/ordmodels/network/pom.xml @@ -21,18 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT bundle - - - - org.opendaylight.mdsal - mdsal-artifacts - 4.0.3 - import - pom - - - - @@ -56,17 +44,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal.binding.model.ietf rfc8345 - diff --git a/ordmodels/pom.xml b/ordmodels/pom.xml index 0bcba205a..1fff50a3d 100644 --- a/ordmodels/pom.xml +++ b/ordmodels/pom.xml @@ -76,71 +76,4 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - - - - - org.opendaylight.netconf - netconf-artifacts - 1.7.2-SNAPSHOT - pom - import - - - org.opendaylight.mdsal - mdsal-artifacts - 4.0.3 - pom - import - - - - - - - org.opendaylight.netconf - ietf-netconf - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-inet-types - - - org.opendaylight.mdsal.binding.model.ietf - rfc6991-ietf-yang-types - - - org.opendaylight.mdsal.model - iana-afn-safi - 2013.07.04.16.3 - pom - - - org.opendaylight.mdsal.model - ietf-access-control-list - - - - org.opendaylight.mdsal.binding.model.iana - iana-if-type - - - org.opendaylight.mdsal.binding.model.ietf - rfc7223 - - - org.opendaylight.mdsal.model - ietf-packet-fields - - - diff --git a/ordmodels/service/pom.xml b/ordmodels/service/pom.xml index d1be640a3..908a92fa3 100644 --- a/ordmodels/service/pom.xml +++ b/ordmodels/service/pom.xml @@ -21,18 +21,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT bundle - - - - org.opendaylight.mdsal - mdsal-artifacts - 4.0.3 - import - pom - - - - diff --git a/pce/pom.xml b/pce/pom.xml index 43cff9049..b010e323d 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -26,35 +26,7 @@ Author: Martial Coulibaly on behalf of Orange 0.5.0-SNAPSHOT bundle - - - - org.apache.maven.plugins - maven-jar-plugin - 2.6 - - - - test-jar - - - - - - - - - - ${project.groupId} - transportpce-api - ${project.version} - - - ${project.groupId} - transportpce-networkmodel - ${project.version} - ${project.groupId} transportpce-common @@ -66,35 +38,6 @@ Author: Martial Coulibaly on behalf of Orange 1.2.0 - - - junit - junit - test - - - org.mockito - mockito-core - test - - - - ${project.groupId} - test-common - ${project.version} - test - - - org.opendaylight.controller - sal-binding-broker-impl - 1.10.2-SNAPSHOT - test - - - org.opendaylight.mdsal - mdsal-binding-dom-codec - - com.google.code.findbugs @@ -111,4 +54,20 @@ Author: Martial Coulibaly on behalf of Orange + + + + org.apache.maven.plugins + maven-jar-plugin + 2.6 + + + + test-jar + + + + + + diff --git a/pom.xml b/pom.xml index ce0eec721..a6dca6ff9 100644 --- a/pom.xml +++ b/pom.xml @@ -29,36 +29,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - artifacts ordmodels tapimodels api common + test-common renderer networkmodel inventory olm - pce servicehandler tapi features karaf - test-common - - diff --git a/renderer/pom.xml b/renderer/pom.xml index 835fa4f58..fd457df47 100644 --- a/renderer/pom.xml +++ b/renderer/pom.xml @@ -22,49 +22,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 0.5.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.10.2-SNAPSHOT - import - pom - - - org.opendaylight.netconf - netconf-artifacts - 1.7.2-SNAPSHOT - import - pom - - - - - - ${project.groupId} - transportpce-api - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - ${project.groupId} transportpce-common ${project.version} - - org.opendaylight.controller.model - model-topology - - - org.opendaylight.netconf - sal-netconf-connector - @@ -73,17 +36,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.version} test - - junit - junit - test - - - org.mockito - mockito-core - 2.19.0 - test - @@ -91,7 +43,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html jsr305 true - - diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index c1f4a6486..74b3960b2 100644 --- a/servicehandler/pom.xml +++ b/servicehandler/pom.xml @@ -24,44 +24,7 @@ Author: Martial Coulibaly on behalf of Orange 0.5.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.10.2-SNAPSHOT - import - pom - - - - - - ${project.groupId} - transportpce-api - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - ${project.groupId} transportpce-pce @@ -69,38 +32,16 @@ Author: Martial Coulibaly on behalf of Orange - - junit - junit - test - ${project.groupId} test-common ${project.version} test - - org.opendaylight.controller - sal-binding-broker-impl - test - - - ${project.groupId} - transportpce-pce - ${project.version} - test - test-jar - ${project.groupId} transportpce-renderer ${project.version} - - org.mockito - mockito-core - test - diff --git a/tapimodels/pom.xml b/tapimodels/pom.xml index ece3de23d..feffd258f 100644 --- a/tapimodels/pom.xml +++ b/tapimodels/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.4 + 4.0.8 diff --git a/test-common/pom.xml b/test-common/pom.xml index e4f3c0a1c..699e09f67 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -20,56 +20,7 @@ 0.5.0-SNAPSHOT bundle - - - - org.opendaylight.controller - mdsal-artifacts - 1.10.2-SNAPSHOT - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 3.0.7 - pom - import - - - - - - com.google.guava - guava - - - - org.slf4j - slf4j-api - - - - org.opendaylight.controller - sal-binding-broker-impl - - - - org.opendaylight.controller - sal-binding-api - - - - org.opendaylight.yangtools - yang-data-codec-xml - - - - org.opendaylight.yangtools - yang-data-codec-gson - - ${project.groupId} transportpce-common @@ -82,6 +33,5 @@ jsr305 true - -- 2.36.6