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 2017/04/02 23:51:26 UTC
[1/7] buildr git commit: Prefer single quotes
Repository: buildr
Updated Branches:
refs/heads/master e02efd96b -> 64fb28c46
Prefer single quotes
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/38059548
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/38059548
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/38059548
Branch: refs/heads/master
Commit: 38059548fe111909349ec04dddddc712a33b768b
Parents: e02efd9
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:09:59 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:09:59 2017 +1000
----------------------------------------------------------------------
rakelib/stage.rake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/38059548/rakelib/stage.rake
----------------------------------------------------------------------
diff --git a/rakelib/stage.rake b/rakelib/stage.rake
index ae998f8..26fd9ce 100644
--- a/rakelib/stage.rake
+++ b/rakelib/stage.rake
@@ -19,7 +19,7 @@ require 'digest/sha1'
gpg_cmd = 'gpg2'
STAGE_DATE = ENV['STAGE_DATE'] || Time.now.strftime('%Y-%m-%d')
-RC_VERSION = ENV['RC_VERSION'] || ""
+RC_VERSION = ENV['RC_VERSION'] || ''
task 'prepare' do |task, args|
gpg_arg = args.gpg || ENV['gpg']
[6/7] buildr git commit: Adjust the staging process to use the same
environment variables as the gpg addon
Posted by do...@apache.org.
Adjust the staging process to use the same environment variables as the gpg addon
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/be5ebbe7
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/be5ebbe7
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/be5ebbe7
Branch: refs/heads/master
Commit: be5ebbe7a8c88c0e5db840510491830ab04a827a
Parents: efdbd38
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:20:00 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:30:05 2017 +1000
----------------------------------------------------------------------
rakelib/release.rake | 6 ++----
rakelib/stage.rake | 31 +++++++++++++++++++++++--------
2 files changed, 25 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/be5ebbe7/rakelib/release.rake
----------------------------------------------------------------------
diff --git a/rakelib/release.rake b/rakelib/release.rake
index 825b2e4..ed2dddb 100644
--- a/rakelib/release.rake
+++ b/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
http://git-wip-us.apache.org/repos/asf/buildr/blob/be5ebbe7/rakelib/stage.rake
----------------------------------------------------------------------
diff --git a/rakelib/stage.rake b/rakelib/stage.rake
index c2009db..1c22693 100644
--- a/rakelib/stage.rake
+++ b/rakelib/stage.rake
@@ -21,10 +21,7 @@ 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`
-
+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,7 +65,10 @@ 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
unless $?.success?
gpg_ok = `gpg --list-keys #{gpg_arg}`
@@ -91,8 +91,7 @@ task 'prepare' do |task, args|
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']
+task 'stage' => %w(clobber prepare) do
mkpath '_staged'
lambda do
@@ -128,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'
[5/7] buildr git commit: Prefer single quotes
Posted by do...@apache.org.
Prefer single quotes
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/efdbd389
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/efdbd389
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/efdbd389
Branch: refs/heads/master
Commit: efdbd389751b5993bb9cf5ef1e9a3c8e26929c07
Parents: 308754e
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:17:09 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:17:09 2017 +1000
----------------------------------------------------------------------
rakelib/stage.rake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/efdbd389/rakelib/stage.rake
----------------------------------------------------------------------
diff --git a/rakelib/stage.rake b/rakelib/stage.rake
index f5f541f..c2009db 100644
--- a/rakelib/stage.rake
+++ b/rakelib/stage.rake
@@ -87,8 +87,8 @@ 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|
[2/7] buildr git commit: Replace "if !expression" with "unless
expression"
Posted by do...@apache.org.
Replace "if !expression" with "unless expression"
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/2811a6ab
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/2811a6ab
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/2811a6ab
Branch: refs/heads/master
Commit: 2811a6abd491f083b73fa0df659421162cbd8e7f
Parents: 3805954
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:10:35 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:10:35 2017 +1000
----------------------------------------------------------------------
rakelib/stage.rake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/2811a6ab/rakelib/stage.rake
----------------------------------------------------------------------
diff --git a/rakelib/stage.rake b/rakelib/stage.rake
index 26fd9ce..db86c1c 100644
--- a/rakelib/stage.rake
+++ b/rakelib/stage.rake
@@ -70,7 +70,7 @@ task 'prepare' do |task, args|
lambda do
gpg_arg or fail 'Please run with gpg=<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
[7/7] buildr git commit: Prepare documentation for next release
Posted by do...@apache.org.
Prepare documentation for next release
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/64fb28c4
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/64fb28c4
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/64fb28c4
Branch: refs/heads/master
Commit: 64fb28c46afa5663c45385eeefcadb9665b54067
Parents: be5ebbe
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:51:16 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:51:16 2017 +1000
----------------------------------------------------------------------
doc/download.textile | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/64fb28c4/doc/download.textile
----------------------------------------------------------------------
diff --git a/doc/download.textile b/doc/download.textile
index 7dcc835..e98ac18 100644
--- a/doc/download.textile
+++ b/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.2 (2017-04-03)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.5.2-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2-java.gem | "72ac9122e057112f5699b39ba237432f":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2-java.gem.asc |
+| "buildr-1.5.2-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2-x86-mswin32.gem | "0b34fd2fc14236bcecc877901d58080d":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2-x86-mswin32.gem.asc |
+| "buildr-1.5.2.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2.gem | "6645bfa5380490233affa9adb9e388a1":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.gem.asc |
+| "buildr-1.5.2.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2.tgz | "77e4ef6ce1b408943d98c848f86feb10":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.tgz.asc |
+| "buildr-1.5.2.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.5.2/buildr-1.5.2.zip | "793d86899fd3c3eb326a0ea920b1275a":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.5.2/buildr-1.5.2.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.5.2/KEYS)
+
+
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 |
+| "buildr-1.5.1-java.gem":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1-java.gem | "bd1ff5faf28129b26a2efe6302be6619":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1-java.gem.asc |
+| "buildr-1.5.1-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1-x86-mswin32.gem | "834b07fba980f338e71ce0519d760c60":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1-x86-mswin32.gem.asc |
+| "buildr-1.5.1.gem":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1.gem | "96675d557f14706f3f3888e8ac3d160f":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1.gem.asc |
+| "buildr-1.5.1.tgz":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1.tgz | "fa12a02ca8dacaaa3ab1a7a99a5cee0a":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1.tgz.asc |
+| "buildr-1.5.1.zip":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1.zip | "276c2753a68282d84d7b6ed6cc690a99":http://archive.apache.org/dist/buildr/1.5.1/buildr-1.5.1.zip.md5 | "Sig":http://archive.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)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.5.1/KEYS)
h3. buildr 1.5.0 (2016-09-23)
[3/7] buildr git commit: Prepare for staging a release
Posted by do...@apache.org.
Prepare for staging a release
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/1a7f3792
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/1a7f3792
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/1a7f3792
Branch: refs/heads/master
Commit: 1a7f3792b01702d4f176d6b5812d896e655cca63
Parents: 2811a6a
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:11:25 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:15:15 2017 +1000
----------------------------------------------------------------------
CHANGELOG | 2 +-
doc/index.textile | 5 +++++
lib/buildr/version.rb | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/1a7f3792/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 52021df..83c016c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-1.5.2 (Pending)
+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.
http://git-wip-us.apache.org/repos/asf/buildr/blob/1a7f3792/doc/index.textile
----------------------------------------------------------------------
diff --git a/doc/index.textile b/doc/index.textile
index 0ba7abb..69998d7 100644
--- a/doc/index.textile
+++ b/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.
http://git-wip-us.apache.org/repos/asf/buildr/blob/1a7f3792/lib/buildr/version.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/version.rb b/lib/buildr/version.rb
index 56cb386..18291fb 100644
--- a/lib/buildr/version.rb
+++ b/lib/buildr/version.rb
@@ -14,5 +14,5 @@
# the License.
module Buildr #:nodoc:
- VERSION = '1.5.2.dev'.freeze
+ VERSION = '1.5.2'.freeze
end
[4/7] buildr git commit: Remove unused variable
Posted by do...@apache.org.
Remove unused variable
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/308754eb
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/308754eb
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/308754eb
Branch: refs/heads/master
Commit: 308754eb813d0d88b7f291d2acd956269b5bb2d4
Parents: 1a7f379
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:16:40 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:16:40 2017 +1000
----------------------------------------------------------------------
rakelib/stage.rake | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/308754eb/rakelib/stage.rake
----------------------------------------------------------------------
diff --git a/rakelib/stage.rake b/rakelib/stage.rake
index db86c1c..f5f541f 100644
--- a/rakelib/stage.rake
+++ b/rakelib/stage.rake
@@ -93,7 +93,6 @@ end
task 'stage' => %w(clobber prepare) do |task, args|
gpg_arg = args.gpg || ENV['gpg']
- user = args.user || ENV['user'] || `whoami`
mkpath '_staged'
lambda do