[royale-asjs] branch release/0.9.7 updated: Add Release_Step_011_Upload_Get_Credentials which asks for credentials and feeds them to wagon.

[yi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yishayw pushed a commit to branch release/0.9.7
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/release/0.9.7 by this push:
     new 013223d  Add Release_Step_011_Upload_Get_Credentials which asks for credentials and feeds them to wagon.
013223d is described below

commit 013223d0e2dd48b101a1053ebbd7b3115b288c38
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Thu Apr 30 17:35:52 2020 +0300

    Add Release_Step_011_Upload_Get_Credentials which asks for credentials and feeds them to wagon.
---
 releasesteps.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/releasesteps.xml b/releasesteps.xml
index d0f3f0a..286abd9 100644
--- a/releasesteps.xml
+++ b/releasesteps.xml
@@ -18,7 +18,8 @@
 
 -->
 
-<project name="CreateFrameworkReleaseCandidate" default="main" basedir=".">
+<project name="CreateFrameworkReleaseCandidate" default="main" basedir="."
+	xmlns:if="ant:if">
 
     <!-- use -Dtag=<tag or commit hash> to build from other than the head -->
 
@@ -816,6 +817,14 @@
     </target>
     
     <target name="Release_Step_011_Upload" depends="get-artifact-folder">
+	    <fail message="release.version not specified"
+		    unless="release.version"/>
+	    <antcall target="uploadSWCs" />
+	    <antcall target="uploadJewelDark" />
+	    <antcall target="uploadJewelLight" />
+    </target>
+
+    <target name="Release_Step_011_Upload_Get_Credentials" depends="get-artifact-folder,get-username,get-password">
         <fail message="release.version not specified"
             unless="release.version"/>
         <antcall target="uploadSWCs" />
@@ -832,6 +841,8 @@
             <arg value="-Dwagon.fromDir=${artifactfolder}/artifacts/archive/target/local-release-dir" />
             <!--arg value="-Dwagon.includes=**" />
             <arg value="-Dwagon.excludes=**/Jewel-Dark*/**,**/Jewel-Light*/**" /-->
+	    <arg value="-Drm.username=${apache.username}" if:set="${apache.username}"/>
+	    <arg value="-Drm.password=${apache.password}" if:set="${apache.password}"/>
             <arg value="-P" />
             <arg value="_releasesteps-upload-release-to-staging" />
         </exec>
@@ -1644,7 +1655,9 @@
     <target name="get-password" unless="apache.password" >
         <input
         message="Enter Apache account password:"
-        addproperty="apache.password"/>
+        addproperty="apache.password">
+           <handler classname="org.apache.tools.ant.input.SecureInputHandler" />
+	</input>
         <condition property="have.password">
             <not>
                 <equals trim="true" arg1="" arg2="${apache.password}"/>