Code Review
/
ccsdk
/
sli
/
plugins.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Resolution for jersey version conflict
[ccsdk/sli/plugins.git]
/
restapi-call-node
/
provider
/
pom.xml
diff --git
a/restapi-call-node/provider/pom.xml
b/restapi-call-node/provider/pom.xml
index
5217854
..
5b34153
100755
(executable)
--- a/
restapi-call-node/provider/pom.xml
+++ b/
restapi-call-node/provider/pom.xml
@@
-49,15
+49,20
@@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.bundles.repackaged</groupId>
+ <artifactId>jersey-guava</artifactId>
+ <version>2.22.2</version>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>oauth1-signature</artifactId>
<dependency>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>oauth1-signature</artifactId>
- <version>${
glassfish
.version}</version>
+ <version>${
jersey
.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>oauth1-client</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.security</groupId>
<artifactId>oauth1-client</artifactId>
- <version>${
glassfish
.version}</version>
+ <version>${
jersey
.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
@@
-66,14
+71,10
@@
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
- <version>${glassfish.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.inject</groupId>
- <artifactId>jersey-hk2</artifactId>
- <version>${glassfish.version}</version>
+ <version>${jersey.version}</version>
</dependency>
</dependency>
+
<!-- For test -->
<dependency>
<groupId>junit</groupId>
<!-- For test -->
<dependency>
<groupId>junit</groupId>