buildr 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 930996906bbd79f5b5cda9ed86c4b9175f425a35
-  data.tar.gz: 09911bd611446902912fd051c4ef3b6a94de1841
+  metadata.gz: dd4405759ce0cd47cb6365dd59a5841742933f45
+  data.tar.gz: 2df427bd09daec594a3837b5e52ecab23cd6292a
 SHA512:
-  metadata.gz: 5f513bdba3c971e7ee218a3d312756dabb5ef03c9e59f2c25caefe6b4945b2ac0300e0e77758ecb6ed2ae1be0ad16e6c81bc01cebb09e4ab2c8549ab28d605a7
-  data.tar.gz: ba81f0a32c23c775dbe1ba9d627d89a0fa4952a014cc854caec156b19384ad276284bad42b72b3c992e4003fe544975d823adfabb4b6b4ab313751573dc41c3e
+  metadata.gz: fc8a2649728e538ec021b9e20d399efaabd98bd0e2093ff8a8a0d44b129be336cc31123b7f10bb51234d6bb4de698cc1d53cc975044df2fd0d981aa64a6fbf14
+  data.tar.gz: 3c7746c0fb39565929bb901e470d9a610fb6ecd8c1dbb39e2023d5062ac178f6284c7a116ebbbbd080e64df16d962fa67ec4e4432ee966de8440dd1fb873aa8c

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.5.2 (2017-04-03)
+* Change: Update TestNG version to 6.11.
+* Change: BUILDR-731 - Enhance Sonar addon to support configuration of the project version. Submitted by Ross Mahony.
+* Fixed:  Fix pom generation to eliminate invalid `classifier` element from being added to POM.
+
 1.5.1 (2017-03-11)
 * Change: In the 'buildr/git_auto_version' addon strip out any versions that start with a 'v' character as
           most projects on git repositories prefix version tags with a "v" to avoid collisions with any branchs

data/addon/buildr/sonar.rb

@@ -25,8 +25,7 @@ module Buildr
         ]
       end
 
-      def sonar(jdbc_url, jdbc_driver_class_name, jdbc_username, jdbc_password, host_url, project_name, key, sources, binaries, libraries)
-
+      def sonar(jdbc_url, jdbc_driver_class_name, jdbc_username, jdbc_password, host_url, project_name, key, project_version, sources, binaries, libraries)
         # Build the artifacts for FindBugs to analyse
         Buildr.artifacts(binaries).each(&:invoke)
 
@@ -38,7 +37,7 @@ module Buildr
           ant.property :name => 'sonar.projectName', :value => project_name
 
           ant.property :name => 'sonar.projectKey', :value => key
-          ant.property :name => 'sonar.projectVersion', :value => '1.0'
+          ant.property :name => 'sonar.projectVersion', :value => project_version
 
           ant.property :name => 'sonar.jdbc.url', :value => jdbc_url
           ant.property :name => 'sonar.jdbc.driverClassName', :value => jdbc_driver_class_name
@@ -68,6 +67,7 @@ module Buildr
       attr_accessor :host_url
       attr_accessor :key
       attr_accessor :project_name
+      attr_accessor :project_version
 
       attr_writer :sources
       def sources
@@ -88,6 +88,10 @@ module Buildr
         !!@enabled
       end
 
+      def project_version
+        @project_version || '1.0'
+      end
+
       protected
 
       def initialize(project)
@@ -123,6 +127,7 @@ module Buildr
               project.sonar.host_url,
               project.sonar.project_name,
               project.sonar.key,
+              project.sonar.project_version,
               sources,
               binaries,
               libraries

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.1 (2017-03-11)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.5.1-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.1/buildr-1.5.1-java.gem | "bd1ff5faf28129b26a2efe6302be6619":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1-java.gem.asc |
+| "buildr-1.5.1-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.1/buildr-1.5.1-x86-mswin32.gem | "834b07fba980f338e71ce0519d760c60":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1-x86-mswin32.gem.asc |
+| "buildr-1.5.1.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.1/buildr-1.5.1.gem | "96675d557f14706f3f3888e8ac3d160f":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1.gem.asc |
+| "buildr-1.5.1.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.1/buildr-1.5.1.tgz | "fa12a02ca8dacaaa3ab1a7a99a5cee0a":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1.tgz.asc |
+| "buildr-1.5.1.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.1/buildr-1.5.1.zip | "276c2753a68282d84d7b6ed6cc690a99":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.1/buildr-1.5.1.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.1/KEYS)
+
+
 h3. buildr 1.5.0 (2016-09-23)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.5.0-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.0/buildr-1.5.0-java.gem | "611ad614788f38d15424d6c3a88f3db0":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0-java.gem.asc |
-| "buildr-1.5.0-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.0/buildr-1.5.0-x86-mswin32.gem | "5eabc199bc362bccec939e2d67ef972c":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0-x86-mswin32.gem.asc |
-| "buildr-1.5.0.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.0/buildr-1.5.0.gem | "075969eb067fa27243a4fd2ae6faf76c":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0.gem.asc |
-| "buildr-1.5.0.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.0/buildr-1.5.0.tgz | "83b06ec0597ea888846caf097ac2ece8":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0.tgz.asc |
-| "buildr-1.5.0.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.0/buildr-1.5.0.zip | "f4eb461c0a4c90ddf464ea529a94cb67":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.0/buildr-1.5.0.zip.asc |
+| "buildr-1.5.0-java.gem":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0-java.gem | "611ad614788f38d15424d6c3a88f3db0":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0-java.gem.asc |
+| "buildr-1.5.0-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0-x86-mswin32.gem | "5eabc199bc362bccec939e2d67ef972c":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0-x86-mswin32.gem.asc |
+| "buildr-1.5.0.gem":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0.gem | "075969eb067fa27243a4fd2ae6faf76c":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0.gem.asc |
+| "buildr-1.5.0.tgz":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0.tgz | "83b06ec0597ea888846caf097ac2ece8":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0.tgz.asc |
+| "buildr-1.5.0.zip":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0.zip | "f4eb461c0a4c90ddf464ea529a94cb67":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.0/buildr-1.5.0.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.0/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.5.0/KEYS)
 
 
 h3. buildr 1.4.25 (2016-04-18)

data/doc/index.textile

@@ -46,6 +46,11 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
+Highlights from Buildr 1.5.2 (2017-04-03)
+* Change: Update TestNG version to 6.11.
+* Change: BUILDR-731 - Enhance Sonar addon to support configuration of the project version. Submitted by Ross Mahony.
+* Fixed:  Fix pom generation to eliminate invalid `classifier` element from being added to POM.
+
 Highlights from Buildr 1.5.1 (2017-03-11)
 * Change: Add css2gss task to gwt addon to support conveting from deprecated css syntax to modern gss syntax.
 * Change: Add support for gwt 2.8.0 to gwt addon.

data/lib/buildr/java/custom_pom.rb

@@ -161,7 +161,6 @@ module Buildr
           candidates = project.packages.select{|p| p.classifier.nil? }.collect{|p|p.type.to_s}
           packaging = !candidates.empty? ? candidates[0] : (project.compile.packaging || :zip).to_s
           xml.packaging packaging
-          xml.classifier package.classifier if package.classifier
 
           xml.name project.pom.name if project.pom.name
           xml.description project.pom.description if project.pom.description

data/lib/buildr/java/tests.rb

@@ -283,7 +283,7 @@ module Buildr #:nodoc:
   # * :args -- Arguments passed to the TestNG command line runner.
   class TestNG < TestFramework::Java
 
-    VERSION = '6.8.7'
+    VERSION = '6.11'
 
     class << self
       def version
@@ -291,7 +291,7 @@ module Buildr #:nodoc:
       end
 
       def dependencies
-        return ["org.testng:testng:jar:jdk15:#{version}"] + JMock.dependencies if version < "6.0"
+        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
       end
     end

data/lib/buildr/version.rb

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

data/rakelib/release.rake

@@ -13,12 +13,10 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-RC_VERSION = ENV['RC_VERSION'] || ""
+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`
-
+task 'release' do
   # First, we need to get all the staged files from Apache to _release.
   mkpath '_release'
   lambda do

data/rakelib/stage.rake

@@ -19,12 +19,9 @@ require 'digest/sha1'
 gpg_cmd = 'gpg2'
 
 STAGE_DATE = ENV['STAGE_DATE'] ||  Time.now.strftime('%Y-%m-%d')
-RC_VERSION = ENV['RC_VERSION'] || ""
-
-task 'prepare' do |task, args|
-  gpg_arg = args.gpg || ENV['gpg']
-  user = args.user || ENV['user'] || `whoami`
+RC_VERSION = ENV['RC_VERSION'] || ''
 
+task 'prepare' do
   # Update source files to next release number.
   lambda do
     current_version = spec.version.to_s.split('.').map { |v| v.to_i }.
@@ -68,9 +65,12 @@ task 'prepare' do |task, args|
 
   # Need GPG to sign the packages.
   lambda do
-    gpg_arg or fail 'Please run with gpg=<argument for gpg --local-user>'
+    raise "ENV['GPG_USER'] not specified" unless ENV['GPG_USER']
+
+    gpg_arg = ENV['GPG_USER']
+    gpg_arg or fail 'Please run with GPG_USER=<argument for gpg --local-user>'
     gpg_ok = `gpg2 --list-keys #{gpg_arg}` rescue nil
-    if !$?.success?
+    unless $?.success?
       gpg_ok = `gpg --list-keys #{gpg_arg}`
       gpg_cmd = 'gpg'
     end
@@ -87,13 +87,11 @@ task 'prepare' do |task, args|
     puts '[X] We have prince available'
   end.call
 
-  raise "Can not run stage process under jruby" if RUBY_PLATFORM[/java/]
-  raise "Can not run staging process under older rubies" unless RUBY_VERSION >= '1.9'
+  raise 'Can not run stage process under jruby' if RUBY_PLATFORM[/java/]
+  raise 'Can not run staging process under older rubies' unless RUBY_VERSION >= '1.9'
 end
 
-task 'stage' => %w(clobber prepare) do |task, args|
-  gpg_arg = args.gpg || ENV['gpg']
-  user = args.user || ENV['user'] || `whoami`
+task 'stage' => %w(clobber prepare) do
   mkpath '_staged'
 
   lambda do
@@ -129,7 +127,23 @@ task 'stage' => %w(clobber prepare) do |task, args|
       bytes = File.open(pkg, 'rb') { |file| file.read }
       File.open(pkg + '.md5', 'w') { |file| file.write Digest::MD5.hexdigest(bytes) << ' ' << File.basename(pkg) }
       File.open(pkg + '.sha1', 'w') { |file| file.write Digest::SHA1.hexdigest(bytes) << ' ' << File.basename(pkg) }
-      sh gpg_cmd, '--local-user', gpg_arg, '--armor', '--output', pkg + '.asc', '--detach-sig', pkg, :verbose=>true
+
+      cmd = []
+      cmd << gpg_cmd
+      cmd << '--local-user'
+      cmd << ENV['GPG_USER']
+      cmd << '--armor'
+      if ENV['GPG_PASS']
+        cmd << '--batch'
+        cmd << '--passphrase'
+        cmd << ENV['GPG_PASS']
+      end
+      cmd << '--output'
+      cmd << pkg + '.asc'
+      cmd << '--detach-sig'
+      cmd << pkg
+
+      sh *cmd, :verbose=>true
     end
     cp 'etc/KEYS', '_staged/dist'
     puts '[X] Created and signed release packages in _staged/dist'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-12 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -691,7 +691,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.6
 requirements: []
 rubyforge_project: buildr
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Build like you code