You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildr.apache.org by do...@apache.org on 2017/10/17 21:50:55 UTC
[1/3] buildr git commit: java command: escape classpath entries in
the pathing jar manifest
Repository: buildr
Updated Branches:
refs/heads/master a1b508bb9 -> 3738beb2e
java command: escape classpath entries in the pathing jar manifest
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/b6520a78
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/b6520a78
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/b6520a78
Branch: refs/heads/master
Commit: b6520a7801dbbc4d61b78e5f03545392efddff60
Parents: 1f3e57f
Author: Glenn Croes <gl...@gmail.com>
Authored: Mon Oct 16 13:00:48 2017 +0200
Committer: Glenn Croes <gl...@gmail.com>
Committed: Mon Oct 16 13:00:48 2017 +0200
----------------------------------------------------------------------
lib/buildr/java/commands.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/b6520a78/lib/buildr/java/commands.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/commands.rb b/lib/buildr/java/commands.rb
index 7328fb9..d367f64 100644
--- a/lib/buildr/java/commands.rb
+++ b/lib/buildr/java/commands.rb
@@ -73,7 +73,7 @@ module Java
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|
zos.put_next_entry('META-INF/MANIFEST.MF')
[3/3] buildr git commit: Five some credit for previous fix
Posted by do...@apache.org.
Five some credit for previous fix
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/3738beb2
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/3738beb2
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/3738beb2
Branch: refs/heads/master
Commit: 3738beb2ee4903449544f39fc5deb63fdf198c80
Parents: bbfc661
Author: Peter Donald <pe...@realityforge.org>
Authored: Wed Oct 18 08:50:41 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Wed Oct 18 08:50:41 2017 +1100
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/3738beb2/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 09b11d5..898777f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.5.4 (Pending)
+* Fixed: BUILDR-733 - Escape classpath entries in the pathing jar manifest. Submitted by Glenn Croes.
* Fixed: Ensure that the pom is attached to the jar artifact with empty classifier rather than the last
artifact of a type defined. Otherwise a project that defines multiple artifacts of the same type
(i.e. `package(:jar)` and `package(:jar, :classifier => :gwt)`) could have the pom named after
[2/3] buildr git commit: Merge branch
'luciad:luciad_jar_classpath_url_encoding'
Posted by do...@apache.org.
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"