From dffae1c7c5cd1f50e2456948942cd7716837a7f2 Mon Sep 17 00:00:00 2001 From: "Thomas Nelson Jr (arthurdent3)" Date: Tue, 20 Feb 2018 14:42:28 -0500 Subject: Setting Repositories back to pom.xml 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) --- pom.xml | 91 +++++++++++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 30 deletions(-) diff --git a/pom.xml b/pom.xml index d52f079e..7a0561bf 100755 --- a/pom.xml +++ b/pom.xml @@ -26,37 +26,59 @@ MUSIC war 2.4.4 - + This is the MUSIC REST interface, packaged as a war file. - - UTF-8 - 1.9 - 2.26 - 2.0.1 - 3.0.0 - 3.4.6 - UTF-8 + + org.onap.oparent + oparent + 0.1.1 + + - - /content/sites/site/org/onap/music/${project.artifactId}/${project.version} - - ${maven.build.timestamp} - yyyy.MM.dd.HH.mm - - ${project.version}-${timestamp} - ${project.version}-latest - + + UTF-8 + 1.9 + 2.26 + 2.0.1 + 3.0.0 + 3.4.6 + + UTF-8 + UTF-8 + + https://nexus.onap.org + /content/repositories/snapshots/ + /content/repositories/releases/ + /content/repositories/staging/ + /content/sites/site/org/onap/music/${project.version} + + ${maven.build.timestamp} + yyyy.MM.dd.HH.mm + + ${project.version}-${timestamp} + ${project.version}-latest + + + + + ecomp-releases + ECOMP Release Repository + ${onap.nexus.url}/${releaseNexusPath} + + + ecomp-snapshots + Snapshot Repository + ${nexusproxy}/${snapshotNexusPath} + + + ecomp-staging + Staging Repository + ${nexusproxy}/${stagingNexusPath} + + - - - maven2-repository.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - default - - MUSIC src/main/java @@ -348,16 +370,25 @@ - - + + + ecomp-releases + Release Repository + ${nexusproxy}/${releaseNexusPath} + + + ecomp-snapshots + Snapshot Repository + ${nexusproxy}/${snapshotNexusPath} + + ecomp-site - dav:${onap.nexus.url}${sitePath} + dav:${nexusproxy}${sitePath} - -- cgit 1.2.3-korg