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 <[email protected]> Authored: Sun May 22 20:49:47 2016 +1000 Committer: Peter Donald <[email protected]> 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
