Skip to content

Commit

Permalink
don't vendor in JVM on cedar-14 as it's now available on the stack.
Browse files Browse the repository at this point in the history
  • Loading branch information
schneems committed Jan 22, 2015
1 parent fc99e32 commit e375195
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Master

* JVM is now available on cedar-14, do not vendor in JVM based on individual gems. If customer needs a specific version they should use multibuildpack with java and ruby buildpacks.

This comment has been minimized.

Copy link
@pimpin

pimpin Feb 27, 2015

Hi @schneems ,
I'm not yet a buildpack rockstar but I guess my docverter deploy issue come from this change.
Could you confirm I have to change the config in order to "not vendor in JVM based on individual gems" ?
If so, could you add in this change log or in any other doc more clue or link to the existing fucking manuel I could read to make the PR with the required change please ?
Thanks

This comment has been minimized.

Copy link
@schneems

schneems Feb 27, 2015

Author Contributor

This has nothing to do with your issue of not being able to download the jruby binary. Open a support ticket instead of commenting on master, we don't do tech support via github. Please watch your language.

This comment has been minimized.

Copy link
@pimpin

pimpin Mar 2, 2015

Sorry for the inconvenience. About my language, I guess, you point the "fucking manuel"... It was a kind of joke linked to "rtfm". Not at all an injure to you or any piece of doc or code. I apologize for all. Cheers

This comment has been minimized.

Copy link
@schneems

schneems Mar 2, 2015

Author Contributor

No worries. It's difficult to display intent on a text based medium 😸

Looking at it, that error states you're unable to download a version of jruby off of our S3 repository. It looks like we don't have that version of JRuby compiled for cedar-14, but we do for cedar. The oldest version of JRuby available is 1.7.13. Try that and open a support ticket if you have problems.


## v133 (1/22/2015)

* Bump bundler to 1.7.12 which includes multiple fixes and support for block source declaration (https://github.com/bundler/bundler/blob/1-7-stable/CHANGELOG.md).
Expand Down
4 changes: 0 additions & 4 deletions lib/language_pack/ruby.rb
Original file line number Diff line number Diff line change
Expand Up @@ -601,10 +601,6 @@ def build_bundler
end

def post_bundler
if bundler.has_gem?('yui-compressor') && !ruby_version.jruby?
install_jvm(true)
ENV["PATH"] += ":bin"
end
end

# RUBYOPT line that requires syck_hack file
Expand Down

0 comments on commit e375195

Please sign in to comment.