Code Review
/
netconf.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove jsr173-ri from dependencies
[netconf.git]
/
restconf
/
restconf-nb-bierman02
/
pom.xml
diff --git
a/restconf/restconf-nb-bierman02/pom.xml
b/restconf/restconf-nb-bierman02/pom.xml
index aa361efa5bdd235b401e850728c5d04a19884c85..0502261c826887eefe99c6e9127eb366fb7173d5 100644
(file)
--- a/
restconf/restconf-nb-bierman02/pom.xml
+++ b/
restconf/restconf-nb-bierman02/pom.xml
@@
-11,13
+11,13
@@
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>restconf-parent</artifactId>
<parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>restconf-parent</artifactId>
- <version>1.9.
0
-SNAPSHOT</version>
+ <version>1.9.
3
-SNAPSHOT</version>
<relativePath>../restconf-parent</relativePath>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>restconf-nb-bierman02</artifactId>
<relativePath>../restconf-parent</relativePath>
</parent>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>restconf-nb-bierman02</artifactId>
- <version>1.9.
0
-SNAPSHOT</version>
+ <version>1.9.
3
-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<packaging>bundle</packaging>
<dependencies>
@@
-114,9
+114,20
@@
<groupId>org.opendaylight.netconf</groupId>
<artifactId>ietf-restconf</artifactId>
</dependency>
<groupId>org.opendaylight.netconf</groupId>
<artifactId>ietf-restconf</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.netconf</groupId>
+ <artifactId>netconf-util</artifactId>
+ </dependency>
<dependency>
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
<dependency>
<groupId>net.java.dev.stax-utils</groupId>
<artifactId>stax-utils</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- JSR173 ships with JRE by default -->
+ <groupId>com.bea.xml</groupId>
+ <artifactId>jsr173-ri</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.json</groupId>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@
-145,12
+156,6
@@
</dependency>
<!-- Testing Dependencies -->
</dependency>
<!-- Testing Dependencies -->
- <!-- FIXME: remove this and fixup the one test which relies on it -->
- <dependency>
- <groupId>com.fasterxml.woodstox</groupId>
- <artifactId>woodstox-core</artifactId>
- <version>5.0.3</version>
- </dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
<artifactId>jersey-test-framework-provider-grizzly2</artifactId>