Support maven deploy and docker build targets

This commit principally includes the following pom updates:
1. Add distributionManagement to fix jobs that run maven deploy.
2. Update way in which champ-service gets the graph-deps. This
change specifically supports the docker build.

Issue-ID: AAI-927

Change-Id: I5920de3c010b810a802f95ac82da89ea3989e7d9
Signed-off-by: MichaelArrastia <MArrasti@amdocs.com>

diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml
index 32e716e..e6dd2f3 100644 (file)
--- a/champ-lib/pom.xml
+++ b/champ-lib/pom.xml
@@ -27,6 +27,12 @@ limitations under the License.
     <packaging>pom</packaging>
     <version>1.2.0-SNAPSHOT</version>
 
+    <parent>
+        <groupId>org.onap.aai</groupId>
+        <artifactId>champ</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+    </parent>
+
     <modules>
         <module>champ-core</module>
         <module>champ-titan</module>

diff --git a/champ-service-deps-janus/pom.xml b/champ-service-deps-janus/pom.xml
index b8cbfb4..fcf019a 100644 (file)
--- a/champ-service-deps-janus/pom.xml
+++ b/champ-service-deps-janus/pom.xml
@@ -27,6 +27,12 @@ limitations under the License.
     <packaging>pom</packaging>
     <version>1.2.0-SNAPSHOT</version>
 
+    <parent>
+        <groupId>org.onap.aai</groupId>
+        <artifactId>champ</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.onap.aai</groupId>
@@ -97,7 +103,7 @@ limitations under the License.
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>../champ-service/target/graph-deps/janus-deps</outputDirectory>
+                            <outputDirectory>target/graph-deps/janus-deps</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>

diff --git a/champ-service-deps-titan/pom.xml b/champ-service-deps-titan/pom.xml
index e434618..d1046ed 100644 (file)
--- a/champ-service-deps-titan/pom.xml
+++ b/champ-service-deps-titan/pom.xml
@@ -26,7 +26,13 @@ limitations under the License.
     <artifactId>champ-service-deps-titan</artifactId>
     <packaging>pom</packaging>
     <version>1.2.0-SNAPSHOT</version>
-    
+
+    <parent>
+        <groupId>org.onap.aai</groupId>
+        <artifactId>champ</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
+    </parent>
+
     <dependencies>
         <dependency>
             <groupId>org.onap.aai</groupId>
@@ -95,7 +101,7 @@ limitations under the License.
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>../champ-service/target/graph-deps/titan-deps</outputDirectory>
+                            <outputDirectory>target/graph-deps/titan-deps</outputDirectory>
                             <overWriteReleases>false</overWriteReleases>
                             <overWriteSnapshots>false</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>

diff --git a/champ-service/pom.xml b/champ-service/pom.xml
index 57234c0..1717648 100644 (file)
--- a/champ-service/pom.xml
+++ b/champ-service/pom.xml
@@ -49,6 +49,9 @@ limitations under the License.
         <common.logging.groupid>org.onap.aai.logging-service</common.logging.groupid>
         <common.logging.version>1.2.0</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>
@@ -136,6 +139,19 @@ limitations under the License.
         </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>
@@ -164,6 +180,12 @@ limitations under the License.
                                 <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>

diff --git a/pom.xml b/pom.xml
index 27cb7f3..8b05b02 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -28,11 +28,28 @@ limitations under the License.
     <packaging>pom</packaging>
     <version>1.2.0-SNAPSHOT</version>
 
+    <properties>
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
+    </properties>
+
     <modules>
         <module>champ-lib</module>
-        <module>champ-service</module>
         <module>champ-service-deps-janus</module>
         <module>champ-service-deps-titan</module>
+        <module>champ-service</module>
     </modules>
 
+    <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>
+
 </project>
\ No newline at end of file