Skip to content

Remove derby from distro #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mtaylor wants to merge 2 commits into from
Closed

Remove derby from distro #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67c14b4
Allow override remote name in mergePR script
mtaylor Apr 8, 2016
82dfd54
Remove derby from distro
mtaylor Apr 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion artemis-distribution/src/main/assembly/dep.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 10 additions & 6 deletions scripts/merge-PR.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Copy Markdown
Contributor

@clebertsuconic clebertsuconic Apr 8, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying the new script and it's not working for me

git checkout master
git merge --no-ff $1 -m "This closes #$*"
git branch -D $1