Fix: Remove "default" from altDeploymentRepo

We are seeing warnings in our maven jobs that "staging::default::file"
is legacy syntax, and should be replaced with "staging::file". This
patch fixes both instances of this syntax in our scripts.

Change-Id: Ic2a1c5d19670140f8803edb3ef30bb3908e3a995
Issue-ID: IT-28843
Signed-off-by: Eric Ball <eball@linuxfoundation.org>

diff --git a/releasenotes/notes/fix-mvn-warning-934f3e9db086d79d.yaml b/releasenotes/notes/fix-mvn-warning-934f3e9db086d79d.yaml
new file mode 100644 (file)
index 0000000..147eeea
--- /dev/null
+++ b/releasenotes/notes/fix-mvn-warning-934f3e9db086d79d.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Change syntax for mvn altDeploymentRepository from "staging::default::file"
+    to "staging::file" to remove warning about legacy syntax.

diff --git a/shell/maven-build.sh b/shell/maven-build.sh
index 29de088..63446d9 100644 (file)
--- a/shell/maven-build.sh
+++ b/shell/maven-build.sh
@@ -25,5 +25,5 @@ $MVN $MAVEN_GOALS \
     -e \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
-    -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
+    -DaltDeploymentRepository=staging::file:"$WORKSPACE"/m2repo \
     $MAVEN_OPTIONS $MAVEN_PARAMS

diff --git a/shell/sonatype-clm.sh b/shell/sonatype-clm.sh
index 2071974..5921c5e 100644 (file)
--- a/shell/sonatype-clm.sh
+++ b/shell/sonatype-clm.sh
@@ -24,5 +24,5 @@ export MAVEN_OPTS
 $MVN $MAVEN_GOALS dependency:tree com.sonatype.clm:clm-maven-plugin:index \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
-    -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo \
+    -DaltDeploymentRepository=staging::file:"$WORKSPACE"/m2repo \
     $MAVEN_OPTIONS $MAVEN_PARAMS