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

diff --git a/pom.xml b/pom.xml
index d16e93c..9fe273b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,24 @@
+<!--
+============LICENSE_START=======================================================
+org.onap.aai
+================================================================================
+Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017-2018 Amdocs
+================================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
+-->
+
 <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">
@@ -8,11 +29,14 @@
         <groupId>com.att.ajsc</groupId>
         <version>2.0.0</version>
     </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>
@@ -45,10 +69,10 @@
         </sonar.jacoco.reportPath>
         <sonar.jacoco.reportMissing.force.zero>false</sonar.jacoco.reportMissing.force.zero>
         <sonar.projectVersion>${project.version}</sonar.projectVersion>
+        <version.org.hamcrest.hamcrest-library>1.3</version.org.hamcrest.hamcrest-library>
     </properties>
 
     <dependencies>
-
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
@@ -60,8 +84,8 @@
             <groupId>com.att.aft</groupId>
             <artifactId>dme2</artifactId>
             <version>3.1.200</version>
-            <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -74,93 +98,41 @@
             <version>2.6.2</version>
         </dependency>
 
+        <!-- Common logging framework -->
         <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>
+            <groupId>org.onap.aai.logging-service</groupId>
+            <artifactId>common-logging</artifactId>
+            <version>1.2.2</version>
         </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>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+            <version>2.23</version>
         </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>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+            <version>1.1.7</version>
         </dependency>
-
-        <!-- Common logging framework -->
         <dependency>
-          <groupId>org.openecomp.aai.logging-service</groupId>
-          <artifactId>common-logging</artifactId>
-          <version>1.0.0</version>
+            <groupId>org.onap.aai.event-client</groupId>
+            <artifactId>event-client-dmaap</artifactId>
+            <version>1.2.1</version>
         </dependency>
-
         <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-          <version>1.1.7</version>
+            <groupId>org.onap.aai.aai-common</groupId>
+            <artifactId>aai-schema</artifactId>
+            <version>1.2.1</version>
         </dependency>
-
         <dependency>
-          <groupId>org.onap.aai.aai-common</groupId>
-          <artifactId>aai-schema</artifactId>
-          <version>1.1.0-SNAPSHOT</version>
+            <groupId>org.onap.aai.aai-common</groupId>
+            <artifactId>aai-utils</artifactId>
+            <version>1.2.1</version>
         </dependency>
-
         <dependency>
             <groupId>org.onap.aai.aai-common</groupId>
             <artifactId>aai-core</artifactId>
-            <version>1.1.0-SNAPSHOT</version>
+            <version>1.2.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -170,85 +142,108 @@
         </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.1</version>
         </dependency>
 
         <dependency>
-          <groupId>org.eclipse.persistence</groupId>
+            <groupId>org.eclipse.persistence</groupId>
             <artifactId>eclipselink</artifactId>
             <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.2.1</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>
 
-        <!-- 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... -->
+        <!-- AAI-CORE specific dependencies -->
         <dependency>
-            <groupId>com.thinkaurelius.titan</groupId>
-            <artifactId>titan-cassandra</artifactId>
-            <version>1.0.0</version>
+            <groupId>org.apache.tinkerpop</groupId>
+            <artifactId>gremlin-core</artifactId>
+            <version>3.2.3</version>
+            <scope>provided</scope>
             <exclusions>
-              <exclusion>
+                <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>
             <artifactId>junit</artifactId>
         </dependency>
 
-    </dependencies>
+        <dependency>
+            <groupId>org.skyscreamer</groupId>
+            <artifactId>jsonassert</artifactId>
+            <version>1.5.0</version>
+            <scope>test</scope>
+        </dependency>
 
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-library</artifactId>
+            <version>${version.org.hamcrest.hamcrest-library}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
     <repositories>
-      <repository>
-        <id>central</id>
-        <name>Maven 2 repository 2</name>
-        <url>http://repo2.maven.org/maven2/</url>
-      </repository>
-      <repository>
-        <id>ecomp-releases</id>
-        <name>ECOMP Release Repository</name>
-        <url>${nexusproxy}/content/repositories/releases/</url>
-      </repository>
-      <repository>
-        <id>ecomp-snapshots</id>
-        <name>ECOMP Snapshot Repository</name>
-        <url>${nexusproxy}/content/repositories/snapshots/</url>
-      </repository>
-      <repository>
-        <id>ecomp-staging</id>
-        <name>ECOMP Staging Repository</name>
-        <url>${nexusproxy}/content/repositories/staging/</url>
-      </repository>
-
+        <repository>
+            <id>central</id>
+            <name>Maven 2 repository 2</name>
+            <url>http://repo2.maven.org/maven2/</url>
+        </repository>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>ECOMP Release Repository</name>
+            <url>${nexusproxy}/content/repositories/releases/</url>
+        </repository>
+        <repository>
+            <id>ecomp-snapshots</id>
+            <name>ECOMP Snapshot Repository</name>
+            <url>${nexusproxy}/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>ecomp-staging</id>
+            <name>ECOMP Staging Repository</name>
+            <url>${nexusproxy}/content/repositories/staging/</url>
+        </repository>
     </repositories>
 
     <build>
+        <finalName>${project.artifactId}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -273,7 +268,7 @@
                                     </includes>
                                 </resource>
                                 <resource>
-                                  <directory>${basedir}/src/main/bin/</directory>
+                                    <directory>${basedir}/src/main/bin/</directory>
                                 </resource>
                             </resources>
                         </configuration>
@@ -282,22 +277,23 @@
             </plugin>
 
             <plugin>
-              <groupId>com.spotify</groupId>
-              <artifactId>docker-maven-plugin</artifactId>
-              <version>0.4.11</version>
-              <configuration>
-                <verbose>true</verbose>
-                <serverId>docker-hub</serverId>
-                <imageName>${docker.push.registry}/openecomp/${project.artifactId}</imageName>
-                <dockerDirectory>${docker.location}</dockerDirectory>
-                <imageTags>
-                  <imageTag>latest</imageTag>
-                </imageTags>
-                <forceTags>true</forceTags>
-              </configuration>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.4.11</version>
+                <configuration>
+                    <verbose>true</verbose>
+                    <serverId>docker-hub</serverId>
+                    <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
+                    <dockerDirectory>${docker.location}</dockerDirectory>
+                    <imageTags>
+                        <imageTag>latest</imageTag>
+                    </imageTags>
+                    <forceTags>true</forceTags>
+                </configuration>
             </plugin>
 
             <!-- license plugin -->
+            <!-- Uncomment this to add a license header to every source file
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -306,6 +302,7 @@
                     <header>License.txt</header>
                     <includes>
                         <include>src/main/java/**</include>
+                        <include>src/test/java/**</include>
                     </includes>
                 </configuration>
                 <executions>
@@ -317,6 +314,7 @@
                     </execution>
                 </executions>
             </plugin>
+            -->
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -331,7 +329,7 @@
                             <reportSets>
                                 <reportSet>
                                     <reports>
-                                      <report>checkstyle</report>
+                                        <report>checkstyle</report>
                                     </reports>
                                 </reportSet>
                             </reportSets>
@@ -341,39 +339,39 @@
             </plugin>
 
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-deploy-plugin</artifactId>
-              <configuration>
-                <skip>true</skip>
-              </configuration>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
             </plugin>
 
             <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>sonar-maven-plugin</artifactId>
-              <version>3.2</version>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>sonar-maven-plugin</artifactId>
+                <version>3.2</version>
             </plugin>
 
             <plugin>
-              <groupId>org.jacoco</groupId>
-              <artifactId>jacoco-maven-plugin</artifactId>
-              <version>0.7.7.201606060606</version>
-              <configuration>
-                <dumpOnExit>true</dumpOnExit>
-              </configuration>
-              <executions>
-                <execution>
-                  <id>jacoco-initialize-unit-tests</id>
-                  <goals>
-                    <goal>prepare-agent</goal>
-                  </goals>
-                  <configuration>
-                    <destFile>${project.build.directory}/coverage-reports/jacoco.exec
-                    </destFile>
-                    <!-- <append>true</append> -->
-                  </configuration>
-                </execution>
-              </executions>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.7.7.201606060606</version>
+                <configuration>
+                    <dumpOnExit>true</dumpOnExit>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>jacoco-initialize-unit-tests</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                        <configuration>
+                            <destFile>${project.build.directory}/coverage-reports/jacoco.exec
+                            </destFile>
+                            <!-- <append>true</append> -->
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
@@ -516,19 +514,19 @@
     </dependencyManagement>
 
     <distributionManagement>
-      <repository>
-        <id>ecomp-releases</id>
-        <name>ECOMP Release Repository</name>
-        <url>${nexusproxy}/content/repositories/releases/</url>
-      </repository>
-      <snapshotRepository>
-        <id>ecomp-snapshots</id>
-        <name>ECOMP Snapshot Repository</name>
-        <url>${nexusproxy}/content/repositories/snapshots/</url>
-      </snapshotRepository>
-      <site>
-        <id>ecomp-javadoc</id>
-        <url>dav:https://ecomp-nexus:8443/repository/aai/gizmo-javadoc/${project.version}</url>
-      </site>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>ECOMP Release Repository</name>
+            <url>${nexusproxy}/content/repositories/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>ECOMP Snapshot Repository</name>
+            <url>${nexusproxy}/content/repositories/snapshots/</url>
+        </snapshotRepository>
+        <site>
+            <id>ecomp-javadoc</id>
+            <url>dav:https://ecomp-nexus:8443/repository/aai/gizmo-javadoc/${project.version}</url>
+        </site>
     </distributionManagement>
 </project>