You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/07/10 19:59:30 UTC
incubator-ignite git commit: # ignite-1099: woks with apache repo
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1099 0d01da22f -> e742d45fe
# ignite-1099: woks with apache repo
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e742d45f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e742d45f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e742d45f
Branch: refs/heads/ignite-1099
Commit: e742d45fe0dba2139582adb0e28831e78462e17f
Parents: 0d01da2
Author: ashutak <as...@gridgain.com>
Authored: Fri Jul 10 20:59:33 2015 +0300
Committer: ashutak <as...@gridgain.com>
Committed: Fri Jul 10 20:59:33 2015 +0300
----------------------------------------------------------------------
.../ignite/tools/jirabranches/JiraBranchesToHtml.java | 10 +++++++---
scripts/jira-branches.sh | 4 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e742d45f/modules/tools/src/main/java/org/apache/ignite/tools/jirabranches/JiraBranchesToHtml.java
----------------------------------------------------------------------
diff --git a/modules/tools/src/main/java/org/apache/ignite/tools/jirabranches/JiraBranchesToHtml.java b/modules/tools/src/main/java/org/apache/ignite/tools/jirabranches/JiraBranchesToHtml.java
index cf2100f..002ac05 100644
--- a/modules/tools/src/main/java/org/apache/ignite/tools/jirabranches/JiraBranchesToHtml.java
+++ b/modules/tools/src/main/java/org/apache/ignite/tools/jirabranches/JiraBranchesToHtml.java
@@ -40,7 +40,7 @@ public class JiraBranchesToHtml {
public static final String SCRIPT_PATH = U.getIgniteHome() + "/scripts/jira-branches.sh";
/** */
- private static final URI JIRA_URL = URI.create("http://atlassian.gridgain.com/jira");
+ private static final URI JIRA_URL = URI.create("https://issues.apache.org/jira");
/** */
private static final String INPUT_FILE = U.getIgniteHome() + "/scripts/jira-branches.js";
@@ -74,6 +74,10 @@ public class JiraBranchesToHtml {
* @throws Exception If failed.
*/
public static void main(String[] args) throws Exception {
+ execute();
+ }
+
+ private static void execute() throws Exception {
System.out.println("Need to enter JIRA credentials.");
System.out.print("JIRA user: ");
@@ -125,14 +129,14 @@ public class JiraBranchesToHtml {
for (String line; (line = br.readLine()) != null; ) {
String branchName = line.replace("\\", "").trim();
- if (branchName.startsWith("GG")) {
+ if (branchName.startsWith("IGNITE")) {
Result r = result(restClient, branchName);
if (r.error != null) {
Matcher m = TICKET_PATTERN.matcher(branchName);
if (m.find()) {
- Result r0 = result(restClient, "GG-" + m.group(0));
+ Result r0 = result(restClient, "IGNITE-" + m.group(0));
if (r0.error == null)
r = new Result(branchName, r0.issue, null);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e742d45f/scripts/jira-branches.sh
----------------------------------------------------------------------
diff --git a/scripts/jira-branches.sh b/scripts/jira-branches.sh
index 8fe9047..d97a141 100755
--- a/scripts/jira-branches.sh
+++ b/scripts/jira-branches.sh
@@ -1,6 +1,6 @@
git fetch --all
-echo Delete stale remote-tracking branches under 'origin' repository.
+echo Delete stale remote-tracking branches under 'origin' repository.
git remote prune origin
FILE=$(cd $(dirname "$0"); pwd)/jira-branches.js
@@ -9,7 +9,7 @@ echo Update git branches list file.
echo "var \$branches = \"\\" > $FILE
-git branch -a | grep remotes/origin/gg- | sed 's/remotes\/origin\/gg\-\(.*\)$/GG-\1 \\/g' >> $FILE
+git branch -a | grep remotes/origin/ignite- | sed 's/remotes\/origin\/ignite\-\(.*\)$/IGNITE-\1 \\/g' >> $FILE
echo '";' >> $FILE