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 "Minor fixes in md-sal and config."
[controller.git]
/
opendaylight
/
config
/
yang-test
/
pom.xml
diff --git
a/opendaylight/config/yang-test/pom.xml
b/opendaylight/config/yang-test/pom.xml
index b1f7013abef241620ff02d393751133270e78bcb..10d62edfc1f0b3cc3888410f00119a964ae8a356 100644
(file)
--- a/
opendaylight/config/yang-test/pom.xml
+++ b/
opendaylight/config/yang-test/pom.xml
@@
-12,6
+12,7
@@
</parent>
<artifactId>yang-test</artifactId>
</parent>
<artifactId>yang-test</artifactId>
+ <packaging>bundle</packaging>
<description>Artifact that contains only generated code from yang files. Suitable for testing.
</description>
<description>Artifact that contains only generated code from yang files. Suitable for testing.
</description>
@@
-34,9
+35,8
@@
<artifactId>ietf-inet-types</artifactId>
</dependency>
<dependency>
<artifactId>ietf-inet-types</artifactId>
</dependency>
<dependency>
- <groupId>org.opendaylight.
bgpcep
</groupId>
+ <groupId>org.opendaylight.
yangtools
</groupId>
<artifactId>mockito-configuration</artifactId>
<artifactId>mockito-configuration</artifactId>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@
-66,7
+66,7
@@
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
<plugin>
<groupId>org.opendaylight.yangtools</groupId>
<artifactId>yang-maven-plugin</artifactId>
- <version>${
opendaylight.yang
.version}</version>
+ <version>${
yangtools
.version}</version>
<executions>
<execution>
<id>config</id>
<executions>
<execution>
<id>config</id>
@@
-105,7
+105,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
+
${project.build.directory}
/generated-sources/sal
</outputBaseDir>
</generator>
</codeGenerators>
</outputBaseDir>
</generator>
</codeGenerators>
@@
-123,7
+123,7
@@
<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>${yangtools.
binding.
version}</version>
+ <version>${yangtools.version}</version>
</dependency>
</dependencies>
</plugin>
</dependency>
</dependencies>
</plugin>
@@
-140,6
+140,15
@@
</execution>
</executions>
</plugin>
</execution>
</executions>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
</plugins>
</build>
</project>