Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 946: Fixed eclipse errors in sal-binding-dom-it
[controller.git]
/
opendaylight
/
commons
/
opendaylight
/
pom.xml
diff --git
a/opendaylight/commons/opendaylight/pom.xml
b/opendaylight/commons/opendaylight/pom.xml
index f30d4b005ad54e0e87d31a102faa8b5961b1513e..0ba356581f640b5bbd7f8cdf42d200367c4c243c 100644
(file)
--- a/
opendaylight/commons/opendaylight/pom.xml
+++ b/
opendaylight/commons/opendaylight/pom.xml
@@
-247,11
+247,6
@@
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency>
<artifactId>jersey-core</artifactId>
<version>${jersey.version}</version>
</dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>${jsr311.api.version}</version>
- </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
@@
-429,6
+424,11
@@
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>${jsr311.api.version}</version>
+ </dependency>
<dependency>
<groupId>orbit</groupId>
<artifactId>javax.activation</artifactId>
<dependency>
<groupId>orbit</groupId>
<artifactId>javax.activation</artifactId>
@@
-1766,6
+1766,7
@@
<phase>generate-sources</phase>
<configuration>
<sources>
<phase>generate-sources</phase>
<configuration>
<sources>
+ <source>src/main/yang</source>
<source>${jmxGeneratorPath}</source>
<source>${salGeneratorPath}</source>
<source>${xtend.dstdir}</source>
<source>${jmxGeneratorPath}</source>
<source>${salGeneratorPath}</source>
<source>${xtend.dstdir}</source>
@@
-1862,7
+1863,7
@@
</goals>
</pluginExecutionFilter>
<action>
</goals>
</pluginExecutionFilter>
<action>
- <
ignore></ignor
e>
+ <
execute></execut
e>
</action>
</pluginExecution>
<pluginExecution>
</action>
</pluginExecution>
<pluginExecution>