Ensure that there are no trailing whitespaces on lines and that every file ends with a new line
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/13dc0b68 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/13dc0b68 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/13dc0b68 Branch: refs/heads/master Commit: 13dc0b68cac169cf57a171e938ed4b8685126cbd Parents: 936a9ab Author: Peter Donald <[email protected]> Authored: Mon Feb 20 09:41:27 2017 +1100 Committer: Peter Donald <[email protected]> Committed: Mon Feb 20 09:41:27 2017 +1100 ---------------------------------------------------------------------- addon/buildr/custom_pom.rb | 2 +- doc/settings_profiles.textile | 2 +- lib/buildr/core/build.rb | 2 +- lib/buildr/core/filter.rb | 2 +- lib/buildr/core/project.rb | 2 +- lib/buildr/java/ecj.rb | 4 ++-- lib/buildr/java/jruby.rb | 6 +++--- lib/buildr/java/rjb.rb | 10 +++++----- lib/buildr/packaging/artifact.rb | 28 ++++++++++++++-------------- lib/buildr/packaging/zip.rb | 4 ++-- lib/buildr/scala/bdd.rb | 2 +- lib/buildr/scala/compiler.rb | 4 ++-- lib/buildr/scala/tests.rb | 2 +- rakelib/release.rake | 2 +- spec/addon/jaxb_xjc_spec.rb | 1 - spec/core/application_spec.rb | 2 +- spec/core/common_spec.rb | 2 +- spec/core/project_spec.rb | 6 +++--- spec/core/test_spec.rb | 2 +- spec/core/transport_spec.rb | 6 +++--- spec/java/custom_pom_spec.rb | 6 +++--- spec/java/ecj_spec.rb | 4 ++-- spec/java/java_spec.rb | 2 +- spec/java/tests_spec.rb | 2 +- spec/packaging/artifact_spec.rb | 22 +++++++++++----------- spec/scala/bdd_spec.rb | 1 - spec/scala/compiler_spec.rb | 8 ++++---- spec/scala/doc_spec.rb | 1 - spec/scala/tests_spec.rb | 5 ++--- tests/generateFromPom/pom.xml | 8 ++++---- tests/helloWorldEcj/buildr.yml | 2 +- tests/integration_testing.rb | 6 +++--- 32 files changed, 77 insertions(+), 81 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/addon/buildr/custom_pom.rb ---------------------------------------------------------------------- diff --git a/addon/buildr/custom_pom.rb b/addon/buildr/custom_pom.rb index 885bfb8..b74add2 100644 --- a/addon/buildr/custom_pom.rb +++ b/addon/buildr/custom_pom.rb @@ -15,4 +15,4 @@ msg = "This extension is now included as part of the core Buildr library" raise msg if (Buildr::VERSION >= "1.6") -warn(msg) \ No newline at end of file +warn(msg) http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/doc/settings_profiles.textile ---------------------------------------------------------------------- diff --git a/doc/settings_profiles.textile b/doc/settings_profiles.textile index 59afa7f..746cc8d 100644 --- a/doc/settings_profiles.textile +++ b/doc/settings_profiles.textile @@ -81,7 +81,7 @@ repositories: remote: - https://intra.net/maven2 - http://example.com - + # specify the corporate mirror mirrors: - http://www.corporateserver001.com/repo http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/core/build.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/core/build.rb b/lib/buildr/core/build.rb index 365710f..309bae7 100644 --- a/lib/buildr/core/build.rb +++ b/lib/buildr/core/build.rb @@ -349,7 +349,7 @@ module Buildr #:nodoc: # the initial value of THIS_VERSION attr_accessor :this_version - + # :call-seq: # version_file() # Provides the file containing the version of the project. http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/core/filter.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/core/filter.rb b/lib/buildr/core/filter.rb index 8d62765..c0ef0cc 100644 --- a/lib/buildr/core/filter.rb +++ b/lib/buildr/core/filter.rb @@ -308,7 +308,7 @@ module Buildr #:nodoc: end self end - + BINARY_FILES = [ '*.png', '*.gif', '*.jpg', '*.jpeg' ] def is_binary?(content, path) http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/core/project.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/core/project.rb b/lib/buildr/core/project.rb index d74c81d..5a214f0 100644 --- a/lib/buildr/core/project.rb +++ b/lib/buildr/core/project.rb @@ -624,7 +624,7 @@ module Buildr #:nodoc: def define! @defined = true end - + # :call-seq: # base_dir = dir http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/java/ecj.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/java/ecj.rb b/lib/buildr/java/ecj.rb index ca33f6c..80220c7 100644 --- a/lib/buildr/java/ecj.rb +++ b/lib/buildr/java/ecj.rb @@ -17,9 +17,9 @@ module Buildr #:nodoc: module Compiler #:nodoc: class Ecj < Javac - + VERSION = "4.5.1" - + class << self # Current version of ECJ being used. def version http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/java/jruby.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/java/jruby.rb b/lib/buildr/java/jruby.rb index a36b03a..6929d75 100644 --- a/lib/buildr/java/jruby.rb +++ b/lib/buildr/java/jruby.rb @@ -75,19 +75,19 @@ module Java @classpath ||= begin classpath = [] class << classpath - + def new_add(*args) warn 'Java is already loaded' if Java.loaded? send(:old_add, *args) end - + alias_method :old_add, :<< alias_method :<<, :new_add end classpath end end - + # Returns true if the JVM is loaded with all the libraries loaded on the classpath. def loaded? @loaded http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/java/rjb.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/java/rjb.rb b/lib/buildr/java/rjb.rb index 26b02dc..21543b2 100644 --- a/lib/buildr/java/rjb.rb +++ b/lib/buildr/java/rjb.rb @@ -65,7 +65,7 @@ ENV_JAVA = {} # with a partial classpath, or before all remote repositories are listed. # 4. Check on a clean build with empty local repository. module Java - + module Package #:nodoc: def method_missing(sym, *args, &block) @@ -78,7 +78,7 @@ module Java end class << self - + # Returns the classpath, an array listing directories, JAR files and # artifacts. Use when loading the extension to add any additional # libraries used by that extension. @@ -89,19 +89,19 @@ module Java @classpath ||= begin classpath = [] class << classpath - + def new_add(*args) warn 'Java is already loaded' if Java.loaded? send(:old_add, *args) end - + alias_method :old_add, :<< alias_method :<<, :new_add end classpath end end - + # Returns true if the JVM is loaded with all the libraries loaded on the classpath. def loaded? @loaded http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/packaging/artifact.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/packaging/artifact.rb b/lib/buildr/packaging/artifact.rb index 95bdefd..f71c5f0 100644 --- a/lib/buildr/packaging/artifact.rb +++ b/lib/buildr/packaging/artifact.rb @@ -76,7 +76,7 @@ module Buildr #:nodoc: def snapshot? version =~ /-SNAPSHOT$/ end - + def final_version return version unless snapshot? Time.now.strftime("%Y%m%d.%H%M%S") @@ -157,7 +157,7 @@ module Buildr #:nodoc: end end end - + # :call-seq: # maven_metadata_xml => string # @@ -260,12 +260,12 @@ module Buildr #:nodoc: def group_path group.gsub('.', '/') end - + def upload_name return File.basename(name) unless snapshot? return File.basename(name).gsub(/SNAPSHOT/, "#{final_version}-1") end - + def extract_type(type) return :jar if type == :bundle type @@ -664,7 +664,7 @@ module Buildr #:nodoc: spec = Artifact.to_hash(spec) File.join(local, spec[:group].split('.'), spec[:id], spec[:version], Artifact.hash_to_file_name(spec)) end - + # :call-seq: # mirrors => Array # @@ -684,7 +684,7 @@ module Buildr #:nodoc: end @mirrors end - + # :call-seq: # remote = Array # remote = url @@ -733,20 +733,20 @@ module Buildr #:nodoc: end @remote end - + # :call-seq: # remote_uri => Array # # Returns an array of all the remote repositories as instances of URI # - # Supports + # Supports # * String urls: "http://example.com/repo"; # * URI: URI.parse( "http://example.com/repo"; ) # * Hash: { :url => "http://example.com/repo";, :user => "user", :pass => "pass" } # def remote_uri remote - + uris = [] @remote.each do |repo| case repo @@ -761,7 +761,7 @@ module Buildr #:nodoc: if ( username = (repo[:username] || repo['username'] || repo[:user] || repo['user']) ) uri.user = username end - + if ( password = (repo[:password] || repo['password'] || repo[:pass] || repo['pass']) ) uri.password = password end @@ -769,14 +769,14 @@ module Buildr #:nodoc: else fail( "Repository Hash format missing url: #{repo}" ) end - - when String then + + when String then uris << URI.parse(repo) - else + else fail( "Unsupported Repository format: #{repo}" ) end end - + uris end http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/packaging/zip.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/packaging/zip.rb b/lib/buildr/packaging/zip.rb index 3f2dfc7..779a295 100644 --- a/lib/buildr/packaging/zip.rb +++ b/lib/buildr/packaging/zip.rb @@ -40,9 +40,9 @@ module Zip #:nodoc: write_e_o_c_d(io, offset, cdir_size) end end - + class File - + # :call-seq: # exist() => boolean # http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/scala/bdd.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/scala/bdd.rb b/lib/buildr/scala/bdd.rb index ad13663..edc1358 100644 --- a/lib/buildr/scala/bdd.rb +++ b/lib/buildr/scala/bdd.rb @@ -53,7 +53,7 @@ module Buildr::Scala #:nodoc: end end end - + def type if Buildr::Scala.version < "2.11" "jar" http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/scala/compiler.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/scala/compiler.rb b/lib/buildr/scala/compiler.rb index 6257817..dcaa8e3 100644 --- a/lib/buildr/scala/compiler.rb +++ b/lib/buildr/scala/compiler.rb @@ -65,7 +65,7 @@ module Buildr::Scala def version_without_build version.split('-')[0] end - + # returns Scala version without tiny number. # e.g. "2.11.8" => "2.11" def version_major_minor @@ -187,7 +187,7 @@ module Buildr::Scala def initialize(project, options) #:nodoc: super # use common options also for javac - + options[:javac] ||= Buildr::Compiler::Javac::OPTIONS.inject({}) do |hash, option| hash[option] = options[option] hash http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/lib/buildr/scala/tests.rb ---------------------------------------------------------------------- diff --git a/lib/buildr/scala/tests.rb b/lib/buildr/scala/tests.rb index 918a233..5ebb17c 100644 --- a/lib/buildr/scala/tests.rb +++ b/lib/buildr/scala/tests.rb @@ -113,7 +113,7 @@ module Buildr::Scala#:nodoc: "org.scalatest:scalatest:jar:#{version}" elsif Buildr::Scala.version < "2.11" "org.scalatest:scalatest_#{Buildr::Scala.version_without_build}:jar:#{version}" - else + else "org.scalatest:scalatest_#{Buildr::Scala.version_major_minor}:jar:#{version}" end end http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/rakelib/release.rake ---------------------------------------------------------------------- diff --git a/rakelib/release.rake b/rakelib/release.rake index 6f6a3cf..825b2e4 100644 --- a/rakelib/release.rake +++ b/rakelib/release.rake @@ -18,7 +18,7 @@ RC_VERSION = ENV['RC_VERSION'] || "" desc 'Release the next version of buildr from existing staged repository' task 'release' do |task, args| user = args.user || ENV['user'] || `whoami` - + # First, we need to get all the staged files from Apache to _release. mkpath '_release' lambda do http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/addon/jaxb_xjc_spec.rb ---------------------------------------------------------------------- diff --git a/spec/addon/jaxb_xjc_spec.rb b/spec/addon/jaxb_xjc_spec.rb index 851b7b4..da4ea67 100644 --- a/spec/addon/jaxb_xjc_spec.rb +++ b/spec/addon/jaxb_xjc_spec.rb @@ -123,4 +123,3 @@ describe Buildr::JaxbXjc do end end end - http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/core/application_spec.rb ---------------------------------------------------------------------- diff --git a/spec/core/application_spec.rb b/spec/core/application_spec.rb index 05842ec..905008a 100644 --- a/spec/core/application_spec.rb +++ b/spec/core/application_spec.rb @@ -33,7 +33,7 @@ describe Buildr::Application do before(:each) do FileUtils.touch 'Buildfile' end - + it 'should execute *_load methods in order' do order = [:load_gems, :load_artifact_ns, :load_tasks, :raw_load_buildfile] order.each { |method| Buildr.application.should_receive(method).ordered } http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/core/common_spec.rb ---------------------------------------------------------------------- diff --git a/spec/core/common_spec.rb b/spec/core/common_spec.rb index e9ceb31..c62850a 100644 --- a/spec/core/common_spec.rb +++ b/spec/core/common_spec.rb @@ -401,7 +401,7 @@ describe Buildr::Filter do read(file).should eql("#{File.basename(file)} with value1 and value2") end end - + it 'should not apply filters to binary files' do ["jpg", "jpeg", "gif", "png"].each { |ext| write "images/file.#{ext}", 'something' } filter = @filter.from('images').into('target').using('key1'=>'value1', 'key2'=>'value2') http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/core/project_spec.rb ---------------------------------------------------------------------- diff --git a/spec/core/project_spec.rb b/spec/core/project_spec.rb index 0be54b8..5902edd 100644 --- a/spec/core/project_spec.rb +++ b/spec/core/project_spec.rb @@ -336,7 +336,7 @@ describe Rake::Task, ' recursive' do @order end recursive_task('doda') { project('foo').order << 'foo' } - define('bar') { + define('bar') { recursive_task('doda') { project('foo').order << 'foo:bar' } define('baz') { recursive_task('doda') { project('foo').order << 'foo:bar:baz' } @@ -578,7 +578,7 @@ end describe Rake::Task, ' local directory' do before do @task = Project.local_task(task(('doda'))) - + end it 'should execute project in local directory' do @@ -601,7 +601,7 @@ describe Rake::Task, ' local directory' do task('doda') { |task| @task.from project.name } define 'bar' } - + in_original_dir('../not_foo') { @task.invoke } end http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/core/test_spec.rb ---------------------------------------------------------------------- diff --git a/spec/core/test_spec.rb b/spec/core/test_spec.rb index 17c2ac4..94ad679 100644 --- a/spec/core/test_spec.rb +++ b/spec/core/test_spec.rb @@ -604,7 +604,7 @@ describe Buildr::Project, '#test.resources' do define('foo') do layout[:target] = _('targeted') end.test.invoke - + file('targeted/test/resources/config.xml').should contain('</xml>') end http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/core/transport_spec.rb ---------------------------------------------------------------------- diff --git a/spec/core/transport_spec.rb b/spec/core/transport_spec.rb index 88fc434..d00c46b 100644 --- a/spec/core/transport_spec.rb +++ b/spec/core/transport_spec.rb @@ -246,7 +246,7 @@ describe URI::HTTP, '#read' do @http.should_receive(:use_ssl=).with(true) URI(@uri.to_s.sub(/http/, 'https')).read end - + it 'should use custom SSL CA certificates if provided through the environment variable SSL_CA_CERTS' do ENV['SSL_VERIFY_MODE'] = 'VERIFY_PEER' Net::HTTP.should_receive(:new).with(@host_domain, 443).and_return(@http) @@ -254,7 +254,7 @@ describe URI::HTTP, '#read' do @http.should_receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER) URI(@uri.to_s.sub(/http/, 'https')).read end - + it 'should use custom verify mode if provided through the environment variable SSL_VERIFY_MODE' do ENV['SSL_CA_CERTS'] = 'tmp/certs' Net::HTTP.should_receive(:new).with(@host_domain, 443).and_return(@http) @@ -420,7 +420,7 @@ describe URI::HTTP, '#write' do end @uri.write @content end - + it 'should set User-Agent header' do @http.should_receive(:request) do |request| request['User-Agent'].should == "Buildr-#{Buildr::VERSION}" http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/java/custom_pom_spec.rb ---------------------------------------------------------------------- diff --git a/spec/java/custom_pom_spec.rb b/spec/java/custom_pom_spec.rb index 4bcfea5..ff74b03 100644 --- a/spec/java/custom_pom_spec.rb +++ b/spec/java/custom_pom_spec.rb @@ -145,7 +145,7 @@ describe Buildr::CustomPom do verify_dependency(@pom_xml, 'id-test', 'group', '1.0', 'test', nil) end end - + describe 'with a multi-module project' do before do write 'foo/src/main/java/Foo.java', 'public class Foo {}' @@ -161,10 +161,10 @@ describe Buildr::CustomPom do end end task('package').invoke - + @pom_xml = project_pom_xml(project('myproject:bar')) end - + it 'should add foo to the dependencies of bar\'s pom.xml' do verify_dependency(@pom_xml, 'myproject-foo', 'group', '1.0', nil, nil) end http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/java/ecj_spec.rb ---------------------------------------------------------------------- diff --git a/spec/java/ecj_spec.rb b/spec/java/ecj_spec.rb index 2a964f9..41150cd 100644 --- a/spec/java/ecj_spec.rb +++ b/spec/java/ecj_spec.rb @@ -75,7 +75,7 @@ describe 'ecj compiler' do file('target/classes/DependencyTest.class').should exist end end - + it 'should include tools.jar dependency' do repositories.remote << "http://repo1.maven.org/maven2/"; write 'src/main/java/UseJarSigner.java', <<-JAVA @@ -290,7 +290,7 @@ describe 'ecj compiler options' do } redirect_java_err { foo.compile.invoke }.should match(/warning/) end - + it 'should pick Ecj version from ecj build settings' do begin Buildr::Compiler::Ecj.instance_eval { @dependencies = nil } http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/java/java_spec.rb ---------------------------------------------------------------------- diff --git a/spec/java/java_spec.rb b/spec/java/java_spec.rb index ade6619..d3de84b 100644 --- a/spec/java/java_spec.rb +++ b/spec/java/java_spec.rb @@ -127,4 +127,4 @@ describe 'Java#java' do after do ENV['JAVA_HOME'] = @old_home end -end \ No newline at end of file +end http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/java/tests_spec.rb ---------------------------------------------------------------------- diff --git a/spec/java/tests_spec.rb b/spec/java/tests_spec.rb index 93fc835..4acbd99 100644 --- a/spec/java/tests_spec.rb +++ b/spec/java/tests_spec.rb @@ -415,7 +415,7 @@ describe Buildr::TestNG do project('foo').test.compile.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}")) project('foo').test.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}")) end - + it 'should parse test classes in paths containing escaped sequences' do write 'bar%2F/src/test/java/com/example/AnnotatedClass.java', <<-JAVA package com.example; http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/packaging/artifact_spec.rb ---------------------------------------------------------------------- diff --git a/spec/packaging/artifact_spec.rb b/spec/packaging/artifact_spec.rb index 47f561a..783eba0 100644 --- a/spec/packaging/artifact_spec.rb +++ b/spec/packaging/artifact_spec.rb @@ -217,14 +217,14 @@ describe Repositories, 'remote_uri' do @repos = [ 'https://oss.sonatype.org/', 'http://www.ibiblio.org/maven2', { :url => 'http://repo1.maven.org/maven2', :username => 'user', :password => 'password' } ] end - + it 'should convert remote to array of uri' do uri = URI.parse( 'http://repo1.maven.org/maven2' ) - uri.user = 'user' + uri.user = 'user' uri.password = 'password' - + uris = [ URI.parse( 'https://oss.sonatype.org/'), URI.parse( 'http://www.ibiblio.org/maven2' ), uri ] - + repositories.remote = @repos repositories.remote_uri.should eql(uris) end @@ -235,10 +235,10 @@ describe Repositories, 'mirrors' do Buildr.repositories.instance_eval do @local = @remote = @release_to = @mirrors = nil end - + @repos = [ 'http://www.ibiblio.org/maven2', 'http://repo1.maven.org/maven2' ] end - + it 'should be empty initially' do repositories.mirrors.should be_empty end @@ -247,7 +247,7 @@ describe Repositories, 'mirrors' do repositories.mirrors = @repos.first repositories.mirrors.should eql([@repos.first]) end - + it 'should be settable from array' do repositories.mirrors = @repos repositories.mirrors.should eql(@repos) @@ -257,12 +257,12 @@ describe Repositories, 'mirrors' do @repos.each { |url| repositories.mirrors << url } repositories.mirrors.should eql(@repos) end - + it 'should log that it is overridding the remote repositories with the mirrors' do @repos.each { |url| repositories.mirrors << url } lambda { repositories.remote }.should show_info /Remote repositories overridden by mirrors / end - + it 'should load with all repositories specified in settings file' do write 'home/.buildr/settings.yaml', <<-YAML repositories: @@ -998,7 +998,7 @@ end describe ActsAsArtifact, '#upload' do - + it 'should be used to upload artifact' do artifact = artifact('com.example:library:jar:2.0') # Prevent artifact from downloading anything. @@ -1027,7 +1027,7 @@ describe ActsAsArtifact, '#upload' do write repositories.locate(artifact.pom) lambda { artifact.upload }.should raise_error(Exception, /where to upload/) end - + it 'should upload SNAPSHOT with timestamped unique version and maven metadata' do artifact = artifact('com.example:library:jar:2.0-SNAPSHOT') # Prevent artifact from downloading anything. http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/scala/bdd_spec.rb ---------------------------------------------------------------------- diff --git a/spec/scala/bdd_spec.rb b/spec/scala/bdd_spec.rb index 25167ab..8f91b7f 100644 --- a/spec/scala/bdd_spec.rb +++ b/spec/scala/bdd_spec.rb @@ -118,4 +118,3 @@ describe Buildr::Scala::Specs2 do project('foo').test.failed_tests.should include('StringSpecs$') end end - http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/scala/compiler_spec.rb ---------------------------------------------------------------------- diff --git a/spec/scala/compiler_spec.rb b/spec/scala/compiler_spec.rb index f28bbe6..509d567 100644 --- a/spec/scala/compiler_spec.rb +++ b/spec/scala/compiler_spec.rb @@ -155,7 +155,7 @@ share_as :ScalacCompiler_CommonOptions do compile_task.using(:warnings=>false) scalac_args.should include('-nowarn') end - + it 'should pass options to javac' do compile_task.using(:warnings=>false) javac_args.should include('-nowarn') @@ -307,7 +307,7 @@ describe 'scala compiler 2.9 options' do def scalac_args compile_task.instance_eval { @compiler }.send(:scalac_args) end - + def javac_args compile_task.instance_eval { @compiler }.instance_eval { @java }.send(:javac_args) end @@ -344,7 +344,7 @@ describe 'zinc compiler (enabled through Buildr.settings)' do compiler.should_receive(:compile_with_zinc).once compile_task.invoke end - + it_should_behave_like ScalacCompiler after :each do @@ -365,4 +365,4 @@ describe 'zinc compiler (enabled through project.scala_options)' do compiler.should_receive(:compile_with_zinc).once compile_task.invoke end -end \ No newline at end of file +end http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/scala/doc_spec.rb ---------------------------------------------------------------------- diff --git a/spec/scala/doc_spec.rb b/spec/scala/doc_spec.rb index 30cb58e..b9462fc 100644 --- a/spec/scala/doc_spec.rb +++ b/spec/scala/doc_spec.rb @@ -88,4 +88,3 @@ describe "package(:scaladoc)" do scaladoc.should contain('Foo.html') end end - http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/spec/scala/tests_spec.rb ---------------------------------------------------------------------- diff --git a/spec/scala/tests_spec.rb b/spec/scala/tests_spec.rb index 175dcab..03e6404 100644 --- a/spec/scala/tests_spec.rb +++ b/spec/scala/tests_spec.rb @@ -208,9 +208,9 @@ describe Buildr::Scala::ScalaTest do import org.scalatest._ import org.scalatest.fixture.FunSuite import org.scalatest.fixture.ConfigMapFixture - + class PropertyTestSuite extends FunSuite with ConfigMapFixture { - + test("testProperty") { (configMap: Map[String, Any]) => assert(configMap("name") === "value") } @@ -283,4 +283,3 @@ describe Buildr::Scala::ScalaTest do end end - http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/tests/generateFromPom/pom.xml ---------------------------------------------------------------------- diff --git a/tests/generateFromPom/pom.xml b/tests/generateFromPom/pom.xml index d81d17e..7a8f5ec 100644 --- a/tests/generateFromPom/pom.xml +++ b/tests/generateFromPom/pom.xml @@ -115,10 +115,10 @@ <version>3.8.2</version> </dependency> <!-- Unfortunately, untill http://jira.springframework.org/browse/OSGI-564 - is resolved we can't use BRITS provided Log4J and have to rely on + is resolved we can't use BRITS provided Log4J and have to rely on dependancy specified by Spring-DM 1.2.0-m1. Once this bug is fixed, we can switch to BRITS on this dependancy --> - <!-- + <!-- <dependency> <groupId>org.apache.log4j</groupId> <artifactId>com.springsource.org.apache.log4j</artifactId> @@ -250,7 +250,7 @@ </artifactId> <version>1.8.0</version> </dependency> - <!-- + <!-- <dependency> <groupId>org.apache.myfaces</groupId> <artifactId> @@ -300,7 +300,7 @@ </name> <url>http://repository.springsource.com/maven/bundles/external</url> </repository> -<repository> +<repository> <id>com.springsource.repository.bundles.release</id> <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name> <url>http://repository.springsource.com/maven/bundles/release</url> http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/tests/helloWorldEcj/buildr.yml ---------------------------------------------------------------------- diff --git a/tests/helloWorldEcj/buildr.yml b/tests/helloWorldEcj/buildr.yml index 5a9e574..195a884 100644 --- a/tests/helloWorldEcj/buildr.yml +++ b/tests/helloWorldEcj/buildr.yml @@ -1 +1 @@ -ecj: 3.5.1 \ No newline at end of file +ecj: 3.5.1 http://git-wip-us.apache.org/repos/asf/buildr/blob/13dc0b68/tests/integration_testing.rb ---------------------------------------------------------------------- diff --git a/tests/integration_testing.rb b/tests/integration_testing.rb index 41d8ce3..7fa62d5 100644 --- a/tests/integration_testing.rb +++ b/tests/integration_testing.rb @@ -82,14 +82,14 @@ assert(!zip.get_entry("lib/logging.jar").nil?) %x[cd #{TEST_DIR}/package_war_as_jar ; #{BUILDR} clean] assert($?.success?) CHECK - + test "generateFromPom", "--generate pom.xml", <<-CHECK assert(File.exist? "#{TEST_DIR}/generateFromPom/buildfile") assert(File.read("#{TEST_DIR}/generateFromPom/buildfile") !~ /slf4j.version/) CHECK - + test "generateFromPom2", "--generate pom.xml" # For BUILDR-623 end - + end
