Skip to content

Krypt 0.0.2.rc1 update #1529

Merged
merged 1 commit into from Feb 26, 2014

4 participants

@abstractj

Good morning guys, I did the codebase synchronization against the latest release of Krypt (https://rubygems.org/gems/krypt/versions/0.0.2.rc1), but I couldn't find lib/pom.xml to update the gem version.

Let me know if something is not ok.

@mkristian
JRuby Team member
@abstractj

@mkristian sure thing

@headius
JRuby Team member
headius commented Feb 26, 2014

Ok, merging into 1.7.12.

@headius headius merged commit fc93953 into jruby:jruby-1_7 Feb 26, 2014

1 check failed

Details default The Travis CI build failed
@headius headius added this to the JRuby 1.7.12 milestone Feb 26, 2014
@headius headius added the openssl label Feb 26, 2014
@headius
JRuby Team member
headius commented Feb 26, 2014

Ok, I think I've got this all merged.

jruby-1_7 still has the files in-place and does not use @mkristian's new magic to install and copy them from the gems. @mkristian would it be too risky to do that on jruby-1_7 branch as well? cc @enebo.

master does use the default gem install+copy step mkristian made, so I just updated krypt version there to 0.0.2.rc1 and it appears to install and copy correctly.

@headius headius added a commit that referenced this pull request Feb 26, 2014
@headius headius Bump krypt version to 0.0.2.rc1 for #1529. 4f50ea0
@enebo
JRuby Team member
enebo commented Feb 26, 2014

If we plan on supporting 1.7 branch for a long time it would be nice for all the logic and process to line up. It is the beginning of 1.7.12 dev cycle so I think we should go for it.

@mkristian
JRuby Team member
@enebo
JRuby Team member
enebo commented Feb 26, 2014

We have a 2-3 weeks to make sure it works so I think we can work out the kinks. Unless you are worried about some hidden risk. With the plan to maintain jruby-1_7 branch for a long time we might need to be slightly more risky in order to keep the branches from drifting too far apart (obviously part of the goal is to change APIs and stuff, but the stuff we can keep in sync we should try barring huge risk).

@mkristian
JRuby Team member
@mkristian
JRuby Team member
@abstractj

Feel free to ping me if you guys find any issue or need help

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.