Fix the path used to add files into docker image

[aai/gizmo.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 1fc4e33..e35d7d6 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,10 +10,11 @@
     </parent>
     <groupId>org.onap.aai.gizmo</groupId>
     <artifactId>gizmo</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <name>aai-gizmo</name>
 
     <properties>
+        <docker.location>${basedir}/target</docker.location>
         <module.ajsc.namespace.name>crud-api</module.ajsc.namespace.name>
         <module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
         <ajscRuntimeVersion>2.0.0</ajscRuntimeVersion>
@@ -77,31 +78,39 @@
 
         <!-- 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>
           <version>1.1.7</version>
         </dependency>
-
+               <dependency>
+          <groupId>org.onap.aai.event-client</groupId>
+          <artifactId>event-client-dmaap</artifactId>
+          <version>1.2.0</version>
+        </dependency>
         <dependency>
           <groupId>org.onap.aai.aai-common</groupId>
           <artifactId>aai-schema</artifactId>
-          <version>1.1.0-SNAPSHOT</version>
+          <version>1.2.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-utils</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-core</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.2.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -111,9 +120,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</version>
         </dependency>
 
         <dependency>
@@ -122,57 +131,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>
+                       <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.0.1-incubating</version>
-            <exclusions>
-              <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>jcl-over-slf4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-               
-        <!-- TEST Dependencies -->
-               
-               <dependency>
+               <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.0.1-incubating</version>
-            <scope>test</scope>
+            <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>
@@ -207,6 +210,7 @@
     </repositories>
 
     <build>
+      <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -246,7 +250,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>