Merge "Catch IllegalArgumentException for error message"

[aai/champ.git] / champ-service / pom.xml

diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index c5c90f4..b0dbf46 100644 (file)
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--
+============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">
@@ -13,6 +32,7 @@
     <groupId>org.onap.aai</groupId>
     <artifactId>champ-service</artifactId>
     <version>1.2.0-SNAPSHOT</version>
+    <name>champ</name>
 
     <properties>
         <runAjscHome>${basedir}/target/swm/package/nix/dist_files${distFilesRoot}</runAjscHome>
@@ -30,6 +50,9 @@
         <common.logging.groupid>org.onap.aai.logging-service</common.logging.groupid>
         <common.logging.version>1.2.2</common.logging.version>
         <org.apache.httpcomponents.httpclient.version>4.5.2</org.apache.httpcomponents.httpclient.version>
+
+        <docker.location>${basedir}/target</docker.location>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
     </properties>
 
     <dependencies>
@@ -39,13 +62,13 @@
             <version>1.18.6</version>
         </dependency>
 
-        <!-- AJSC Dependencies -->
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <version>1.6.1</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>com.att.aft</groupId>
             <artifactId>dme2</artifactId>
@@ -53,7 +76,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!--Adding this dependency explicit.-->
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
@@ -102,7 +124,6 @@
             <version>${org.apache.httpcomponents.httpclient.version}</version>
         </dependency>
 
-        <!-- Champ graph database library. -->
         <dependency>
             <groupId>org.onap.aai</groupId>
             <artifactId>champ-core</artifactId>
@@ -117,6 +138,19 @@
         </dependency>
     </dependencies>
 
+    <distributionManagement>
+        <repository>
+            <id>ecomp-releases</id>
+            <name>ECOMP Release Repository</name>
+            <url>${onap.nexus.url}/content/repositories/releases/</url>
+        </repository>
+        <snapshotRepository>
+            <id>ecomp-snapshots</id>
+            <name>ECOMP Snapshot Repository</name>
+            <url>${onap.nexus.url}/content/repositories/snapshots/</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
@@ -145,12 +179,25 @@
                                 <resource>
                                     <directory>${basedir}/src/main/bin/</directory>
                                 </resource>
+                                <resource>
+                                    <directory>../champ-service-deps-janus/target/</directory>
+                                </resource>
+                                <resource>
+                                    <directory>../champ-service-deps-titan/target/</directory>
+                                </resource>
                             </resources>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <!--
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -170,7 +217,7 @@
                     </execution>
                 </executions>
             </plugin>
-
+            -->
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
@@ -178,7 +225,7 @@
                 <configuration>
                     <verbose>true</verbose>
                     <serverId>docker-hub</serverId>
-                    <imageName>${docker.push.registry}/onap/${project.artifactId}</imageName>
+                    <imageName>${docker.push.registry}/onap/${project.name}</imageName>
                     <dockerDirectory>${docker.location}</dockerDirectory>
                     <imageTags>
                         <imageTag>latest</imageTag>
@@ -186,7 +233,6 @@
                     <forceTags>true</forceTags>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>