From 33d5543883d1d286b08cbe6751f5070317d68131 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Fri, 26 Jan 2018 13:16:28 -0500 Subject: [PATCH] POM cleanup - derived l2switch-parent from binding-parent to paick up yangtools definitions. - removed yangtools.version and other properties no longer needed in l2switch-parent pom. - removed unnecesrary yang-maven-plugin definitions. Change-Id: I0a0b07f72e5a53fc09f411d32af8af6ceeade6a4 Signed-off-by: Tom Pantelis --- addresstracker/implementation/pom.xml | 31 ------- addresstracker/model/pom.xml | 65 -------------- arphandler/pom.xml | 31 ------- hosttracker/implementation/pom.xml | 31 ------- hosttracker/model/pom.xml | 60 ------------- l2switch-main/pom.xml | 31 ------- loopremover/implementation/pom.xml | 31 ------- loopremover/model/pom.xml | 65 -------------- packethandler/implementation/pom.xml | 31 ------- packethandler/model/pom.xml | 65 -------------- parent/pom.xml | 123 ++------------------------ 11 files changed, 8 insertions(+), 556 deletions(-) diff --git a/addresstracker/implementation/pom.xml b/addresstracker/implementation/pom.xml index 5a43d7a8..a871c211 100644 --- a/addresstracker/implementation/pom.xml +++ b/addresstracker/implementation/pom.xml @@ -64,37 +64,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${codeGeneratorPath} - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/addresstracker/model/pom.xml b/addresstracker/model/pom.xml index 6428e47f..5a46bb2d 100644 --- a/addresstracker/model/pom.xml +++ b/addresstracker/model/pom.xml @@ -43,71 +43,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - 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 - ${codeGeneratorPath} - - - 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 - - - - - - - - maven-clean-plugin - - - - ${codeGeneratorPath} - - ** - - - - ${codeGeneratorPath} - - ** - - - - - diff --git a/arphandler/pom.xml b/arphandler/pom.xml index 54ebc642..aa2c16c5 100644 --- a/arphandler/pom.xml +++ b/arphandler/pom.xml @@ -76,37 +76,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${codeGeneratorPath} - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/hosttracker/implementation/pom.xml b/hosttracker/implementation/pom.xml index 6d5602c0..6070c517 100644 --- a/hosttracker/implementation/pom.xml +++ b/hosttracker/implementation/pom.xml @@ -24,37 +24,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${codeGeneratorPath} - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/hosttracker/model/pom.xml b/hosttracker/model/pom.xml index 795689a8..d30b0749 100644 --- a/hosttracker/model/pom.xml +++ b/hosttracker/model/pom.xml @@ -34,67 +34,7 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - - generate-sources - - - src/main/yang - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - ${codeGeneratorPath} - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.opendaylight.yangtools - yang-maven-plugin - [${yangtools.version},) - - generate-sources - - - - - - - - - - - - hosttracker-model diff --git a/l2switch-main/pom.xml b/l2switch-main/pom.xml index a899ccf9..48dc2c74 100644 --- a/l2switch-main/pom.xml +++ b/l2switch-main/pom.xml @@ -77,37 +77,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${codeGeneratorPath} - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/loopremover/implementation/pom.xml b/loopremover/implementation/pom.xml index 8ab60e80..fb4eb241 100644 --- a/loopremover/implementation/pom.xml +++ b/loopremover/implementation/pom.xml @@ -81,37 +81,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${codeGeneratorPath} - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/loopremover/model/pom.xml b/loopremover/model/pom.xml index 2cac7396..f5cea781 100644 --- a/loopremover/model/pom.xml +++ b/loopremover/model/pom.xml @@ -39,71 +39,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - 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 - ${codeGeneratorPath} - - - 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 - - - - - - - - maven-clean-plugin - - - - ${codeGeneratorPath} - - ** - - - - ${codeGeneratorPath} - - ** - - - - - diff --git a/packethandler/implementation/pom.xml b/packethandler/implementation/pom.xml index 47d32055..92978ea6 100644 --- a/packethandler/implementation/pom.xml +++ b/packethandler/implementation/pom.xml @@ -53,37 +53,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - - generate-sources - - - - - - org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl - - ${codeGeneratorPath} - - - true - - - - - - org.opendaylight.mdsal - maven-sal-api-gen-plugin - ${mdsal.model.version} - jar - - - diff --git a/packethandler/model/pom.xml b/packethandler/model/pom.xml index 65f16bed..b6212e1a 100644 --- a/packethandler/model/pom.xml +++ b/packethandler/model/pom.xml @@ -35,71 +35,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - ${yangtools.version} - - - 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 - ${codeGeneratorPath} - - - 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 - - - - - - - - maven-clean-plugin - - - - ${codeGeneratorPath} - - ** - - - - ${codeGeneratorPath} - - ** - - - - - diff --git a/parent/pom.xml b/parent/pom.xml index ea805b9d..2be99ba4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -3,9 +3,9 @@ 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.odlparent - odlparent - 3.0.2 + org.opendaylight.mdsal + binding-parent + 0.12.0-SNAPSHOT org.opendaylight.l2switch @@ -14,45 +14,16 @@ pom - src/main/yang-gen-code - src/main/yang-gen-config - 1.6.0-SNAPSHOT - 2.4.0-SNAPSHOT - 0.12.0-SNAPSHOT - 1.7.0-SNAPSHOT 2.0.1 - 2.0.1 0.6.0-SNAPSHOT - 0.7.0-SNAPSHOT - - org.opendaylight.yangtools - yangtools-artifacts - ${yangtools.version} - import - pom - - - org.opendaylight.mdsal - mdsal-artifacts - ${mdsal.version} - import - pom - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - ${mdsal.model.version} - import - pom - org.opendaylight.controller mdsal-artifacts - ${controller.mdsal.version} + 1.7.0-SNAPSHOT import pom @@ -119,75 +90,6 @@ - - org.apache.maven.plugins - maven-checkstyle-plugin - - true - checkstyle-logging.xml - true - true - ${project.basedir} - **\/*.java,**\/*.yang,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat - **\/target\/,**\/bin\/,**\/target-ide\/,**\/xtend-gen\/,**\/${codeGeneratorPath}\/,**\/${configCodeGeneratorPath}\/, - - - - org.opendaylight.yangtools - checkstyle-logging - ${yangtools.version} - - - - - check - - check - - process-sources - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - - - add-source - - add-source - - generate-sources - - - src/main/yang - ${codeGeneratorPath} - ${configCodeGeneratorPath} - - - - - - - - maven-clean-plugin - - - - ${codeGeneratorPath} - ${configCodeGeneratorPath} - - ** - - - - - - org.eclipse.m2e @@ -239,19 +141,6 @@ - - - org.apache.maven.plugins - maven-checkstyle-plugin - [2.0,) - - check - - - - - - org.opendaylight.yangtools @@ -305,6 +194,10 @@ org.apache.maven.plugins maven-checkstyle-plugin + + checkstyle.violationSeverity=warning + + -- 2.36.6