From 67c14b435b9e6c4a9469c6a2c76872bdb3a880b6 Mon Sep 17 00:00:00 2001
From: Martyn Taylor <mtaylor@redhat.com>
Date: Fri, 8 Apr 2016 11:55:28 +0100
Subject: [PATCH 1/2] Allow override remote name in mergePR script

---
 scripts/merge-PR.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/merge-PR.sh b/scripts/merge-PR.sh
index b12e02f2c58..c3e0214f101 100755
--- a/scripts/merge-PR.sh
+++ b/scripts/merge-PR.sh
@@ -29,13 +29,17 @@
 # Notice: you should add +refs/pull/*/head to your fetch config on upstream
 #        as specified on https://github.com/apache/activemq-artemis/blob/master/docs/hacking-guide/en/maintainers.md
 
-git fetch origin
-git fetch apache
-git fetch upstream 
+ARTEMIS_USER_REMOTE_NAME=${ARTEMIS_USER_REMOTE_NAME:origin}
+ARTEMIS_APACHE_REMOTE_NAME=${ARTEMIS_APACHE_REMOTE_NAME:apache}
+ARTEMIS_GITHUB_REMOTE_NAME=${ARTEMIS_GITHUB_REMOTE_NAME:upstream}
 
-git checkout apache/master -B master
-git checkout upstream/pr/$1 -B $1
-git pull --rebase apache master
+git fetch $ARTEMIS_USER_REMOTE_NAME
+git fetch $ARTEMIS_APACHE_REMOTE_NAME
+git fetch $ARTEMIS_GITHUB_REMOTE_NAME
+
+git checkout $ARTEMIS_APACHE_REMOTE_NAME/master -B master
+git checkout $ARTEMIS_GITHUB_REMOTE_NAME/pr/$1 -B $1
+git pull --rebase $ARTEMIS_APACHE_REMOTE_NAME master
 git checkout master
 git merge --no-ff $1 -m "This closes #$*"
 git branch -D $1

From 82dfd543e8cd639b97ad19560054a5819220f0ed Mon Sep 17 00:00:00 2001
From: Martyn Taylor <mtaylor@redhat.com>
Date: Fri, 8 Apr 2016 12:54:31 +0100
Subject: [PATCH 2/2] Remove derby from distro

All runtime deps on derby have been removed.  We only require derby for
JDBC related tests.
---
 artemis-distribution/src/main/assembly/dep.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/artemis-distribution/src/main/assembly/dep.xml b/artemis-distribution/src/main/assembly/dep.xml
index a39ae6c85ec..4adfaf85be0 100644
--- a/artemis-distribution/src/main/assembly/dep.xml
+++ b/artemis-distribution/src/main/assembly/dep.xml
@@ -94,7 +94,6 @@
             <include>org.fusesource.hawtbuf:hawtbuf</include>
             <include>org.jgroups:jgroups</include>
             <include>io.netty:netty-codec-mqtt</include>
-            <include>org.apache.derby:derby</include>
          </includes>
          <!--excludes>
             <exclude>org.apache.activemq:artemis-website</exclude>