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 "Optimization - calculate the subnet prefix only once."
[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 2f3b7a036c6113b23d8020dd207c30ce490e6ab6..f803180e892b6329f2dfd465212ba778e9efad68 100644
(file)
--- a/
opendaylight/md-sal/model/pom.xml
+++ b/
opendaylight/md-sal/model/pom.xml
@@
-19,7
+19,7
@@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <bundle.plugin.version>2.
3.7
</bundle.plugin.version>
+ <bundle.plugin.version>2.
4.0
</bundle.plugin.version>
</properties>
<modules>
</properties>
<modules>
@@
-40,14
+40,14
@@
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
<configuration>
<instructions>
<Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
- <Import-Package>
*,org.opendaylight.yangtools.yang.binding.annotations
</Import-Package>
+ <Import-Package>
org.opendaylight.yangtools.yang.binding.annotations, *
</Import-Package>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
</instructions>
</configuration>
</plugin>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${yang.version}</version>
+ <version>${yang
tools
.version}</version>
<executions>
<execution>
<goals>
<executions>
<execution>
<goals>
@@
-66,7
+66,11
@@
</generator>
<generator>
<codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
</generator>
<generator>
<codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
- <outputBaseDir>target/site/restconf</outputBaseDir>
+ <outputBaseDir>target/site/models</outputBaseDir>
+ </generator>
+ <generator>
+ <codeGeneratorClass>org.opendaylight.yangtools.yang.wadl.generator.maven.WadlGenerator</codeGeneratorClass>
+ <outputBaseDir>target/site/models</outputBaseDir>
</generator>
</codeGenerators>
<inspectDependencies>true</inspectDependencies>
</generator>
</codeGenerators>
<inspectDependencies>true</inspectDependencies>
@@
-131,7
+135,7
@@
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>yang-ext</artifactId>
<dependency>
<groupId>org.opendaylight.yangtools.model</groupId>
<artifactId>yang-ext</artifactId>
- <version>2013.09.07.
1
-SNAPSHOT</version>
+ <version>2013.09.07.
2
-SNAPSHOT</version>
</dependency>
</dependencies>
</dependency>
</dependencies>