Use GitHub org property in octokit calls

diff --git a/build.xml b/build.xml
index f9ec975f85dbbfdf7c628d76081cdde95b6f0e78..ca356d34558b763a1ff000274c019e1344b97236 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -802,7 +802,7 @@
                        releaseVersion="${project.version}"/>\r
                <exec executable="bash" logError="true" >\r
                        <arg value="-c" />\r
-                       <arg value="${octokit} -q edit_release fzs gitblit ${ghrelease.id} tag_name='${release.tag}'"></arg>\r
+                       <arg value="${octokit} -q edit_release ${gh.org} gitblit ${ghrelease.id} tag_name='${release.tag}'"></arg>\r
                </exec>\r
                <ghPublishReleaseDraft\r
                        releaseid="${ghrelease.id}"/>\r
@@ -1100,11 +1100,11 @@
                        <echo>Creating release ${project.tag} draft on GitHub</echo>\r
                        <exec executable="bash" logError="true" failonerror="true" outputproperty="ghrelease.id">\r
                                <arg value="-c" />\r
-                               <arg value="${octokit} create_release fzs gitblit @{releasetag} name=${project.version} draft=true | cut -f2"></arg>\r
+                               <arg value="${octokit} create_release ${gh.org} gitblit @{releasetag} name=${project.version} draft=true | cut -f2"></arg>\r
                        </exec>\r
                        <exec executable="bash" logError="true" failonerror="true" outputproperty="ghrelease.upldUrl">\r
                                <arg value="-c" />\r
-                               <arg value="${octokit} release fzs gitblit ${ghrelease.id} _filter=.upload_url | sed 's/{.*$/?name=/'"></arg>\r
+                               <arg value="${octokit} release ${gh.org} gitblit ${ghrelease.id} _filter=.upload_url | sed 's/{.*$/?name=/'"></arg>\r
                        </exec>\r
                        <exec executable="bash" logError="true" failonerror="true" outputproperty="ghrelease.notes">\r
                                <arg value="-c" />\r
@@ -1112,7 +1112,7 @@
                        </exec>\r
                        <exec executable="bash" logError="true" >\r
                                <arg value="-c" />\r
-                               <arg value="${octokit} -q edit_release fzs gitblit ${ghrelease.id} body='${ghrelease.notes}'"></arg>\r
+                               <arg value="${octokit} -q edit_release ${gh.org} gitblit ${ghrelease.id} body='${ghrelease.notes}'"></arg>\r
                        </exec>\r
                </sequential>\r
        </macrodef>\r
@@ -1145,7 +1145,7 @@
                        <echo>publishing GitHub release draft @{releaseid}</echo>\r
                        <exec executable="bash" logError="true" >\r
                                <arg value="-c" />\r
-                               <arg value="${octokit} -q edit_release fzs gitblit @{releaseid} draft=false"></arg>\r
+                               <arg value="${octokit} -q edit_release ${gh.org} gitblit @{releaseid} draft=false"></arg>\r
                        </exec>\r
                </sequential>\r
        </macrodef>\r
@@ -1160,7 +1160,7 @@
                <sequential>\r
                        <exec executable="bash" logError="true" failonerror="true" outputproperty="ghrelease.id">\r
                                <arg value="-c" />\r
-                               <arg value="${octokit} list_releases fzs gitblit _filter='.[] | &quot;\(.name)\t\(.tag_name)\t\(.id)&quot;' | grep @{releaseVersion} | cut -f3"></arg>\r
+                               <arg value="${octokit} list_releases ${gh.org} gitblit _filter='.[] | &quot;\(.name)\t\(.tag_name)\t\(.id)&quot;' | grep @{releaseVersion} | cut -f3"></arg>\r
                        </exec>\r
                </sequential>\r
        </macrodef>\r