From a59f36b788021376c60cf8f72ac14885563a0380 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 19 Aug 2015 14:29:33 +0200 Subject: [PATCH] Switched model-parent to use binding-parent. model-parent originaly used sal-parent which did not contained sections necessary for model-only packages. Switched to binding-parent, which actually simplifies pom file. Change-Id: I2efea28799dfbd541b2b12468a6aec3472dbb240 Signed-off-by: Tony Tkacik --- .../md-sal/model/model-topology/pom.xml | 1 + opendaylight/md-sal/model/pom.xml | 51 ++----------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/opendaylight/md-sal/model/model-topology/pom.xml b/opendaylight/md-sal/model/model-topology/pom.xml index 73567459aa..0763a04f55 100644 --- a/opendaylight/md-sal/model/model-topology/pom.xml +++ b/opendaylight/md-sal/model/model-topology/pom.xml @@ -15,6 +15,7 @@ org.opendaylight.controller.model model-inventory + ${project.version} org.opendaylight.yangtools.model diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml index 4545dc57e6..df0b87f147 100644 --- a/opendaylight/md-sal/model/pom.xml +++ b/opendaylight/md-sal/model/pom.xml @@ -4,12 +4,14 @@ 4.0.0 - org.opendaylight.controller - sal-parent - 1.3.0-SNAPSHOT + org.opendaylight.yangtools + binding-parent + 0.8.0-SNAPSHOT + org.opendaylight.controller.model model-parent + 1.3.0-SNAPSHOT pom @@ -58,49 +60,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - - - org.opendaylight.yangtools - maven-sal-api-gen-plugin - ${yangtools.version} - jar - - - org.opendaylight.yangtools - yang-binding - ${yangtools.version} - jar - - - - - - generate-sources - - - src/main/yang - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl - target/site/models - - - org.opendaylight.yangtools.yang.wadl.generator.maven.WadlGenerator - target/site/models - - - true - - - - -- 2.36.6