summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Gauld <ag1282@att.com>2017-08-25 16:12:19 -0400
committerAndrew Gauld <ag1282@att.com>2017-08-25 16:15:44 -0400
commitc58392ce625fe3aa58ac345cee503997d51e04b2 (patch)
tree4e5342ec37e600316032d87645c51861ed85238f
parentb34cbd016aed9717bc275923a677638a45842355 (diff)
Pass Nexus srvr ID on deploy from pom to script
Change-Id: Ia7cfb3e78e85a5ab6b98bced47a1bb6790c86629 Issue-Id: DCAEGEN2-78 Signed-off-by: Andrew Gauld <ag1282@att.com>
-rwxr-xr-xmvn-phase-script.sh2
-rw-r--r--pom.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index ea6e501..45e62fc 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -76,7 +76,7 @@ deploy)
hostport=$(echo $1 | cut -f3 -d /)
host=$(echo $hostport | cut -f1 -d:)
settings=$HOME/.m2/settings.xml
- ( echo machine $host; echo login $(xpath $settings "//servers/server[id='$hostport']/username/text()"); echo password $(xpath $settings "//servers/server[id='$hostport']/password/text()") ) >$HOME/.netrc
+ ( echo machine $host; echo login $(xpath $settings "//servers/server[id='$MVN_SERVER_ID']/username/text()"); echo password $(xpath $settings "//servers/server[id='$MVN_SERVER_ID']/password/text()") ) >$HOME/.netrc
chmod 600 $HOME/.netrc
set -x
}
diff --git a/pom.xml b/pom.xml
index 967fe20..d169801 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,6 +275,7 @@ limitations under the License.
<MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
<MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
<MVN_NEXUSPROXY>${onap.nexus.url}</MVN_NEXUSPROXY>
+ <MVN_SERVER_ID>${project.distributionManagement.snapshotRepository.id}</MVN_SERVER_ID>
</environmentVariables>
</configuration>
</execution>