Setting Repositories back to pom.xml 03/32303/1
authorThomas Nelson Jr (arthurdent3) <tn1381@att.com>
Tue, 20 Feb 2018 19:42:28 +0000 (14:42 -0500)
committerThomas Nelson Jr (arthurdent3) <tn1381@att.com>
Tue, 20 Feb 2018 19:42:28 +0000 (14:42 -0500)
Looks like somehow the oParent and the Repository info got removed.
Adding them back. This should hopefully correct the issues with docker build.

Issue-ID: MUSIC-32

Change-Id: I3b45a9a7602d8bf8c8f252af31783e7fc8838359
Signed-off-by: Thomas Nelson Jr (arthurdent3) <tn1381@att.com>
pom.xml

diff --git a/pom.xml b/pom.xml
index d52f079..7a0561b 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
     <artifactId>MUSIC</artifactId>
     <packaging>war</packaging>
     <version>2.4.4</version>
-    <description>
+       <description>
             This is the MUSIC REST interface, packaged as a war file.
           </description>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jersey1.version>1.9</jersey1.version>
-        <jersey2.version>2.26</jersey2.version>
-        <jaxrs.version>2.0.1</jaxrs.version>
-        <cassandra.version>3.0.0</cassandra.version>
-        <zookeeper.version>3.4.6</zookeeper.version>
 
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+       <parent>
+               <groupId>org.onap.oparent</groupId>
+               <artifactId>oparent</artifactId>
+               <version>0.1.1</version>
+               <relativePath />
+       </parent>
 
-        <!--nexus-->
-        <sitePath>/content/sites/site/org/onap/music/${project.artifactId}/${project.version}</sitePath>
-        <!--maven-->
-        <timestamp>${maven.build.timestamp}</timestamp>
-        <maven.build.timestamp.format>yyyy.MM.dd.HH.mm</maven.build.timestamp.format>
-        <!--docker -->
-        <docker.tag>${project.version}-${timestamp}</docker.tag>
-        <docker.latest.tag>${project.version}-latest</docker.latest.tag>
-    </properties>
+       <properties>
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <jersey1.version>1.9</jersey1.version>
+               <jersey2.version>2.26</jersey2.version>
+               <jaxrs.version>2.0.1</jaxrs.version>
+               <cassandra.version>3.0.0</cassandra.version>
+               <zookeeper.version>3.4.6</zookeeper.version>
+
+               <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+               <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <!--nexus -->
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
+               <snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
+               <releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
+               <stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
+               <sitePath>/content/sites/site/org/onap/music/${project.version}</sitePath>
+               <!--maven -->
+               <timestamp>${maven.build.timestamp}</timestamp>
+               <maven.build.timestamp.format>yyyy.MM.dd.HH.mm</maven.build.timestamp.format>
+               <!--docker -->
+               <docker.tag>${project.version}-${timestamp}</docker.tag>
+               <docker.latest.tag>${project.version}-latest</docker.latest.tag>
+       </properties>
+
+       <repositories>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>ECOMP Release Repository</name>
+                       <url>${onap.nexus.url}/${releaseNexusPath}</url>
+               </repository>
+               <repository>
+                       <id>ecomp-snapshots</id>
+                       <name>Snapshot Repository</name>
+                       <url>${nexusproxy}/${snapshotNexusPath}</url>
+               </repository>
+               <repository>
+                       <id>ecomp-staging</id>
+                       <name>Staging Repository</name>
+                       <url>${nexusproxy}/${stagingNexusPath}</url>
+               </repository>
+       </repositories>
 
-    <repositories>
-        <repository>
-            <id>maven2-repository.java.net</id>
-            <name>Java.net Repository for Maven</name>
-            <url>http://download.java.net/maven/2/</url>
-            <layout>default</layout>
-        </repository>
-    </repositories>
     <build>
         <finalName>MUSIC</finalName>
         <sourceDirectory>src/main/java</sourceDirectory>
                                                        </execution>
                                                </executions>
                                        </plugin>
-                               </plugins>
-                               
+                               </plugins>      
                        </build>
                </profile>
        </profiles>
        <distributionManagement>
+               <repository>
+                       <id>ecomp-releases</id>
+                       <name>Release Repository</name>
+                       <url>${nexusproxy}/${releaseNexusPath}</url>
+               </repository>
+               <snapshotRepository>
+                       <id>ecomp-snapshots</id>
+                       <name>Snapshot Repository</name>
+                       <url>${nexusproxy}/${snapshotNexusPath}</url>
+               </snapshotRepository>
+               <!-- added for javadoc -->
                <site>
                        <id>ecomp-site</id>
-                       <url>dav:${onap.nexus.url}${sitePath}</url>
+                       <url>dav:${nexusproxy}${sitePath}</url>
                </site>
        </distributionManagement>
-
 </project>