buildr 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5793f6715926b79b32bc1180ee678793f5c74381
-  data.tar.gz: 8b9eeca272be9fbae824af95f337351fff00e918
+  metadata.gz: d67dd46fbdf81e1fe12d3b8ffcb72c2e96e0b22d
+  data.tar.gz: 59ae296c6f6b71eb2809321cb85bc32131b78f40
 SHA512:
-  metadata.gz: 920e4c8172dba2e8ffaf171ca9f0796f2f69922ebc8604537df9d608d8369f78df06fdf6354ede65c13dab29a8fa09360874e66b5f09da8e0d5da52dfc00d007
-  data.tar.gz: 84bab48c5276a0f9203b3748dab5ff3b144dc25deb33b2436fd99103767c7e5f5b77101c37305512c91bd838516487a6525799cad020343dc561307e7a2e4809
+  metadata.gz: b7653245fee7e7f36845215e527e7cc817f05461a96c1ba0c2704c35ca74c21235eee56fc8106fbc39209295c18074b283301798601075c96de16603e4b35e59
+  data.tar.gz: f230b9cdb35686dd281540108416cb54bc2ec1009e5cc6ec7db20f23c5a9e391d9a621d64445286db23cf9495ba3772d9c28a6d6cd1891d49e528a07022086f4

data/CHANGELOG

@@ -1,3 +1,23 @@
+1.5.7 (2019-02-16)
+* Fixed:  The fix that allowed special characters in usernames and passwords was only partially applied
+          in the `1.5.6` release. The complete fix that correctly decoded usernames and passwords before
+          passing them to HTTP library is now been applied.
+* Change: GWT Addon: Added support for `:skip_merge_gwt_dependencies` parameter that makes it possible to
+          avoid adding GWT dependencies to the project directly and thus the associated POM. This will be
+          required to support GWT3.x and GWT2.x simultaneously as well as making it easier to manage
+          dependencies in the POMs.
+* Change: Javadoc: If the user does not supply an explicit `:sourcepath` to the doc/javadoc tool then
+          default the value to `project.compile.sources`. This will stop javadoc from scanning the classpath
+          for `*.java` files which can cause issues with projects that include `sources` classifier artifacts
+          on the classpath. This is particularly relevant for GWT based projects that include artifacts with
+          source embedded in the artifacts. This change also made it possible to remove an ugly hack in the
+          GWT addon that removed the gwt artifacts from the javadoc path.
+* Change: Drop deprecated Gem::Specification#has_rdoc= (no replacement) method. Submitted by Olle Jonsson.
+* Change: Use https protocol to access Gem metadata. Submitted by Olle Jonsson.
+* Change: Change RSpec shared_context usage to avoid warnings. Submitted by Olle Jonsson.
+* Change: Migrated source control to Apache GitBox which supports using either GitHub or GitBox as the
+          master repository.
+
 1.5.6 (2018-05-10)
 * Fixed:  Ensure that the username and passwords declared for repositories are correctly url encoded for
           the upload repositories when converted to a URL. (i.e. Ensure `Buildr.repositories.release_to`

data/README.rdoc

@@ -28,8 +28,8 @@ http://buildr.apache.org/
 === RTFM
 
 * Buildr documentation: http://buildr.apache.org
-* More about Rake: http://docs.rubyrake.org
-* Antwrap documentation: http://antwrap.rubyforge.org
+* More about Rake: https://github.com/ruby/rake
+* Antwrap documentation: https://rubygems.org/gems/Antwrap
 
 
 === Mailing list

data/Rakefile

@@ -30,7 +30,7 @@ end
 
 # Load the Gem specification for the current platform (Ruby or JRuby).
 def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
-  @specs ||= ['ruby', 'java', 'x86-mswin32'].inject({}) { |hash, spec_platform|
+  @specs ||= %w(ruby java x86-mswin32).inject({}) { |hash, spec_platform|
     ENV['BUILDR_PLATFORM'] = spec_platform
     hash.update(spec_platform=> Gem::Specification.load('buildr.gemspec'))
     Gem::Specification._clear_load_cache

data/addon/buildr/gwt.rb

@@ -236,11 +236,6 @@ module Buildr
     module ProjectExtension
       include Extension
 
-      after_define(:doc) do |project|
-        # Remove gwt artifacts when performing javadocs as the gwt jars have invalid source files
-        project.doc.classpath.delete_if { |f| f.to_s =~ /.*\/com\/google\/gwt\/gwt-.*/ }
-      end
-
       first_time do
         desc 'Run C22 to GSS converter. Set css files via environment variable CSS_FILES'
         task('css2gss') do
@@ -274,8 +269,10 @@ module Buildr
         Buildr::GWT.dependencies(version).each do |d|
           a = artifact(d)
           a.invoke if a.respond_to?(:invoke)
-          project.iml.main_dependencies << a unless !project.iml? || existing_deps.include?(a.to_s)
-          project.compile.dependencies << a unless existing_deps.include?(a.to_s)
+          unless options[:skip_merge_gwt_dependencies]
+            project.iml.main_dependencies << a unless !project.iml? || existing_deps.include?(a.to_s)
+            project.compile.dependencies << a unless existing_deps.include?(a.to_s)
+          end
           additional_gwt_deps << a
         end
 

data/buildr.buildfile

@@ -48,7 +48,6 @@ define 'buildr' do
       spec.author             = 'Apache Buildr'
       spec.email              = 'users@buildr.apache.org'
       spec.homepage           = "http://buildr.apache.org"
-      spec.rubyforge_project  = 'buildr'
       spec.extra_rdoc_files   = legal
       spec.rdoc_options << '--webcvs' << 'https://github.com/apache/buildr'
       spec.add_dependency 'buildr', '~> 1.3'

data/doc/_layouts/default.html

@@ -47,7 +47,7 @@
           <li>Reference
             <ol class="toc">
               <li><a href='rdoc/Buildr.html'>API</a></li>
-              <li><a href='http://docs.rubyrake.org'>Rake</a></li>
+              <li><a href='https://github.com/ruby/rake'>Rake</a></li>
               <li><a href='https://rubygems.org/gems/Antwrap'>Antwrap</a></li>
               <li><a href='http://cwiki.apache.org/confluence/display/BUILDR/Common+Problems+and+Solutions'>Troubleshooting</a></li>
             </ol>

data/doc/download.textile

@@ -18,16 +18,28 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2(#dist).  Binaries and Source Code
 
+h3. buildr 1.5.6 (2018-05-10)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.5.6.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6.gem | "3836a2bb86692ca353ccc9ed6c4a618d":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.gem.asc |
+| "buildr-1.5.6-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6-java.gem | "68879b787705d8c3222b80cab5416e99":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-java.gem.asc |
+| "buildr-1.5.6-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem | "c0c65b86f422e7bb8c8f3bba00af4ec2":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6-x86-mswin32.gem.asc |
+| "buildr-1.5.6.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6.tgz | "b17855a2f439c042bd6c94c85454ddce":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.tgz.asc |
+| "buildr-1.5.6.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.6/buildr-1.5.6.zip | "4fcd9603070374b93f7db69fdef1ed83":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.6/buildr-1.5.6.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.6/KEYS)
+
+
 h3. buildr 1.5.5 (2017-12-06)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.5.5.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5.gem | "8bd720d1c4c96f5904c09b70c95aede3":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem.asc |
-| "buildr-1.5.5-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5-java.gem | "8c009622ed7c9b1bbc576c5df298d9df":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem.asc |
-| "buildr-1.5.5-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem | "04f7af088b3ec99cdf72c58ea7c3ee67":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem.asc |
-| "buildr-1.5.5.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5.tgz | "1aab23f1cd19bcbd3c8f48afb488e8ff":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz.asc |
-| "buildr-1.5.5.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.5/buildr-1.5.5.zip | "9d1f076927cc2f565875c7f38e5afe69":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip.asc |
+| "buildr-1.5.5.gem":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem | "8bd720d1c4c96f5904c09b70c95aede3":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.gem.asc |
+| "buildr-1.5.5-java.gem":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem | "8c009622ed7c9b1bbc576c5df298d9df":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-java.gem.asc |
+| "buildr-1.5.5-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem | "04f7af088b3ec99cdf72c58ea7c3ee67":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5-x86-mswin32.gem.asc |
+| "buildr-1.5.5.tgz":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz | "1aab23f1cd19bcbd3c8f48afb488e8ff":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.tgz.asc |
+| "buildr-1.5.5.zip":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip | "9d1f076927cc2f565875c7f38e5afe69":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.5/buildr-1.5.5.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.5/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.5.5/KEYS)
 
 
 h3. buildr 1.5.4 (2017-11-29)

data/doc/index.textile

@@ -46,6 +46,24 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
+Highlights from Buildr 1.5.7 (2019-02-16)
+* Fixed:  The fix that allowed special characters in usernames and passwords was only partially applied
+          in the `1.5.6` release. The complete fix that correctly decoded usernames and passwords before
+          passing them to HTTP library is now been applied.
+* Change: GWT Addon: Added support for `:skip_merge_gwt_dependencies` parameter that makes it possible to
+          avoid adding GWT dependencies to the project directly and thus the associated POM. This will be
+          required to support GWT3.x and GWT2.x simultaneously as well as making it easier to manage
+          dependencies in the POMs.
+* Change: Javadoc: If the user does not supply an explicit `:sourcepath` to the doc/javadoc tool then
+          default the value to `project.compile.sources`. This will stop javadoc from scanning the classpath
+          for `*.java` files which can cause issues with projects that include `sources` classifier artifacts
+          on the classpath. This is particularly relevant for GWT based projects that include artifacts with
+          source embedded in the artifacts. This change also made it possible to remove an ugly hack in the
+          GWT addon that removed the gwt artifacts from the javadoc path.
+* Change: Drop deprecated Gem::Specification#has_rdoc= (no replacement) method. Submitted by Olle Jonsson.
+* Change: Use https protocol to access Gem metadata. Submitted by Olle Jonsson.
+* Change: Change RSpec shared_context usage to avoid warnings. Submitted by Olle Jonsson.
+
 Highlights from Buildr 1.5.6 (2018-05-10)
 * Fixed:  Ensure that the username and passwords declared for repositories are correctly url encoded for
           the upload repositories when converted to a URL. (i.e. Ensure `Buildr.repositories.release_to`

data/doc/installing.textile

@@ -27,7 +27,7 @@ If you are running behind a proxy server, make sure the environment variable @HT
 
 <br>
 
-*In details:* The @gem install@ and @gem update@ commands install Buildr from a binary distribution provided through "RubyForge":http://rubyforge.org/projects/buildr. This distribution is maintained by contributors to this project, but is *not* an official Apache distribution.  You can obtain the official Apache distribution files from the "download page":download.html.
+*In details:* The @gem install@ and @gem update@ commands install Buildr from a binary distribution provided through "RubyGems":https://rubygems.org/gems/buildr. This distribution is maintained by contributors to this project, but is *not* an official Apache distribution.  You can obtain the official Apache distribution files from the "download page":download.html.
 
 Older versions of RubyGems are all kind of fail.  You want to avoid these unless you have the patience to install each Buildr dependency manually.  Get RubyGems 1.3.1 or later, and when using Debian packages (e.g. Ubuntu), make sure to get the unmolested RubyGems straight form the source.
 
@@ -287,7 +287,7 @@ h2(#more). Learning More
 
 For a quicker read (and much more humor), "Why’s (Poignant) Guide to Ruby":http://poignantguide.net/ruby/ is available online.  More resources are listed on the "ruby-lang web site":http://www.ruby-lang.org/en/documentation/.
 
-*Rake* Buildr is based on Rake, a Ruby build system that handles tasks and dependencies.  Check out the "Rake documentation":http://docs.rubyrake.org/ for more information.
+*Rake* Buildr is based on Rake, a Ruby build system that handles tasks and dependencies.  Check out the "Rake documentation":https://github.com/ruby/rake for more information.
 
 *AntWrap* Buildr uses AntWrap, for configuring and running Ant tasks.  You can learn more from the "Antwrap documentation":https://rubygems.org/gems/Antwrap.
 

data/lib/buildr/core/project.rb

@@ -127,7 +127,7 @@ module Buildr #:nodoc:
   #   buildr compile
   # from the command line, it will execute the compile task of the current project.
   #
-  # Projects and sub-projects follow a directory heirarchy. The Buildfile is assumed to
+  # Projects and sub-projects follow a directory hierarchy. The Buildfile is assumed to
   # reside in the same directory as the top-level project, and each sub-project is
   # contained in a sub-directory in the same name. For example:
   #   /home/foo
@@ -223,7 +223,7 @@ module Buildr #:nodoc:
           end
 
           # Top-level project? Invoke the project definition. Sub-project? We don't invoke
-          # the project definiton yet (allow project calls to establish order of evaluation),
+          # the project definition yet (allow project calls to establish order of evaluation),
           # but must do so before the parent project's definition is done.
           project.parent.enhance { project.invoke } if project.parent
         end

data/lib/buildr/core/transports.rb

@@ -335,7 +335,7 @@ module URI
         end
         headers = { 'Content-MD5'=>Digest::MD5.hexdigest(content.string), 'Content-Type'=>'application/octet-stream', 'User-Agent'=>"Buildr-#{Buildr::VERSION}" }
         request = Net::HTTP::Put.new(request_uri.empty? ? '/' : request_uri, headers)
-        request.basic_auth self.user, self.password if self.user
+        request.basic_auth URI.decode(self.user), URI.decode(self.password) if self.user
         response = nil
         with_progress_bar options[:progress], path.split('/').last, content.size do |progress|
           request.content_length = content.size

data/lib/buildr/java/doc.rb

@@ -61,6 +61,7 @@ module Buildr #:nodoc:
           end
         [:sourcepath, :classpath].each do |option|
           Array(options[option]).flatten.tap do |paths|
+            paths = project.compile.sources if :sourcepath == option && options[option].nil?
             cmd_args << "-#{option}" << paths.flatten.map(&:to_s).join(File::PATH_SEPARATOR) unless paths.empty?
           end
         end

data/lib/buildr/java/tests.rb

@@ -292,7 +292,7 @@ module Buildr #:nodoc:
 
       def dependencies
         return ["org.testng:testng:jar:jdk15:#{version}"] + JMock.dependencies if version < '6.0'
-        ["org.testng:testng:jar:#{version}",'com.beust:jcommander:jar:1.27'] + JMock.dependencies
+        %W(org.testng:testng:jar:#{version} com.beust:jcommander:jar:1.27) + JMock.dependencies
       end
     end
 
@@ -309,11 +309,11 @@ module Buildr #:nodoc:
       cmd_args << '-log' << '2'
       cmd_args << '-d' << task.report_to.to_s
       exclude_args = options[:excludegroups] || []
-      if !exclude_args.empty?
+      unless exclude_args.empty?
         cmd_args << '-excludegroups' << exclude_args.join(',')
       end
       groups_args = options[:groups] || []
-      if !groups_args.empty?
+      unless groups_args.empty?
         cmd_args << '-groups' << groups_args.join(',')
       end
       # run all tests in the same suite
@@ -376,7 +376,7 @@ module Buildr #:nodoc:
     def dependencies #:nodoc:
       unless @dependencies
         @dependencies = TestFramework::Java.dependencies
-        @dependencies += @frameworks.map { |f| f.dependencies }.flatten
+        @dependencies += @frameworks.map(&:dependencies).flatten
       end
       @dependencies
     end

data/lib/buildr/packaging/artifact_namespace.rb

@@ -130,7 +130,7 @@ module Buildr #:nodoc:
   # Sometimes users would need to change the default artifact versions used by some
   # module, for example, the XMLBeans compiler needs this, because of compatibility
   # issues. Another example would be to select the groovy version to use on all our
-  # projects so that Buildr modules requiring groovy jars can use user prefered versions.
+  # projects so that Buildr modules requiring groovy jars can use user preferred versions.
   #
   # To meet this goal, an ArtifactNamespace allows to specify ArtifactRequirement objects.
   # In fact the only difference with the examples you have already seen is that requirements
@@ -194,7 +194,7 @@ module Buildr #:nodoc:
   #
   # A more advanced example using ArtifactRequirement listeners is included
   # in the artifact_namespace_spec.rb description for 'Extension using ArtifactNamespace'
-  # That's it for addon writers, now, users can select their prefered version with
+  # That's it for addon writers, now, users can select their preferred version with
   # something like:
   #
   #    require 'buildr/xmlbeans'
@@ -413,7 +413,7 @@ module Buildr #:nodoc:
       # The last part consist of a VersionRequirement.
       #                                     ->  ( >2 & <4)
       #
-      # VersionRequirement supports RubyGem's comparision operators
+      # VersionRequirement supports RubyGem's comparison operators
       # in adition to parens, logical and, logical or and negation.
       # See the docs for VersionRequirement for more info on operators.
       def initialize(spec)

data/lib/buildr/packaging/gems.rb

@@ -65,7 +65,6 @@ module Buildr #:nodoc:
           spec.name = id
           spec.version = version.gsub('-','.') # RubyGems doesn't like '-' in version numbers
           spec.summary = full_comment
-          spec.has_rdoc = true
           spec.rdoc_options << '--title' << comment
           spec.require_path = 'lib'
         end

data/lib/buildr/version.rb

@@ -14,5 +14,5 @@
 # the License.
 
 module Buildr #:nodoc:
-  VERSION = '1.5.6'.freeze
+  VERSION = '1.5.7'.freeze
 end

data/rakelib/rspec.rake

@@ -36,6 +36,7 @@ RSpec::Core::RakeTask.new :spec => ['_reports', :compile] do |task|
   ENV['USE_FSC'] = 'no'
   files = FileList['spec/**/*_spec.rb']
   files = files.delete_if {|f| f =~ /^spec\/groovy\//} if RUBY_PLATFORM[/java/]
+  task.rspec_path = 'bundle exec rspec'
   task.rspec_files = files
   task.rspec_opts = %w{--order random:123 --format html --out _reports/specs.html --backtrace}
 end

data/spec/core/build_spec.rb

@@ -16,7 +16,7 @@
 
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
-shared_examples_for 'local task' do
+RSpec.shared_examples 'local task' do
   it "should execute task for project in current directory" do
     define 'foobar'
     lambda { @task.invoke }.should run_task("foobar:#{@task.name}")
@@ -387,7 +387,7 @@ describe Release do
 end
 
 
-shared_examples_for 'a release process' do
+RSpec.shared_examples 'a release process' do
 
   describe '#make' do
     before do

data/spec/core/checks_spec.rb

@@ -343,7 +343,7 @@ end
 
 describe Buildr::Checks::Expectation do
 
-  shared_examples_for 'all archive types' do
+  RSpec.shared_examples 'all archive types' do
 
     before do
       archive = @archive

data/spec/core/compile_spec.rb

@@ -141,7 +141,7 @@ describe Buildr::CompileTask, '#compiler' do
     end
   end
 
-  it 'should allow supressing compilation' do
+  it 'should allow suppressing compilation' do
     write 'src/main/java/package/Test.java', 'class Test {}'
     define 'foo' do
       compile.sources.clear
@@ -428,7 +428,7 @@ describe Buildr::CompileTask, '#invoke' do
 end
 
 
-shared_examples_for 'accessor task' do
+RSpec.shared_examples 'accessor task' do
   it 'should return a task' do
     define('foo').send(@task_name).should be_kind_of(Rake::Task)
   end

data/spec/core/shell_spec.rb

@@ -102,7 +102,7 @@ describe Project, '.shell' do
   end
 end
 
-shared_examples_for "shell provider" do
+RSpec.shared_examples "shell provider" do
 
   it 'should have launch method accepting shell task' do
     @instance.method(:launch).should_not be_nil

data/spec/core/transport_spec.rb

@@ -375,6 +375,7 @@ describe URI::HTTP, '#write' do
     @uri = URI('http://john:secret@host.domain/foo/bar/baz.jar')
     @http = double('Net::HTTP')
     @http.stub(:request).and_return(Net::HTTPOK.new(nil, nil, nil))
+    @http.should_receive(:read_timeout=).with(500)
     Net::HTTP.stub(:new).and_return(@http)
   end
 

data/spec/ide/eclipse_spec.rb

@@ -382,7 +382,7 @@ MANIFEST
         write 'src/test/java/Test.java'
       end
 
-      shared_examples_for 'source' do
+      RSpec.shared_examples 'source' do
         it 'should ignore CVS and SVN files' do
           define('foo')
           classpath_sources('excluding').each do |excluding_attribute|

data/spec/java/packaging_spec.rb

@@ -53,7 +53,7 @@ describe Project, '#manifest' do
 end
 
 
-shared_examples_for 'package with manifest' do
+RSpec.shared_examples 'package with manifest' do
   before do
     @long_line = 'No line may be longer than 72 bytes (not characters), in its UTF8-encoded form. If a value would make the initial line longer than this, it should be continued on extra lines (each starting with a single SPACE).'
   end
@@ -347,7 +347,7 @@ describe Project, '#meta_inf' do
 end
 
 
-shared_examples_for 'package with meta_inf' do
+RSpec.shared_examples 'package with meta_inf' do
 
   def package_with_meta_inf(meta_inf = nil)
     packaging = @packaging
@@ -1258,7 +1258,7 @@ describe Packaging, 'test_jar' do
   end
 end
 
-shared_examples_for 'package_with_' do
+RSpec.shared_examples 'package_with_' do
 
   def prepare(options = {})
     packager = "package_with_#{@packaging}"

data/spec/java/test_coverage_helper.rb

@@ -53,7 +53,7 @@ module TestCoverageHelper
   end
 end
 
-shared_examples_for 'test coverage tool' do
+RSpec.shared_examples 'test coverage tool' do
   include TestCoverageHelper
 
   def toolname

data/spec/kotlin/compiler_spec.rb

@@ -17,7 +17,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 # need to test both with and without KOTLIN_HOME
-share_as :KotlincCompiler do
+RSpec.shared_examples 'KotlincCompiler' do
 
   it 'should identify itself from source directories' do
     write 'src/main/kotlin/com/example/Test.kt', "package com.example\n class Test { }"
@@ -110,7 +110,7 @@ share_as :KotlincCompiler do
   end
 end
 
-share_as :KotlincCompiler_CommonOptions do
+RSpec.shared_examples 'KotlincCompiler_CommonOptions' do
 
   it 'should set warnings option to false by default' do
     compile_task.options.warnings.should be_false
@@ -240,8 +240,8 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
         @compile_task ||= define('foo').compile.using(:kotlinc)
       end
 
-      it_should_behave_like KotlincCompiler
-      it_should_behave_like KotlincCompiler_CommonOptions
+      it_should_behave_like 'KotlincCompiler'
+      it_should_behave_like 'KotlincCompiler_CommonOptions'
     end
   end
 
@@ -264,11 +264,11 @@ if Java.java.lang.System.getProperty("java.runtime.version") >= "1.8"
       compile_task.instance_eval { @compiler }.send(:kotlinc_args)
     end
 
-    it_should_behave_like KotlincCompiler
-    it_should_behave_like KotlincCompiler_CommonOptions
+    it_should_behave_like 'KotlincCompiler'
+    it_should_behave_like 'KotlincCompiler_CommonOptions'
 
     after :all do
       ENV['KOTLIN_HOME'] = old_home
     end
   end
-end
+end

data/spec/packaging/archive_spec.rb

@@ -60,7 +60,7 @@ module ArchiveTaskHelpers
   end
 end
 
-shared_examples_for 'ArchiveTask' do
+RSpec.shared_examples 'ArchiveTask' do
   include ArchiveTaskHelpers
 
   before(:each) do

data/spec/packaging/packaging_helper.rb

@@ -14,7 +14,7 @@
 # the License.
 
 
-shared_examples_for 'packaging' do
+RSpec.shared_examples 'packaging' do
   it 'should create artifact of proper type' do
     packaging = @packaging
     package_type = @package_type || @packaging

data/spec/scala/compiler_spec.rb

@@ -17,7 +17,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helpers'))
 
 # need to test both with and without SCALA_HOME
-share_as :ScalacCompiler do
+RSpec.shared_examples 'ScalacCompiler' do
 
   it 'should identify itself from source directories' do
     write 'src/main/scala/com/example/Test.scala', 'package com.example; class Test { val i = 1 }'
@@ -118,7 +118,7 @@ if ENV['SCALA_HOME']
       ENV['SCALA_HOME'].should_not be_nil
     end
 
-    it_should_behave_like ScalacCompiler
+    it_should_behave_like 'ScalacCompiler'
   end
 end
 
@@ -133,14 +133,14 @@ describe 'scala compiler (downloaded from repository)' do
     ENV['SCALA_HOME'].should be_nil
   end
 
-  it_should_behave_like ScalacCompiler
+  it_should_behave_like 'ScalacCompiler'
 
   after :all do
     ENV['SCALA_HOME'] = old_home
   end
 end
 
-share_as :ScalacCompiler_CommonOptions do
+RSpec.shared_examples 'ScalacCompiler_CommonOptions' do
 
   it 'should set warnings option to false by default' do
     compile_task.options.warnings.should be_false
@@ -275,7 +275,7 @@ end
 
 describe 'scala compiler 2.8 options' do
 
-  it_should_behave_like ScalacCompiler_CommonOptions
+  it_should_behave_like 'ScalacCompiler_CommonOptions'
 
   def compile_task
     @compile_task ||= define('foo').compile.using(:scalac)
@@ -298,7 +298,7 @@ end if Buildr::Scala.version?(2.8)
 
 describe 'scala compiler 2.9 options' do
 
-  it_should_behave_like ScalacCompiler_CommonOptions
+  it_should_behave_like 'ScalacCompiler_CommonOptions'
 
   def compile_task
     @compile_task ||= define('foo').compile.using(:scalac)
@@ -345,7 +345,7 @@ describe 'zinc compiler (enabled through Buildr.settings)' do
     compile_task.invoke
   end
 
-  it_should_behave_like ScalacCompiler
+  it_should_behave_like 'ScalacCompiler'
 
   after :each do
     Buildr.settings.build['scalac.incremental'] = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake