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

Already on GitHub? Sign in to your account

Fixing build problem introduced by removing encryption jars #595

Closed
wants to merge 6 commits into
from

Conversation

Projects
None yet
3 participants
Contributor

mamccr commented Mar 19, 2013

...s

When merging changes to the build.xml, I accidentally included some
early experimentation that didn't get rolled back. Fixing the issue by
reverting the compile-jruby target to its original form.

Please note that the original changes to antlib/dist.xml should accompany this. I can't quite figure out what Github is doing here, but my intention is for the diff shown here to be applied to the code in my original pull request yesterday.

Very sorry for the churn!

Fixing problems I introduced into the build while removing encyption …
…jars

When merging changes to the build.xml, I accidentally included some
early experimentation that didn't get rolled back.  Fixing the issue by
reverting the compile-jruby target to its original form.
Owner

BanzaiMan commented Mar 19, 2013

Hi. Since I reverted 5c5f203, I can't merge this PR as is. Could you fix the pull request?

@ghost ghost assigned BanzaiMan Mar 19, 2013

@BanzaiMan BanzaiMan referenced this pull request Mar 19, 2013

Closed

Reopen #592 #593

Contributor

mamccr commented Mar 19, 2013

Sorry, I'm a bit new to github, and I'm still figuring out how all the different pieces fit together. I merged everything from trunk back into my forked copy, synced that with my local copy, reintroduced my changes, and committed everything, which seems to have updated the pull request automatically. I did pick up a change I'm not sure about... It looks like a jzlib specification went from 1.1.2 to 1.1.0... I think that's something I just picked up when merging in jruby/master. At any rate, all targets are building as expected in my workspace now, and everything is synced up, so I think you can pull.

Owner

BanzaiMan commented Mar 19, 2013

We're almost there. Could you squash these commits into one, so that I can test it?

Contributor

mamccr commented Mar 19, 2013

Maybe almost :-) I've spent about an hour trying to figure out how to use git rebase to no avail. Only three of the four commits show up in the list, and they are interlaced with dozens of other commit messages. I've tried every combination of squash and pick that I can think of that seems reasonable (and a few that don't) and nothing ever seems to happen. Can you help me understand the process of merging commits? I've read the git help manual for rebase and probably a dozen blog posts on it at this point, and still don't quite understand what's going on.

Contributor

mamccr commented Mar 19, 2013

Sigh. I just made it worse. I really don't know what to do at this point. I'll try creating a new branch from HEAD and merging my changes in there and then giving you a pull request from that branch?

Owner

BanzaiMan commented Mar 19, 2013

@mamccr That build error on Travis seems to be persistent before your pull request, so I won't worry about it too much. I'll study the pull request soon, and get back to you.

Thanks.

Contributor

mamccr commented Mar 19, 2013

Ok, sorry. I thought using github was going to be awesome, but I could not be more confused with what is happening. The handful of changes I want to convey are really quite simple. If there's some way I can start over and clear up all the noise, I'm happy to try. Just let me know what you need.

Owner

headius commented Mar 21, 2013

What's the status here? Perhaps you can just re-branch, from our master, apply all your changes there at once, and resubmit the PR?

I'm going to have a look at your master now to see how it looks.

Owner

headius commented Mar 22, 2013

Merged in f706048.

I added an extra commit that properly formatted the excludes in antlib/dist.xml and confirmed that with the property set jar-complete produces a jar with no (j)openssl bits, no BouncyCastle, and no krypt.

@headius headius closed this Mar 22, 2013

Contributor

mamccr commented Mar 22, 2013

Awesome! Thanks so much, and sorry again for all the hassle. It's clearly time for me to read a book on git.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment