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 2014/07/31 07:12:24 UTC
[10/50] git commit: Updated the 'test_jar' package type to have a
classifier of 'tests' and thus match maven conventions.
Updated the 'test_jar' package type to have a classifier of 'tests' and thus match maven conventions.
git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@1535908 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/a487a7cd
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/a487a7cd
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/a487a7cd
Branch: refs/heads/master
Commit: a487a7cd74bc20dd34ded840130cc373d7e56aaf
Parents: 3b21e4f
Author: Peter Donald <do...@apache.org>
Authored: Sat Oct 26 01:45:46 2013 +0000
Committer: Peter Donald <do...@apache.org>
Committed: Sat Oct 26 01:45:46 2013 +0000
----------------------------------------------------------------------
CHANGELOG | 2 ++
lib/buildr/packaging/test_jar.rb | 2 +-
spec/java/packaging_spec.rb | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/a487a7cd/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 9fe26f5..2b600b5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,6 @@
1.4.15 (Pending)
+* Change: Updated the 'test_jar' package type to have a
+ classifier of 'tests' and thus match maven conventions.
* Fixed: BUILDR-689 - Ensure that war file includes generated
assets rather than the "source" assets that may have
been filtered.
http://git-wip-us.apache.org/repos/asf/buildr/blob/a487a7cd/lib/buildr/packaging/test_jar.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/packaging/test_jar.rb b/lib/buildr/packaging/test_jar.rb
index a03a92c..8aa5202 100644
--- a/lib/buildr/packaging/test_jar.rb
+++ b/lib/buildr/packaging/test_jar.rb
@@ -16,7 +16,7 @@
module Buildr #:nodoc:
module PackageAsTestJar
def package_as_test_jar_spec(spec) #:nodoc:
- spec.merge(:type => :jar, :classifier => 'test-jar')
+ spec.merge(:type => :jar, :classifier => 'tests')
end
def package_as_test_jar(file_name) #:nodoc:
http://git-wip-us.apache.org/repos/asf/buildr/blob/a487a7cd/spec/java/packaging_spec.rb
----------------------------------------------------------------------
diff --git a/spec/java/packaging_spec.rb b/spec/java/packaging_spec.rb
index 328f05f..5eb6498 100644
--- a/spec/java/packaging_spec.rb
+++ b/spec/java/packaging_spec.rb
@@ -1244,10 +1244,10 @@ describe Packaging, 'test_jar' do
it_should_behave_like 'packaging'
before { @packaging, @package_type = :test_jar, :jar }
- it 'should create package of type :jar and classifier \'test-jar\'' do
+ it 'should create package of type :jar and classifier \'tests\'' do
define 'foo', :version=>'1.0' do
package(:test_jar).type.should eql(:jar)
- package(:test_jar).classifier.should eql('test-jar')
+ package(:test_jar).classifier.should eql('tests')
package(:test_jar).name.should match(/foo-1.0-test-jar.jar$/)
end
end