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 2016/05/22 10:50:43 UTC
[01/11] buildr git commit: Prefer %w syntax
Repository: buildr
Updated Branches:
refs/heads/master ea4103fb8 -> 7bdb30bf5
Prefer %w syntax
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/86550338
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/86550338
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/86550338
Branch: refs/heads/master
Commit: 86550338141ac3899d946185680f2bfa643bd285
Parents: 86f9c48
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:06:46 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:06:46 2016 +1000
----------------------------------------------------------------------
spec/addon/custom_pom_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/86550338/spec/addon/custom_pom_spec.rb
----------------------------------------------------------------------
diff --git a/spec/addon/custom_pom_spec.rb b/spec/addon/custom_pom_spec.rb
index 9b78bf5..c49b766 100644
--- a/spec/addon/custom_pom_spec.rb
+++ b/spec/addon/custom_pom_spec.rb
@@ -67,7 +67,7 @@ describe Buildr::CustomPom do
describe "with explicitly specified pom details" do
before do
- ['id-provided', 'id-optional', 'id-runtime', 'id-test'].each do |artifact_id|
+ %w(id-provided id-optional id-runtime id-test).each do |artifact_id|
artifact("group:#{artifact_id}:jar:1.0") do |t|
mkdir_p File.dirname(t.to_s)
Zip::ZipOutputStream.open t.to_s do |zip|
[04/11] buildr git commit: Prefer single quotes
Posted by do...@apache.org.
Prefer single quotes
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/b3c4f821
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/b3c4f821
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/b3c4f821
Branch: refs/heads/master
Commit: b3c4f8217c369daecc3cd9b52da97d805eaf9966
Parents: d3a06b7
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:25:23 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:25:23 2016 +1000
----------------------------------------------------------------------
lib/buildr/java/pom.rb | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/b3c4f821/lib/buildr/java/pom.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/pom.rb b/lib/buildr/java/pom.rb
index 4cc9650..a7ec7a0 100644
--- a/lib/buildr/java/pom.rb
+++ b/lib/buildr/java/pom.rb
@@ -17,10 +17,10 @@
module Buildr
class POM
- POM_TO_SPEC_MAP = { :group=>"groupId", :id=>"artifactId", :type=>"type",
- :version=>"version", :classifier=>"classifier", :scope=>"scope" }
- SCOPES_TRANSITIVE = [nil, "compile", "runtime"]
- SCOPES_WE_USE = SCOPES_TRANSITIVE + ["provided"]
+ POM_TO_SPEC_MAP = { :group=> 'groupId', :id=> 'artifactId', :type=> 'type',
+ :version=> 'version', :classifier=> 'classifier', :scope=> 'scope'}
+ SCOPES_TRANSITIVE = [nil, 'compile', 'runtime']
+ SCOPES_WE_USE = SCOPES_TRANSITIVE + ['provided']
# POM project as Hash (using XmlSimple).
attr_reader :project
@@ -57,7 +57,7 @@ module Buildr
end
pom
else
- raise ArgumentError, "Expecting Hash spec, Artifact, file name or file task"
+ raise ArgumentError, 'Expecting Hash spec, Artifact, file name or file task'
end
end
@@ -92,9 +92,9 @@ module Buildr
# try to cache dependencies also
@depends_for_scopes ||= {}
unless depends = @depends_for_scopes[options]
- declared = project["dependencies"].first["dependency"] rescue nil
+ declared = project['dependencies'].first['dependency'] rescue nil
depends = (declared || [])
- depends = depends.reject { |dep| value_of(dep["optional"]) =~ /true/ } unless options[:optional]
+ depends = depends.reject { |dep| value_of(dep['optional']) =~ /true/ } unless options[:optional]
depends = depends.map { |dep|
spec = pom_to_hash(dep, properties)
apply = managed(spec)
@@ -106,7 +106,7 @@ module Buildr
if options[:scopes].include?(spec[:scope])
spec.delete(:scope)
- exclusions = dep["exclusions"].first["exclusion"] rescue nil
+ exclusions = dep['exclusions'].first['exclusion'] rescue nil
transitive_deps = POM.load(spec).dependencies(:exclusions => exclusions, :scopes => (options[:scopes_transitive] || SCOPES_TRANSITIVE) ) rescue []
[Artifact.to_spec(spec)] + transitive_deps
@@ -129,7 +129,7 @@ module Buildr
hash[key] = hash["pom.#{key}"] = hash["project.#{key}"] = value_of(value) if value
hash
}
- props = project["properties"].first rescue {}
+ props = project['properties'].first rescue {}
props = props.inject({}) { |mapped, pair| mapped[pair.first] = value_of(pair.last, props) ; mapped }
(parent ? parent.properties.merge(props) : props).merge(pom)
end
@@ -148,7 +148,7 @@ module Buildr
(parent ? parent.managed(spec) : nil)
else
@managed ||= begin
- managed = project["dependencyManagement"].first["dependencies"].first["dependency"] rescue nil
+ managed = project['dependencyManagement'].first['dependencies'].first['dependency'] rescue nil
managed ? managed.map { |dep| pom_to_hash(dep, properties) } : []
end
end
@@ -179,7 +179,7 @@ module Buildr
spec[pair.first] = value_of(element[pair.last], substitute) if element[pair.last]
spec
}
- {:scope => "compile", :type => "jar"}.merge(hash)
+ {:scope => 'compile', :type => 'jar'}.merge(hash)
end
end
[07/11] buildr git commit: Comment out debug code
Posted by do...@apache.org.
Comment out debug code
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/d64a248f
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/d64a248f
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/d64a248f
Branch: refs/heads/master
Commit: d64a248f5efbb6e1e75a3f289f5a85313b5bdeaf
Parents: 8ec9b0d
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:41:10 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:41:10 2016 +1000
----------------------------------------------------------------------
spec/addon/custom_pom_spec.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/d64a248f/spec/addon/custom_pom_spec.rb
----------------------------------------------------------------------
diff --git a/spec/addon/custom_pom_spec.rb b/spec/addon/custom_pom_spec.rb
index 15843e7..1d0c146 100644
--- a/spec/addon/custom_pom_spec.rb
+++ b/spec/addon/custom_pom_spec.rb
@@ -100,7 +100,7 @@ describe Buildr::CustomPom do
end
task('package').invoke
@pom_xml = project_pom_xml(@foo)
- $stderr.puts @pom_xml.to_s
+ #$stderr.puts @pom_xml.to_s
end
it 'has correct static metadata' do
[11/11] buildr git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/buildr
Posted by do...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/buildr
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/7bdb30bf
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/7bdb30bf
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/7bdb30bf
Branch: refs/heads/master
Commit: 7bdb30bf53a0938ce92dbd6dd58d52b7769cd894
Parents: 9c4d787 ea4103f
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:49:47 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:49:47 2016 +1000
----------------------------------------------------------------------
.travis.yml | 13 ++++----
CHANGELOG | 20 +++++++++++-
NOTICE | 2 +-
README.rdoc | 2 +-
buildr.gemspec | 20 ++++++------
doap.rdf | 15 +++++++++
doc/_config.yml | 2 +-
doc/_layouts/default.html | 2 +-
doc/artifacts.textile | 6 ++++
doc/download.textile | 24 ++++++++++----
doc/index.textile | 6 ++++
doc/preface.textile | 2 +-
doc/projects.textile | 13 ++++++++
doc/releasing.textile | 14 ++++++++
lib/buildr/core/build.rb | 31 ++++++++++++------
lib/buildr/core/test.rb | 2 +-
lib/buildr/java/commands.rb | 2 +-
lib/buildr/java/packaging.rb | 12 +++----
lib/buildr/packaging/archive.rb | 2 +-
lib/buildr/packaging/artifact.rb | 55 +++++++++++++++++++++++++++++--
lib/buildr/packaging/zip.rb | 61 ++++++++++++++++++-----------------
lib/buildr/packaging/ziptask.rb | 12 ++++---
lib/buildr/scala/compiler.rb | 2 +-
lib/buildr/version.rb | 2 +-
spec/addon/bnd_spec.rb | 8 ++---
spec/addon/custom_pom_spec.rb | 2 +-
spec/core/application_spec.rb | 5 ---
spec/core/build_spec.rb | 10 ++++++
spec/core/console_spec.rb | 2 +-
spec/core/transport_spec.rb | 7 ----
spec/groovy/compiler_spec.rb | 4 +--
spec/java/packaging_spec.rb | 46 +++++++++++++-------------
spec/packaging/archive_spec.rb | 2 +-
spec/packaging/artifact_spec.rb | 25 +++++++++++++-
spec/packaging/packaging_spec.rb | 2 +-
spec/scala/compiler_spec.rb | 16 ++++-----
tests/integration_testing.rb | 4 +--
37 files changed, 312 insertions(+), 143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/7bdb30bf/CHANGELOG
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/7bdb30bf/spec/addon/custom_pom_spec.rb
----------------------------------------------------------------------
diff --cc spec/addon/custom_pom_spec.rb
index d44abe8,4834b49..55d5549
--- a/spec/addon/custom_pom_spec.rb
+++ b/spec/addon/custom_pom_spec.rb
@@@ -67,16 -63,14 +67,16 @@@ describe Buildr::CustomPom d
verify_dependency_version(pom_xml, artifact_id, version)
verify_dependency_scope(pom_xml, artifact_id, scope)
verify_dependency_optional(pom_xml, artifact_id, optional)
+ pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/exclusions/exclusion/groupId", '*')
+ pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/exclusions/exclusion/artifactId", '*')
end
- describe "with explicitly specified pom details" do
+ describe 'with explicitly specified pom details' do
before do
- ['id-provided', 'id-optional', 'id-runtime', 'id-test'].each do |artifact_id|
+ %w(id-provided id-optional id-runtime id-test).each do |artifact_id|
artifact("group:#{artifact_id}:jar:1.0") do |t|
mkdir_p File.dirname(t.to_s)
- Zip::ZipOutputStream.open t.to_s do |zip|
+ Zip::OutputStream.open t.to_s do |zip|
zip.put_next_entry 'empty.txt'
end
end
[02/11] buildr git commit: Prefer single quotes
Posted by do...@apache.org.
Prefer single quotes
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/7cbe77cd
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/7cbe77cd
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/7cbe77cd
Branch: refs/heads/master
Commit: 7cbe77cde78bd7b7e1a08f4cba9e66660f24be63
Parents: 8655033
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:07:00 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:07:00 2016 +1000
----------------------------------------------------------------------
spec/addon/custom_pom_spec.rb | 60 +++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/7cbe77cd/spec/addon/custom_pom_spec.rb
----------------------------------------------------------------------
diff --git a/spec/addon/custom_pom_spec.rb b/spec/addon/custom_pom_spec.rb
index c49b766..15843e7 100644
--- a/spec/addon/custom_pom_spec.rb
+++ b/spec/addon/custom_pom_spec.rb
@@ -65,7 +65,7 @@ describe Buildr::CustomPom do
verify_dependency_optional(pom_xml, artifact_id, optional)
end
- describe "with explicitly specified pom details" do
+ describe 'with explicitly specified pom details' do
before do
%w(id-provided id-optional id-runtime id-test).each do |artifact_id|
artifact("group:#{artifact_id}:jar:1.0") do |t|
@@ -75,7 +75,7 @@ describe Buildr::CustomPom do
end
end
end
- write 'src/main/java/Example.java', "public class Example {}"
+ write 'src/main/java/Example.java', 'public class Example {}'
@foo = define 'foo' do
project.group = 'org.myproject'
@@ -100,50 +100,50 @@ describe Buildr::CustomPom do
end
task('package').invoke
@pom_xml = project_pom_xml(@foo)
- #$stderr.puts @pom_xml.to_s
+ $stderr.puts @pom_xml.to_s
end
- it "has correct static metadata" do
- @pom_xml.should match_xpath("/project/modelVersion", '4.0.0')
- @pom_xml.should match_xpath("/project/parent/groupId", 'org.sonatype.oss')
- @pom_xml.should match_xpath("/project/parent/artifactId", 'oss-parent')
- @pom_xml.should match_xpath("/project/parent/version", '7')
+ it 'has correct static metadata' do
+ @pom_xml.should match_xpath('/project/modelVersion', '4.0.0')
+ @pom_xml.should match_xpath('/project/parent/groupId', 'org.sonatype.oss')
+ @pom_xml.should match_xpath('/project/parent/artifactId', 'oss-parent')
+ @pom_xml.should match_xpath('/project/parent/version', '7')
end
- it "has correct project level metadata" do
- @pom_xml.should match_xpath("/project/groupId", 'org.myproject')
- @pom_xml.should match_xpath("/project/artifactId", 'foo')
- @pom_xml.should match_xpath("/project/version", '1.0')
- @pom_xml.should match_xpath("/project/packaging", 'jar')
- @pom_xml.should match_xpath("/project/name", 'foo')
- @pom_xml.should match_xpath("/project/description", 'foo')
- @pom_xml.should match_xpath("/project/url", 'https://github.com/jbloggs/myproject')
+ it 'has correct project level metadata' do
+ @pom_xml.should match_xpath('/project/groupId', 'org.myproject')
+ @pom_xml.should match_xpath('/project/artifactId', 'foo')
+ @pom_xml.should match_xpath('/project/version', '1.0')
+ @pom_xml.should match_xpath('/project/packaging', 'jar')
+ @pom_xml.should match_xpath('/project/name', 'foo')
+ @pom_xml.should match_xpath('/project/description', 'foo')
+ @pom_xml.should match_xpath('/project/url', 'https://github.com/jbloggs/myproject')
end
- it "has correct scm details" do
- @pom_xml.should match_xpath("/project/scm/connection", 'scm:git:git@github.com:jbloggs/myproject')
- @pom_xml.should match_xpath("/project/scm/developerConnection", 'scm:git:git@github.com:jbloggs/myproject')
- @pom_xml.should match_xpath("/project/scm/url", 'git@github.com:jbloggs/myproject')
+ it 'has correct scm details' do
+ @pom_xml.should match_xpath('/project/scm/connection', 'scm:git:git@github.com:jbloggs/myproject')
+ @pom_xml.should match_xpath('/project/scm/developerConnection', 'scm:git:git@github.com:jbloggs/myproject')
+ @pom_xml.should match_xpath('/project/scm/url', 'git@github.com:jbloggs/myproject')
end
- it "has correct issueManagement details" do
- @pom_xml.should match_xpath("/project/issueManagement/url", 'https://github.com/jbloggs/myproject/issues')
- @pom_xml.should match_xpath("/project/issueManagement/system", 'GitHub Issues')
+ it 'has correct issueManagement details' do
+ @pom_xml.should match_xpath('/project/issueManagement/url', 'https://github.com/jbloggs/myproject/issues')
+ @pom_xml.should match_xpath('/project/issueManagement/system', 'GitHub Issues')
end
- it "has correct developers details" do
- @pom_xml.should match_xpath("/project/developers/developer/id", 'jbloggs')
- @pom_xml.should match_xpath("/project/developers/developer/name", 'Joe Bloggs')
- @pom_xml.should match_xpath("/project/developers/developer/email", 'jbloggs@example.com')
- @pom_xml.should match_xpath("/project/developers/developer/roles/role", 'Project Lead')
+ it 'has correct developers details' do
+ @pom_xml.should match_xpath('/project/developers/developer/id', 'jbloggs')
+ @pom_xml.should match_xpath('/project/developers/developer/name', 'Joe Bloggs')
+ @pom_xml.should match_xpath('/project/developers/developer/email', 'jbloggs@example.com')
+ @pom_xml.should match_xpath('/project/developers/developer/roles/role', 'Project Lead')
end
- it "has correct license details" do
+ it 'has correct license details' do
verify_license(@pom_xml, 'The Apache Software License, Version 2.0', 'http://www.apache.org/licenses/LICENSE-2.0.txt')
verify_license(@pom_xml, 'GNU General Public License (GPL) version 3.0', 'http://www.gnu.org/licenses/gpl-3.0.html')
end
- it "has correct dependency details" do
+ it 'has correct dependency details' do
verify_dependency(@pom_xml, 'id-runtime', 'group', '1.0', nil, nil)
verify_dependency(@pom_xml, 'id-optional', 'group', '1.0', nil, 'true')
verify_dependency(@pom_xml, 'id-provided', 'group', '1.0', 'provided', nil)
[09/11] buildr git commit: Add some more commentary why test is
disabled
Posted by do...@apache.org.
Add some more commentary why test is disabled
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/588d83e4
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/588d83e4
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/588d83e4
Branch: refs/heads/master
Commit: 588d83e493f9fd7c9637a847eb2194fa04b7a4a6
Parents: 84b3ecb
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:41:55 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:41:55 2016 +1000
----------------------------------------------------------------------
spec/addon/custom_pom_spec.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/588d83e4/spec/addon/custom_pom_spec.rb
----------------------------------------------------------------------
diff --git a/spec/addon/custom_pom_spec.rb b/spec/addon/custom_pom_spec.rb
index 1d0c146..088cd36 100644
--- a/spec/addon/custom_pom_spec.rb
+++ b/spec/addon/custom_pom_spec.rb
@@ -21,7 +21,11 @@ if false
require File.expand_path('../spec_helpers', File.dirname(__FILE__))
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'xpath_matchers'))
-Sandbox.require_optional_extension 'buildr/custom_pom'
+# Next line should work but does not
+#Sandbox.require_optional_extension 'buildr/custom_pom'
+
+# Next line should not be used but is required
+require 'buildr/custom_pom'
describe Buildr::CustomPom do
[08/11] buildr git commit: Handle scenario when no match is expected
Posted by do...@apache.org.
Handle scenario when no match is expected
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/84b3ecb5
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/84b3ecb5
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/84b3ecb5
Branch: refs/heads/master
Commit: 84b3ecb51b3924647ba9752df3e5eb0f0caa04cb
Parents: d64a248
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:41:22 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:41:22 2016 +1000
----------------------------------------------------------------------
spec/xpath_matchers.rb | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/84b3ecb5/spec/xpath_matchers.rb
----------------------------------------------------------------------
diff --git a/spec/xpath_matchers.rb b/spec/xpath_matchers.rb
index c5c4ed7..e3aded7 100644
--- a/spec/xpath_matchers.rb
+++ b/spec/xpath_matchers.rb
@@ -74,6 +74,7 @@ module RSpec
ok = true
return false unless @val == @actual_val
end
+ return true if !ok && @val.nil?
return ok
end
[03/11] buildr git commit: Prefer single quotes
Posted by do...@apache.org.
Prefer single quotes
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/d3a06b7b
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/d3a06b7b
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/d3a06b7b
Branch: refs/heads/master
Commit: d3a06b7b9e52553b7d4785856ff340f86e889603
Parents: 7cbe77c
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:24:34 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:24:34 2016 +1000
----------------------------------------------------------------------
spec/sandbox.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/d3a06b7b/spec/sandbox.rb
----------------------------------------------------------------------
diff --git a/spec/sandbox.rb b/spec/sandbox.rb
index 599784d..fe42192 100644
--- a/spec/sandbox.rb
+++ b/spec/sandbox.rb
@@ -193,7 +193,7 @@ module Sandbox
Layout.default = @_sandbox[:layout].clone
$LOAD_PATH.replace @_sandbox[:load_path]
- ENV["RUBYOPT"] = @_sandbox[:ruby_opt]
+ ENV['RUBYOPT'] = @_sandbox[:ruby_opt]
FileUtils.rm_rf @temp
mkpath ENV['HOME']
[10/11] buildr git commit: Update the custom_pom addon to generate
poms with exclusions section that excludes all transitive dependencies. This
is required as buildr dependencies are not transitive while Maven's
dependencies are transitive by default.
Posted by do...@apache.org.
Update the custom_pom addon to generate poms with exclusions section that excludes
all transitive dependencies. This is required as buildr dependencies are not
transitive while Maven's dependencies are transitive by default.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/9c4d787a
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/9c4d787a
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/9c4d787a
Branch: refs/heads/master
Commit: 9c4d787a13b235b77a2f240d2129bc49571ceb9a
Parents: 588d83e
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:44:54 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:44:54 2016 +1000
----------------------------------------------------------------------
CHANGELOG | 3 +++
addon/buildr/custom_pom.rb | 6 ++++++
spec/addon/custom_pom_spec.rb | 2 ++
3 files changed, 11 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/9c4d787a/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 0fee60c..4580fa2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@
* Change: Update gwt addon to add the GWT artifacts to project dependencies as specs rather
than files.
* Change: Support the project.root_project utility method to retrieve the top level project.
+* Change: Update the custom_pom addon to generate poms with exclusions section that excludes
+ all transitive dependencies. This is required as buildr dependencies are not
+ transitive while Maven's dependencies are transitive by default.
1.4.24 (2016-03-19)
* Added: Support the :no_invoke parameter being passed to Buildr.project() and
http://git-wip-us.apache.org/repos/asf/buildr/blob/9c4d787a/addon/buildr/custom_pom.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/custom_pom.rb b/addon/buildr/custom_pom.rb
index 42e4e0b..b03ac9e 100644
--- a/addon/buildr/custom_pom.rb
+++ b/addon/buildr/custom_pom.rb
@@ -229,6 +229,12 @@ module Buildr
xml.version dependency[:version]
xml.scope dependency[:scope] unless dependency[:scope] == 'compile'
xml.optional true if dependency[:optional]
+ xml.exclusions do
+ xml.exclusion do
+ xml.groupId '*'
+ xml.artifactId '*'
+ end
+ end
end
end
end
http://git-wip-us.apache.org/repos/asf/buildr/blob/9c4d787a/spec/addon/custom_pom_spec.rb
----------------------------------------------------------------------
diff --git a/spec/addon/custom_pom_spec.rb b/spec/addon/custom_pom_spec.rb
index 088cd36..d44abe8 100644
--- a/spec/addon/custom_pom_spec.rb
+++ b/spec/addon/custom_pom_spec.rb
@@ -67,6 +67,8 @@ describe Buildr::CustomPom do
verify_dependency_version(pom_xml, artifact_id, version)
verify_dependency_scope(pom_xml, artifact_id, scope)
verify_dependency_optional(pom_xml, artifact_id, optional)
+ pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/exclusions/exclusion/groupId", '*')
+ pom_xml.should match_xpath("#{dependency_xpath(artifact_id)}/exclusions/exclusion/artifactId", '*')
end
describe 'with explicitly specified pom details' do
[05/11] buildr git commit: Prefer %w syntax
Posted by do...@apache.org.
Prefer %w syntax
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a1ca51e9
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a1ca51e9
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a1ca51e9
Branch: refs/heads/master
Commit: a1ca51e9d1653fff8c9928741454a7e1d126c06d
Parents: b3c4f82
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:25:42 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:25:42 2016 +1000
----------------------------------------------------------------------
lib/buildr/java/pom.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a1ca51e9/lib/buildr/java/pom.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/pom.rb b/lib/buildr/java/pom.rb
index a7ec7a0..e91c232 100644
--- a/lib/buildr/java/pom.rb
+++ b/lib/buildr/java/pom.rb
@@ -124,7 +124,7 @@ module Buildr
# properties for groupId, artifactId, version and packaging.
def properties()
@properties ||= begin
- pom = ["groupId", "artifactId", "version", "packaging"].inject({}) { |hash, key|
+ pom = %w(groupId artifactId version packaging).inject({}) { |hash, key|
value = project[key] || (parent ? parent.project[key] : nil)
hash[key] = hash["pom.#{key}"] = hash["project.#{key}"] = value_of(value) if value
hash
[06/11] buildr git commit: ImproveImprove error message
Posted by do...@apache.org.
ImproveImprove error message
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/8ec9b0d3
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/8ec9b0d3
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/8ec9b0d3
Branch: refs/heads/master
Commit: 8ec9b0d371034aee2cb14cc0f18c7e2d89e0393b
Parents: a1ca51e
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun May 22 20:40:23 2016 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun May 22 20:40:23 2016 +1000
----------------------------------------------------------------------
spec/xpath_matchers.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/8ec9b0d3/spec/xpath_matchers.rb
----------------------------------------------------------------------
diff --git a/spec/xpath_matchers.rb b/spec/xpath_matchers.rb
index 3bb3426..c5c4ed7 100644
--- a/spec/xpath_matchers.rb
+++ b/spec/xpath_matchers.rb
@@ -78,7 +78,7 @@ module RSpec
end
def failure_message
- "The xpath #{@xpath} did not have the value '#{@val}' It was '#{@actual_val}'"
+ "The xpath #{@xpath} did not have the value #{@val.inspect} it was #{@actual_val.inspect}"
end
def description