Repository: buildr Updated Branches: refs/heads/master 1dc1a357f -> c06ee879e
BUILDR-728: Snapshots metadata incorrectly created Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/c06ee879 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/c06ee879 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/c06ee879 Branch: refs/heads/master Commit: c06ee879e855165856e2688abf28098cba5264e2 Parents: 1dc1a35 Author: Antoine Toulme <[email protected]> Authored: Mon Oct 31 22:27:15 2016 -0700 Committer: Antoine Toulme <[email protected]> Committed: Mon Oct 31 22:27:15 2016 -0700 ---------------------------------------------------------------------- CHANGELOG | 1 + lib/buildr/packaging/artifact.rb | 2 +- spec/packaging/artifact_spec.rb | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/c06ee879/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 6f0fd79..1647ea4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,6 +3,7 @@ * Change: Update jruby-openssl to 0.9.17 * Change: Move hoe to the development dependencies * Change: Update json_pure to 2.0.2 +* Fixed: BUILDR-728 Snapshots metadata incorrectly created 1.5.0 (2016-09-23) * Change: Update RJB to 1.5.4 http://git-wip-us.apache.org/repos/asf/buildr/blob/c06ee879/lib/buildr/packaging/artifact.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/packaging/artifact.rb b/lib/buildr/packaging/artifact.rb index c58fb38..95bdefd 100644 --- a/lib/buildr/packaging/artifact.rb +++ b/lib/buildr/packaging/artifact.rb @@ -35,7 +35,7 @@ module Buildr #:nodoc: module ActsAsArtifact ARTIFACT_ATTRIBUTES = [:group, :id, :type, :classifier, :version] - MAVEN_METADATA = "maven_metadata.xml" + MAVEN_METADATA = "maven-metadata.xml" class << self private http://git-wip-us.apache.org/repos/asf/buildr/blob/c06ee879/spec/packaging/artifact_spec.rb ---------------------------------------------------------------------- diff --git a/spec/packaging/artifact_spec.rb b/spec/packaging/artifact_spec.rb index 947baf0..47f561a 100644 --- a/spec/packaging/artifact_spec.rb +++ b/spec/packaging/artifact_spec.rb @@ -1042,7 +1042,7 @@ describe ActsAsArtifact, '#upload' do URI.should_receive(:upload).once. with(URI.parse('sftp://example.com/base/com/example/library/2.0-SNAPSHOT/library-2.0-20110311.140236-1.jar'), artifact.to_s, anything) URI.should_receive(:write).once. - with(URI.parse('sftp://example.com/base/com/example/library/2.0-SNAPSHOT/maven_metadata.xml'), anything, anything) + with(URI.parse('sftp://example.com/base/com/example/library/2.0-SNAPSHOT/maven-metadata.xml'), anything, anything) verbose(false) { artifact.upload(:url=>'sftp://example.com/base') } end @@ -1069,7 +1069,7 @@ describe ActsAsArtifact, '#upload' do URI.should_receive(:upload).once. with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/library-2.0-20161111.140236-1.jar'), artifact.to_s, anything) URI.should_receive(:write).once. - with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/maven_metadata.xml'), anything, anything) + with(URI.parse('sftp://buildr.apache.org/repository/noexist/base/com/example/library/2.0-SNAPSHOT/maven-metadata.xml'), anything, anything) repositories.release_to = 'sftp://buildr.apache.org/repository/noexist/base' artifact.upload lambda { artifact.upload }.should_not raise_error @@ -1087,7 +1087,7 @@ describe ActsAsArtifact, '#upload' do URI.should_receive(:upload).once. with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/library-2.0-20161111.140236-1.jar'), artifact.to_s, anything) URI.should_receive(:write).once. - with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/maven_metadata.xml'), anything, anything) + with(URI.parse('sftp://buildr.apache.org/repository/noexist/snapshot/com/example/library/2.0-SNAPSHOT/maven-metadata.xml'), anything, anything) repositories.release_to = 'sftp://buildr.apache.org/repository/noexist/base' repositories.snapshot_to = 'sftp://buildr.apache.org/repository/noexist/snapshot' artifact.upload
