Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Resolve Bug:448 - Remove yang-store api and impl."
[controller.git]
/
opendaylight
/
md-sal
/
model
/
pom.xml
diff --git
a/opendaylight/md-sal/model/pom.xml
b/opendaylight/md-sal/model/pom.xml
index d31535cb98b27b7e727088fe3ac076a70d32adef..4c8a74c62bf91a7cc30aadd1c3f07d2ce2520561 100644
(file)
--- a/
opendaylight/md-sal/model/pom.xml
+++ b/
opendaylight/md-sal/model/pom.xml
@@
-47,7
+47,6
@@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${yangtools.version}</version>
<executions>
<execution>
<goals>
<executions>
<execution>
<goals>
@@
-61,7
+60,7
@@
org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
</codeGeneratorClass>
<outputBaseDir>
org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl
</codeGeneratorClass>
<outputBaseDir>
- target/generated-sources/sal
+ ${salGeneratorPath}
</outputBaseDir>
</generator>
<generator>
</outputBaseDir>
</generator>
<generator>
@@
-81,13
+80,13
@@
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>maven-sal-api-gen-plugin</artifactId>
- <version>${yang
.codegen
.version}</version>
+ <version>${yang
tools
.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-binding</artifactId>
- <version>${yang
.codegen
.version}</version>
+ <version>${yang
tools
.version}</version>
<type>jar</type>
</dependency>
</dependencies>
<type>jar</type>
</dependency>
</dependencies>