buildr 1.5.0 → 1.5.1

data/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

data/lib/buildr/version.rb

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

data/rakelib/release.rake

@@ -13,16 +13,18 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+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
-    url = "https://dist.apache.org/repos/dist/dev/buildr/#{spec.version}"
+    url = "https://dist.apache.org/repos/dist/dev/buildr/#{spec.version}#{RC_VERSION}"
     puts "Populating _release directory from #{url} ..."
-    sh "svn co #{url} _release/#{spec.version}" 
+    sh "svn co #{url} _release/#{spec.version}"
     puts '[X] Staged files are now in _release'
   end.call
 

data/rakelib/stage.rake

@@ -191,7 +191,7 @@ p>. ("Release signing keys":#{official}/KEYS)
   # email for you and vote on it.
   lambda do
     # Need to know who you are on Apache, local user may be different (see .ssh/config).
-    base_url = "https://dist.apache.org/repos/dist/dev/buildr/#{spec.version}"
+    base_url = "https://dist.apache.org/repos/dist/dev/buildr/#{spec.version}#{RC_VERSION}"
     # Need changes for this release only.
     changelog = File.read('CHANGELOG').scan(/(^(\d+\.\d+(?:\.\d+)?)\s+\(\d{4}-\d{2}-\d{2}\)\s*((:?^[^\n]+\n)*))/)
     changes = changelog[0][2]

data/spec/addon/jaxb_xjc_spec.rb

@@ -123,4 +123,3 @@ describe Buildr::JaxbXjc do
     end
   end
 end
-

data/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 }

data/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')

data/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
 

data/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
 

data/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)
@@ -421,6 +421,14 @@ describe URI::HTTP, '#write' do
     @uri.write @content
   end
 
+  it 'should set User-Agent header' do
+    @http.should_receive(:request) do |request|
+      request['User-Agent'].should == "Buildr-#{Buildr::VERSION}"
+      Net::HTTPOK.new(nil, nil, nil)
+    end
+    @uri.write @content
+  end
+
   it 'should send entire content' do
     @http.should_receive(:request) do |request|
       body_stream = request.body_stream

data/spec/{addon → java}/custom_pom_spec.rb

@@ -13,20 +13,9 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-# The testing framework does not support loading and then unloading of addons
-# thus we can not test this addon until we figure out a mechanism of supporting
-# unloading addon as the test progresses
-if false
-
 require File.expand_path('../spec_helpers', File.dirname(__FILE__))
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'xpath_matchers'))
 
-# Next line should work but does not
-#Sandbox.require_optional_extension 'buildr/custom_pom'
-
-# Next line should not be used but is required
-require 'buildr/custom_pom'
-
 describe Buildr::CustomPom do
 
   def xml_document(filename)
@@ -156,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 {}'
@@ -172,14 +161,12 @@ 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
   end
 end
-
-end

data/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 }

data/spec/java/java_spec.rb

@@ -127,4 +127,4 @@ describe 'Java#java' do
   after do
     ENV['JAVA_HOME'] = @old_home
   end
-end
+end

data/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;

data/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.
@@ -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
@@ -1214,7 +1214,15 @@ end
 describe Buildr, '#transitive' do
   before do
     repositories.remote = 'http://buildr.apache.org/repository/noexist'
-    @simple = [ 'saxon:saxon:jar:8.4', 'saxon:saxon-dom:jar:8.4', 'saxon:saxon-xpath:jar:8.4' ]
+    write artifact('org.sonatype.oss:oss-parent:pom:7').pom.to_s, <<-XML
+<project>
+  <artifactId>oss-parent</artifactId>
+  <groupId>org.sonatype.oss</groupId>
+  <version>7</version>
+</project>
+XML
+
+    @simple = %w(saxon:saxon:jar:8.4 saxon:saxon-dom:jar:8.4 saxon:saxon-xpath:jar:8.4)
     @simple.map { |spec| artifact(spec).pom }.each { |task| write task.name, task.pom_xml.call }
     @provided = @simple.first
     @complex = 'group:app:jar:1.0'

data/spec/packaging/packaging_spec.rb

@@ -356,16 +356,24 @@ describe Project, '#package' do
   end
 
   it 'should create POM artifact that creates its own POM' do
-    define('foo', :group=>'bar', :version=>'1.0') { package(:jar, :classifier=>'srcs') }
+    define('foo', :group=>'bar', :version=>'1.0') { package(:jar) }
     pom = project('foo').packages.first.pom
     pom.invoke
     read(pom.to_s).should eql(<<-POM
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>7</version>
+  </parent>
   <groupId>bar</groupId>
   <artifactId>foo</artifactId>
   <version>1.0</version>
+  <packaging>jar</packaging>
+  <name>foo</name>
+  <description>foo</description>
 </project>
 POM
     )

data/spec/scala/bdd_spec.rb

@@ -118,4 +118,3 @@ describe Buildr::Scala::Specs2 do
     project('foo').test.failed_tests.should include('StringSpecs$')
   end
 end
-

data/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
+end

data/spec/scala/doc_spec.rb

@@ -88,4 +88,3 @@ describe "package(:scaladoc)" do
     scaladoc.should contain('Foo.html')
   end
 end
-

data/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
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-24 00:00:00.000000000 Z
+date: 2017-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -94,20 +94,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.3
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.15.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.15.0
 - !ruby/object:Gem::Dependency
   name: rjb
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +178,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: orderedhash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +262,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.15.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.15.1
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
@@ -573,6 +559,7 @@ files:
 - lib/buildr/java/cobertura.rb
 - lib/buildr/java/commands.rb
 - lib/buildr/java/compiler.rb
+- lib/buildr/java/custom_pom.rb
 - lib/buildr/java/deprecated.rb
 - lib/buildr/java/doc.rb
 - lib/buildr/java/ecj.rb
@@ -609,11 +596,6 @@ files:
 - lib/buildr/scala/compiler.rb
 - lib/buildr/scala/doc.rb
 - lib/buildr/scala/org/apache/buildr/Specs2Runner.class
-- lib/buildr/scala/org/apache/buildr/Specs2Runner.java
-- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.class
-- lib/buildr/scala/org/apache/buildr/SpecsSingletonRunner.java
-- lib/buildr/scala/org/apache/buildr/ZincRunner.class
-- lib/buildr/scala/org/apache/buildr/ZincRunner.java
 - lib/buildr/scala/shell.rb
 - lib/buildr/scala/tests.rb
 - lib/buildr/shell.rb
@@ -628,7 +610,6 @@ files:
 - rakelib/stage.rake
 - spec/addon/bnd_spec.rb
 - spec/addon/checkstyle_spec.rb
-- spec/addon/custom_pom_spec.rb
 - spec/addon/drb_spec.rb
 - spec/addon/jaxb_xjc_spec.rb
 - spec/core/application_spec.rb
@@ -658,6 +639,7 @@ files:
 - spec/java/cobertura_spec.rb
 - spec/java/commands_spec.rb
 - spec/java/compiler_spec.rb
+- spec/java/custom_pom_spec.rb
 - spec/java/doc_spec.rb
 - spec/java/ecj_spec.rb
 - spec/java/emma_spec.rb