Merge branch 'luciad:luciad_jar_classpath_url_encoding'
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/bbfc661b Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/bbfc661b Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/bbfc661b Branch: refs/heads/master Commit: bbfc661b0b69a70d51a2242d0aaecff2ce8713a6 Parents: a1b508b b6520a7 Author: Peter Donald <pe...@realityforge.org> Authored: Wed Oct 18 08:49:45 2017 +1100 Committer: Peter Donald <pe...@realityforge.org> Committed: Wed Oct 18 08:49:45 2017 +1100 ---------------------------------------------------------------------- lib/buildr/java/commands.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/bbfc661b/lib/buildr/java/commands.rb ---------------------------------------------------------------------- diff --cc lib/buildr/java/commands.rb index 084fe0e,d367f64..a305803 --- a/lib/buildr/java/commands.rb +++ b/lib/buildr/java/commands.rb @@@ -73,9 -73,9 +73,9 @@@ module Jav path = File.directory?(c) && !c.end_with?('/') ? "#{c}/" : c.to_s Buildr::Util.win_os? ? "/#{path}" : path end - manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.join(" ")}]) + manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.map{|p| URI.encode(p)}.join(" ")}]) tjar = Tempfile.new(['javacmd', '.jar']) - Zip::ZipOutputStream.open(tjar.path) do |zos| + Zip::OutputStream.open(tjar.path) do |zos| zos.put_next_entry('META-INF/MANIFEST.MF') zos.write manifest.to_s zos.write "\n"
