From: Dan Timoney <dt5972@att.com>
Date: Thu, 27 Sep 2018 17:52:14 +0000 (+0000)
Subject: Merge "Dependency management for Restconf Client"
X-Git-Tag: 0.3.1~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0944a6e54ac4a01035c601c44015634c2533d5fa;hp=-c;p=ccsdk%2Fsli%2Fplugins.git

Merge "Dependency management for Restconf Client"
---

0944a6e54ac4a01035c601c44015634c2533d5fa
diff --combined restapi-call-node/provider/pom.xml
index 84b4131c,942c4f32..035f2fcf
--- a/restapi-call-node/provider/pom.xml
+++ b/restapi-call-node/provider/pom.xml
@@@ -1,16 -1,17 +1,17 @@@
  <?xml version="1.0" encoding="UTF-8"?>
- <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
  
      <parent>
          <groupId>org.onap.ccsdk.parent</groupId>
          <artifactId>binding-parent</artifactId>
 -        <version>1.1.0-SNAPSHOT</version>
 +        <version>1.1.1-SNAPSHOT</version>
      </parent>
  
      <groupId>org.onap.ccsdk.sli.plugins</groupId>
      <artifactId>restapi-call-node-provider</artifactId>
 -    <version>0.3.0-SNAPSHOT</version>
 +    <version>0.3.1-SNAPSHOT</version>
      <packaging>bundle</packaging>
  
      <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
@@@ -21,9 -22,9 +22,9 @@@
  
      <dependencies>
          <dependency>
-             <groupId>junit</groupId>
-             <artifactId>junit</artifactId>
-             <scope>test</scope>
+             <groupId>javax.ws.rs</groupId>
+             <artifactId>javax.ws.rs-api</artifactId>
+             <version>2.1</version>
          </dependency>
          <dependency>
              <groupId>org.onap.ccsdk.sli.core</groupId>
@@@ -38,22 -39,35 +39,35 @@@
              <artifactId>slf4j-api</artifactId>
          </dependency>
          <dependency>
-             <groupId>com.sun.jersey</groupId>
-             <artifactId>jersey-client</artifactId>
+             <groupId>org.glassfish.jersey.security</groupId>
+             <artifactId>oauth1-signature</artifactId>
+             <version>${glassfish.version}</version>
          </dependency>
          <dependency>
-             <groupId>com.sun.jersey.contribs.jersey-oauth</groupId>
-             <artifactId>oauth-signature</artifactId>
-             <version>${jersey.version}</version>
-         </dependency>
-         <dependency>
-             <groupId>com.sun.jersey.contribs.jersey-oauth</groupId>
-             <artifactId>oauth-client</artifactId>
-             <version>${jersey.version}</version>
+             <groupId>org.glassfish.jersey.security</groupId>
+             <artifactId>oauth1-client</artifactId>
+             <version>${glassfish.version}</version>
          </dependency>
          <dependency>
              <groupId>org.codehaus.jettison</groupId>
              <artifactId>jettison</artifactId>
          </dependency>
+         <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>
+         </dependency>
+ 
+         <!-- For test -->
+         <dependency>
+             <groupId>junit</groupId>
+             <artifactId>junit</artifactId>
+             <scope>test</scope>
+         </dependency>
      </dependencies>
  </project>