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 "Fix end of TLV in LLDP packet"
[controller.git]
/
opendaylight
/
archetypes
/
odl-model-project
/
src
/
main
/
resources
/
archetype-resources
/
pom.xml
diff --git
a/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
b/opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
index 1f9bc7477ef395c5ffba0923f11425f9d2ed96b2..ebb9302b78487282f2e40c802429161809ea6c4b 100644
(file)
--- a/
opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
+++ b/
opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
@@
-9,8
+9,8
@@
<properties>
\r
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
\r
<nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
\r
<properties>
\r
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
\r
<nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
\r
- <yang.version>0.
5.9
-SNAPSHOT</yang.version>
\r
- <yang.codegen.version>0.6.
0
-SNAPSHOT</yang.codegen.version>
\r
+ <yang.version>0.
6.2
-SNAPSHOT</yang.version>
\r
+ <yang.codegen.version>0.6.
2
-SNAPSHOT</yang.codegen.version>
\r
<bundle.plugin.version>2.3.7</bundle.plugin.version>
\r
</properties>
\r
<scm>
\r
<bundle.plugin.version>2.3.7</bundle.plugin.version>
\r
</properties>
\r
<scm>
\r
@@
-217,12
+217,7
@@
<dependency>
\r
<groupId>org.opendaylight.yangtools</groupId>
\r
<artifactId>yang-binding</artifactId>
\r
<dependency>
\r
<groupId>org.opendaylight.yangtools</groupId>
\r
<artifactId>yang-binding</artifactId>
\r
- <version>${yang.version}</version>
\r
- </dependency>
\r
- <dependency>
\r
- <groupId>org.opendaylight.yangtools</groupId>
\r
- <artifactId>yang-common</artifactId>
\r
- <version>${yang.version}</version>
\r
+ <version>${yang.codegen.version}</version>
\r
</dependency>
\r
</dependencies>
\r
</project>
\r
</dependency>
\r
</dependencies>
\r
</project>
\r