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:09:28 UTC
[1/3] buildr git commit: Prefer single quotes
Repository: buildr
Updated Branches:
refs/heads/master c19d2a648 -> e02efd96b
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/e6e54e3c
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/e6e54e3c
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/e6e54e3c
Branch: refs/heads/master
Commit: e6e54e3cbc3867fb163570800197ce28eecab740
Parents: c19d2a6
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:01:03 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:01:03 2017 +1000
----------------------------------------------------------------------
lib/buildr/java/tests.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/e6e54e3c/lib/buildr/java/tests.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/tests.rb b/lib/buildr/java/tests.rb
index d868335..1e112b7 100644
--- a/lib/buildr/java/tests.rb
+++ b/lib/buildr/java/tests.rb
@@ -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
[2/3] buildr git commit: BUILDR-731 - Enhance Sonar addon to support
configuration of the project version.
Posted by do...@apache.org.
BUILDR-731 - Enhance Sonar addon to support configuration of the project version.
Submitted by Ross Mahony.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/f2128431
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/f2128431
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/f2128431
Branch: refs/heads/master
Commit: f21284314b658253a195ac64e93e3952f1f7202a
Parents: e6e54e3
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:08:44 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:08:44 2017 +1000
----------------------------------------------------------------------
CHANGELOG | 1 +
addon/buildr/sonar.rb | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/f2128431/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 4ff9069..395cf89 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.5.2 (Pending)
+* 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)
http://git-wip-us.apache.org/repos/asf/buildr/blob/f2128431/addon/buildr/sonar.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/sonar.rb b/addon/buildr/sonar.rb
index acd199e..f04b703 100644
--- a/addon/buildr/sonar.rb
+++ b/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
[3/3] buildr git commit: Update TestNG version to 6.11.
Posted by do...@apache.org.
Update TestNG version to 6.11.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/e02efd96
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/e02efd96
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/e02efd96
Branch: refs/heads/master
Commit: e02efd96b778b49ed32b6d066e589769e2fae9d9
Parents: f212843
Author: Peter Donald <pe...@realityforge.org>
Authored: Mon Apr 3 09:09:18 2017 +1000
Committer: Peter Donald <pe...@realityforge.org>
Committed: Mon Apr 3 09:09:18 2017 +1000
----------------------------------------------------------------------
CHANGELOG | 1 +
lib/buildr/java/tests.rb | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/e02efd96/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 395cf89..52021df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.5.2 (Pending)
+* 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/e02efd96/lib/buildr/java/tests.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/java/tests.rb b/lib/buildr/java/tests.rb
index 1e112b7..68dda34 100644
--- a/lib/buildr/java/tests.rb
+++ b/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