From 08c6fa3237169f10b484665b12258c4cf403a72f Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Sat, 20 Jan 2018 11:14:28 -0500 Subject: [PATCH] Eliminate explicit yangtools dependencies and pom cleanup Changed the openflowplugin-parent pom to derive from bindng-parent so yangtools version and dependencies come from mdsal. Also removed unnecessary, duplicated configurations, eg yang-maven-plugin, in derived poms thatcare inherited from the parents. Change-Id: Ie331b93a5f1d6784109ff82afe63ca481c67ceec Signed-off-by: Tom Pantelis --- applications/bulk-o-matic/pom.xml | 4 - applications/forwardingrules-manager/pom.xml | 8 -- applications/forwardingrules-sync/pom.xml | 4 - applications/lldp-speaker/pom.xml | 4 - applications/notification-supplier/pom.xml | 4 - applications/of-switch-config-pusher/pom.xml | 9 --- applications/pom.xml | 34 -------- applications/reconciliation-framework/pom.xml | 4 - applications/southbound-cli/pom.xml | 4 - applications/table-miss-enforcer/pom.xml | 4 - applications/topology-lldp-discovery/pom.xml | 27 +------ applications/topology-manager/pom.xml | 31 +------- .../openflowjava-extension-nicira/pom.xml | 35 --------- .../openflowplugin-extension-api/pom.xml | 35 --------- .../openflowplugin-extension-nicira/pom.xml | 35 --------- extension/test-extension/pom.xml | 35 --------- model/pom.xml | 47 ----------- openflowjava/openflow-protocol-api/pom.xml | 34 +------- openflowjava/openflow-protocol-impl/pom.xml | 34 -------- openflowjava/openflow-protocol-spi/pom.xml | 34 -------- openflowjava/pom.xml | 18 ----- openflowplugin-api/pom.xml | 34 -------- parent/pom.xml | 78 ++----------------- 23 files changed, 19 insertions(+), 537 deletions(-) diff --git a/applications/bulk-o-matic/pom.xml b/applications/bulk-o-matic/pom.xml index 8fb01faa1f..ddd3a7c07b 100644 --- a/applications/bulk-o-matic/pom.xml +++ b/applications/bulk-o-matic/pom.xml @@ -48,10 +48,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - org.apache.maven.plugins maven-checkstyle-plugin diff --git a/applications/forwardingrules-manager/pom.xml b/applications/forwardingrules-manager/pom.xml index 9daf04c9c3..7308673852 100644 --- a/applications/forwardingrules-manager/pom.xml +++ b/applications/forwardingrules-manager/pom.xml @@ -78,14 +78,6 @@ org.apache.felix maven-bundle-plugin - - org.opendaylight.yangtools - yang-maven-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - org.apache.maven.plugins maven-checkstyle-plugin diff --git a/applications/forwardingrules-sync/pom.xml b/applications/forwardingrules-sync/pom.xml index 7ee809b0e4..ba636dd3d8 100644 --- a/applications/forwardingrules-sync/pom.xml +++ b/applications/forwardingrules-sync/pom.xml @@ -112,10 +112,6 @@ org.apache.felix maven-bundle-plugin - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/applications/lldp-speaker/pom.xml b/applications/lldp-speaker/pom.xml index e13121cb60..67119e81e7 100644 --- a/applications/lldp-speaker/pom.xml +++ b/applications/lldp-speaker/pom.xml @@ -67,10 +67,6 @@ checkstyle.violationSeverity=error - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/applications/notification-supplier/pom.xml b/applications/notification-supplier/pom.xml index d46a1aa522..1c17367dad 100644 --- a/applications/notification-supplier/pom.xml +++ b/applications/notification-supplier/pom.xml @@ -58,10 +58,6 @@ checkstyle.violationSeverity=error - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/applications/of-switch-config-pusher/pom.xml b/applications/of-switch-config-pusher/pom.xml index 1340faabd1..8451968a54 100644 --- a/applications/of-switch-config-pusher/pom.xml +++ b/applications/of-switch-config-pusher/pom.xml @@ -47,13 +47,4 @@ test - - - - - org.opendaylight.yangtools - yang-maven-plugin - - - diff --git a/applications/pom.xml b/applications/pom.xml index fb20896803..aa80e13611 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -15,40 +15,6 @@ pom - - - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${project.build.directory}/generated-sources/sal - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - - - org.apache.felix diff --git a/applications/reconciliation-framework/pom.xml b/applications/reconciliation-framework/pom.xml index 000f66f6b6..a592a80604 100644 --- a/applications/reconciliation-framework/pom.xml +++ b/applications/reconciliation-framework/pom.xml @@ -80,10 +80,6 @@ org.apache.felix maven-bundle-plugin - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/applications/southbound-cli/pom.xml b/applications/southbound-cli/pom.xml index 0de3fb14ec..f458a1ba83 100644 --- a/applications/southbound-cli/pom.xml +++ b/applications/southbound-cli/pom.xml @@ -80,10 +80,6 @@ org.apache.felix maven-bundle-plugin - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/applications/table-miss-enforcer/pom.xml b/applications/table-miss-enforcer/pom.xml index 40c3f77624..6dba8a7aad 100644 --- a/applications/table-miss-enforcer/pom.xml +++ b/applications/table-miss-enforcer/pom.xml @@ -57,10 +57,6 @@ checkstyle.violationSeverity=error - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/applications/topology-lldp-discovery/pom.xml b/applications/topology-lldp-discovery/pom.xml index 16131488e9..4d7ca1b4cd 100644 --- a/applications/topology-lldp-discovery/pom.xml +++ b/applications/topology-lldp-discovery/pom.xml @@ -2,35 +2,16 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.12.0-SNAPSHOT - + org.opendaylight.openflowplugin + openflowplugin-parent + 0.6.0-SNAPSHOT + ../../parent org.opendaylight.openflowplugin.applications topology-lldp-discovery 0.6.0-SNAPSHOT bundle - - - - org.opendaylight.openflowplugin - openflowplugin-artifacts - ${project.version} - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.7.0-SNAPSHOT - pom - import - - - - com.google.guava diff --git a/applications/topology-manager/pom.xml b/applications/topology-manager/pom.xml index cf9304b513..257562a575 100644 --- a/applications/topology-manager/pom.xml +++ b/applications/topology-manager/pom.xml @@ -2,35 +2,16 @@ 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.12.0-SNAPSHOT - + org.opendaylight.openflowplugin + openflowplugin-parent + 0.6.0-SNAPSHOT + ../../parent org.opendaylight.openflowplugin.applications topology-manager 0.6.0-SNAPSHOT bundle - - - - org.opendaylight.openflowplugin - openflowplugin-artifacts - ${project.version} - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.7.0-SNAPSHOT - pom - import - - - - com.google.guava @@ -92,10 +73,6 @@ checkstyle.violationSeverity=error - - org.opendaylight.yangtools - yang-maven-plugin - diff --git a/extension/openflowjava-extension-nicira/pom.xml b/extension/openflowjava-extension-nicira/pom.xml index c836c9d2b3..a36d8cb75c 100644 --- a/extension/openflowjava-extension-nicira/pom.xml +++ b/extension/openflowjava-extension-nicira/pom.xml @@ -17,41 +17,6 @@ org.apache.felix maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${project.build.directory}/generated-sources/sal - - - org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - ${project.build.directory}/site/models - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/extension/openflowplugin-extension-api/pom.xml b/extension/openflowplugin-extension-api/pom.xml index 81308e9e94..97739a9d40 100644 --- a/extension/openflowplugin-extension-api/pom.xml +++ b/extension/openflowplugin-extension-api/pom.xml @@ -18,41 +18,6 @@ org.apache.felix maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${project.build.directory}/generated-sources/sal - - - org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - ${project.build.directory}/site/models - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml index 554654a178..38e6c1f977 100644 --- a/extension/openflowplugin-extension-nicira/pom.xml +++ b/extension/openflowplugin-extension-nicira/pom.xml @@ -18,41 +18,6 @@ org.apache.felix maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${project.build.directory}/generated-sources/sal - - - org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - ${project.build.directory}/site/models - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml index 8d75e53413..190ea88f3a 100644 --- a/extension/test-extension/pom.xml +++ b/extension/test-extension/pom.xml @@ -18,41 +18,6 @@ org.apache.felix maven-bundle-plugin - - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${project.build.directory}/generated-sources/sal - - - org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - ${project.build.directory}/site/models - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/model/pom.xml b/model/pom.xml index cfb37d5ee7..c66ba751e2 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -19,10 +19,6 @@ model-flow-statistics - - UTF-8 - - org.opendaylight.mdsal @@ -55,49 +51,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - org.opendaylight.mdsal - yang-binding - ${mdsal.model.version} - jar - - - - - - generate-sources - - - src/main/yang - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - target/site/models - - - org.opendaylight.mdsal.binding.yang.wadl.generator.maven.WadlGenerator - target/site/models - - - true - - - - diff --git a/openflowjava/openflow-protocol-api/pom.xml b/openflowjava/openflow-protocol-api/pom.xml index 5a371b70a1..15434be6ab 100644 --- a/openflowjava/openflow-protocol-api/pom.xml +++ b/openflowjava/openflow-protocol-api/pom.xml @@ -2,10 +2,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.opendaylight.mdsal - binding-parent - 0.12.0-SNAPSHOT - + org.opendaylight.openflowplugin + openflowplugin-parent + 0.6.0-SNAPSHOT + ../../parent org.opendaylight.openflowplugin.openflowjava openflow-protocol-api @@ -19,32 +19,6 @@ HEAD - - 2.4.0-SNAPSHOT - 0.12.0-SNAPSHOT - - - - - - - org.opendaylight.mdsal - mdsal-artifacts - ${mdsal.version} - import - pom - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${mdsal.model.version} - import - pom - - - - org.opendaylight.mdsal diff --git a/openflowjava/openflow-protocol-impl/pom.xml b/openflowjava/openflow-protocol-impl/pom.xml index e65e737b06..65d3358142 100644 --- a/openflowjava/openflow-protocol-impl/pom.xml +++ b/openflowjava/openflow-protocol-impl/pom.xml @@ -30,40 +30,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${salGeneratorPath} - - - org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - ${project.build.directory}/site/models - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - org.apache.maven.plugins maven-jar-plugin diff --git a/openflowjava/openflow-protocol-spi/pom.xml b/openflowjava/openflow-protocol-spi/pom.xml index 70d0fa947f..6355b791ff 100644 --- a/openflowjava/openflow-protocol-spi/pom.xml +++ b/openflowjava/openflow-protocol-spi/pom.xml @@ -29,40 +29,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${salGeneratorPath} - - - org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - ${project.build.directory}/site/models - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/openflowjava/pom.xml b/openflowjava/pom.xml index cd9f56bd68..b185f0cf5c 100644 --- a/openflowjava/pom.xml +++ b/openflowjava/pom.xml @@ -51,24 +51,6 @@ ${project.build.directory}/META-INF - - org.codehaus.mojo - build-helper-maven-plugin - - - add-yang-sources - generate-sources - - add-source - - - - ${salGeneratorPath} - - - - - diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml index ed29520d0f..75291dafc6 100644 --- a/openflowplugin-api/pom.xml +++ b/openflowplugin-api/pom.xml @@ -31,40 +31,6 @@ true - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${project.build.directory}/generated-sources/sal - - - org.opendaylight.mdsal.binding.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - ${project.build.directory}/site/models - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/parent/pom.xml b/parent/pom.xml index 69b5b2d860..85f4cf0c87 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -10,9 +10,9 @@ - org.opendaylight.odlparent - odlparent - 3.0.2 + org.opendaylight.mdsal + binding-parent + 0.12.0-SNAPSHOT @@ -31,13 +31,6 @@ utf-8 - 0.14.0-SNAPSHOT - ${project.build.directory}/generated-sources/sal - 0.7.0-SNAPSHOT - 1.7.0-SNAPSHOT - 0.12.0-SNAPSHOT - 2.0.1 - 0.7.0 0000.0002.0053.0 1.3.0-SNAPSHOT @@ -51,38 +44,17 @@ import pom - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - import - pom - - - org.opendaylight.mdsal - mdsal-artifacts - 2.4.0-SNAPSHOT - import - pom - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${mdsal.model.version} - import - pom - org.opendaylight.controller mdsal-artifacts - ${mdsal.version} - import + 1.7.0-SNAPSHOT pom + import org.opendaylight.controller liblldp - ${sal.api.version} + 0.14.0-SNAPSHOT @@ -98,7 +70,7 @@ net.sourceforge.argparse4j argparse4j - ${argparse4j.version} + 0.7.0 @@ -112,42 +84,6 @@ - - maven-clean-plugin - - - - ${salGeneratorPath} - - ** - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - generate-sources - - add-source - - - - ${salGeneratorPath} - - - - - - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - org.apache.felix maven-bundle-plugin -- 2.36.6