X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=e5686f36f6f73922a83357b50c6b13b7030b3b84;hb=3435321e01b7c997bd92b18c8681a870f9451d6c;hp=d16e93c162b2cb66df1e5ae033c6a714e8624e14;hpb=7e69be504213aa92893fd3354a767128b3a583f1;p=aai%2Fgizmo.git

diff --git a/pom.xml b/pom.xml
index d16e93c..e5686f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
     <groupId>org.onap.aai.gizmo</groupId>
     <artifactId>gizmo</artifactId>
     <version>1.1.0-SNAPSHOT</version>
+    <name>aai-gizmo</name>
 
     <properties>
         <module.ajsc.namespace.name>crud-api</module.ajsc.namespace.name>
@@ -74,77 +75,17 @@
             <version>2.6.2</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.thinkaurelius.titan</groupId>
-            <artifactId>titan-cassandra</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>gremlin-groovy</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>gremlin-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.thinkaurelius.titan</groupId>
-            <artifactId>titan-hbase</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>gremlin-groovy</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.tinkerpop</groupId>
-                    <artifactId>gremlin-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-client</artifactId>
-            <version>1.0.2</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.guava</groupId>
-                    <artifactId>guava</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <!-- Common logging framework -->
         <dependency>
-          <groupId>org.openecomp.aai.logging-service</groupId>
+          <groupId>org.onap.aai.logging-service</groupId>
           <artifactId>common-logging</artifactId>
-          <version>1.0.0</version>
+          <version>1.1.0</version>
         </dependency>
-
+	    <dependency>
+		  <groupId>org.glassfish.jersey.core</groupId>
+		  <artifactId>jersey-client</artifactId>
+		  <version>2.23</version>
+	    </dependency>
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-core</artifactId>
@@ -156,7 +97,11 @@
           <artifactId>aai-schema</artifactId>
           <version>1.1.0-SNAPSHOT</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.onap.aai.aai-common</groupId>
+            <artifactId>aai-utils</artifactId>
+            <version>1.1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-core</artifactId>
@@ -170,9 +115,9 @@
         </dependency>
 
         <dependency>
-          <groupId>org.onap.aai.aai-common</groupId>
-          <artifactId>aai-auth</artifactId>
-          <version>1.1.0-SNAPSHOT</version>
+	     <groupId>org.onap.aai.aai-common</groupId>
+	     <artifactId>aai-auth</artifactId>
+	     <version>1.2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -181,40 +126,51 @@
             <version>2.6.2</version>
         </dependency>
 
-        <!-- Champ graph database library. -->
         <dependency>
-            <groupId>org.openecomp.aai</groupId>
-            <artifactId>champ</artifactId> 
-            <version>1.1.0-SNAPSHOT</version>
-            <scope>compile</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.hbase</groupId>
-                    <artifactId>hbase-client</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.onap.aai</groupId>
+            <artifactId>rest-client</artifactId>
+            <version>1.1.0</version>
         </dependency>
-
-        <!-- Since for some reason the Champ library marks this artifact as an
-            'optional' dependency, we don't get it as a transitive dependency, even though
-            we are guaranteed No-Clas-Def errors if we don't have it on the class path,
-            so... we need to explicitly include it ourselves... -->
-        <dependency>
-            <groupId>com.thinkaurelius.titan</groupId>
-            <artifactId>titan-cassandra</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-              <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-            </exclusions>
+		        <dependency>
+            <groupId>net.dongliu</groupId>
+            <artifactId>gson-java8-datatype</artifactId>
+            <version>1.0.3</version>
+        </dependency>
+	<dependency>
+            <groupId>com.jayway.jsonpath</groupId>
+            <artifactId>json-path</artifactId>
+            <version>2.2.0</version>
+        </dependency>
+		
+		<!-- AAI-CORE specific dependencies -->
+		<dependency>
+        	<groupId>org.apache.tinkerpop</groupId>
+        	<artifactId>gremlin-core</artifactId> 
+	        <version>3.2.3</version>
+	        <scope>provided</scope>
+	        <exclusions>
+	            <exclusion>
+	                <groupId>org.slf4j</groupId>
+	                <artifactId>slf4j-log4j12</artifactId>
+	            </exclusion>
+	            <exclusion>
+	                <groupId>org.slf4j</groupId>
+	                <artifactId>jcl-over-slf4j</artifactId>
+	            </exclusion>
+	        </exclusions>
+     </dependency>
+
+       <dependency>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>tinkergraph-gremlin</artifactId>
+            <version>3.2.3</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20131018</version>
+            <version>20160212</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -249,6 +205,7 @@
     </repositories>
 
     <build>
+      <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -288,7 +245,7 @@
               <configuration>
                 <verbose>true</verbose>
                 <serverId>docker-hub</serverId>
-                <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>
+                <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
                 <dockerDirectory>${docker.location}</dockerDirectory>
                 <imageTags>
                   <imageTag>latest</imageTag>