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 "Remove dependency on Exificient due to licensing incompatibility"
[controller.git]
/
opendaylight
/
md-sal
/
test
/
sal-rest-connector-it
/
pom.xml
diff --git
a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
b/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
index 8569783ad79818056eb45303692ec869f57c0671..64ca5aeb9bf584e568246265fa3bbef34a1422c6 100644
(file)
--- a/
opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
+++ b/
opendaylight/md-sal/test/sal-rest-connector-it/pom.xml
@@
-121,11
+121,6
@@
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<version>1.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.controller.thirdparty</groupId>
- <artifactId>exificient</artifactId>
- <version>0.9.2</version>
- </dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-native</artifactId>
@@
-259,7
+254,7
@@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.
8
</version>
+ <version>1.
7
</version>
</dependency>
<dependency>
<groupId>equinoxSDK381</groupId>
</dependency>
<dependency>
<groupId>equinoxSDK381</groupId>
@@
-622,11
+617,7
@@
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey.version}</version>
- </dependency>
+
<dependency>
<groupId>eclipselink</groupId>
<artifactId>javax.resource</artifactId>
<dependency>
<groupId>eclipselink</groupId>
<artifactId>javax.resource</artifactId>