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/10/29 07:10:01 UTC
[1/3] buildr git commit: Align change items
Repository: buildr
Updated Branches:
refs/heads/master 3738beb2e -> b6a894a65
Align change items
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/868f1018
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/868f1018
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/868f1018
Branch: refs/heads/master
Commit: 868f1018f8523b09d78a547283f628a5e7e74da6
Parents: 3738beb
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Oct 29 18:04:27 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun Oct 29 18:04:27 2017 +1100
----------------------------------------------------------------------
CHANGELOG | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/868f1018/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 898777f..2278c57 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,20 +1,20 @@
1.5.4 (Pending)
-* Fixed: BUILDR-733 - Escape classpath entries in the pathing jar manifest. Submitted by Glenn Croes.
-* Fixed: Ensure that the pom is attached to the jar artifact with empty classifier rather than the last
- artifact of a type defined. Otherwise a project that defines multiple artifacts of the same type
- (i.e. `package(:jar)` and `package(:jar, :classifier => :gwt)`) could have the pom named after
- the package with the classifier rather than the package without a classifer. (i.e. the pom could
- be incorrectly defined as `mypackage-1.0.0-gwt.pom` rather than `mypackage-1.0.0.pom`).
-* Added: GWT Addon: Add support for GWT 2.8.2 release.
-* Added: GWT Addon: Added support for `:js_exports` boolean to enable "JsInteropExports".
-* Added: IDEA Extension: Added support for `:open_in_browser` boolean passed to `ipr.add_gwt_configuration`
-* Added: BUILDR-732 - Support bnd version 2.1.0 or more. Submitted By Eric Bruneton.
-* Added: Support to compiling Kotlin
-* Fixed: Remove section on development builds in the Contributing section.
-* Added: New way to concatenate file contents when merging several archives together.
-* Added: New way to transform file contents when merging several archives together.
-* Fixed: Removed .class files from being checked in.
-* Added: Support both Jetty 6 and Jetty 9 as addons. Added integration tests to cover their use.
+* Fixed: BUILDR-733 - Escape classpath entries in the pathing jar manifest. Submitted by Glenn Croes.
+* Fixed: Ensure that the pom is attached to the jar artifact with empty classifier rather than the last
+ artifact of a type defined. Otherwise a project that defines multiple artifacts of the same type
+ (i.e. `package(:jar)` and `package(:jar, :classifier => :gwt)`) could have the pom named after
+ the package with the classifier rather than the package without a classifer. (i.e. the pom could
+ be incorrectly defined as `mypackage-1.0.0-gwt.pom` rather than `mypackage-1.0.0.pom`).
+* Added: GWT Addon: Add support for GWT 2.8.2 release.
+* Added: GWT Addon: Added support for `:js_exports` boolean to enable "JsInteropExports".
+* Added: IDEA Extension: Added support for `:open_in_browser` boolean passed to `ipr.add_gwt_configuration`
+* Added: BUILDR-732 - Support bnd version 2.1.0 or more. Submitted By Eric Bruneton.
+* Added: Support to compiling Kotlin
+* Fixed: Remove section on development builds in the Contributing section.
+* Added: New way to concatenate file contents when merging several archives together.
+* Added: New way to transform file contents when merging several archives together.
+* Fixed: Removed .class files from being checked in.
+* Added: Support both Jetty 6 and Jetty 9 as addons. Added integration tests to cover their use.
1.5.3 (2017-05-17)
* Change: Add support for gwt 2.8.1 to gwt addon.
[3/3] buildr git commit: JaCoCo Addon: Projects that have jacoco
disabled will no longer appear in the JaCoCo reports.
Posted by do...@apache.org.
JaCoCo Addon: Projects that have jacoco disabled will no longer appear in the JaCoCo reports.
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/b6a894a6
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/b6a894a6
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/b6a894a6
Branch: refs/heads/master
Commit: b6a894a654c2d058c28218bae781b8ee26b6641b
Parents: 0265b87
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Oct 29 18:08:34 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun Oct 29 18:08:58 2017 +1100
----------------------------------------------------------------------
CHANGELOG | 1 +
addon/buildr/jacoco.rb | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/b6a894a6/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 5e7dcff..aa4fcea 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.5.4 (Pending)
+* Fixed: JaCoCo Addon: Projects that have jacoco disabled will no longer appear in the JaCoCo reports.
* Change: JaCoCo Addon: Update JaCoCo version to 0.7.9.
* Fixed: BUILDR-733 - Escape classpath entries in the pathing jar manifest. Submitted by Glenn Croes.
* Fixed: Ensure that the pom is attached to the jar artifact with empty classifier rather than the last
http://git-wip-us.apache.org/repos/asf/buildr/blob/b6a894a6/addon/buildr/jacoco.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/jacoco.rb b/addon/buildr/jacoco.rb
index 8ad0c6f..a4b5e56 100644
--- a/addon/buildr/jacoco.rb
+++ b/addon/buildr/jacoco.rb
@@ -185,19 +185,19 @@ module Buildr
end
ant.report do |ant|
ant.executiondata do |ant|
- Buildr.projects.each do |project|
+ Buildr.projects.select{|p|p.jacoco.enabled?}.each do |project|
ant.fileset :file=>project.jacoco.destfile if File.exist?(project.jacoco.destfile)
end
end
ant.structure(:name => 'Jacoco Report') do |ant|
ant.classfiles do |ant|
- Buildr.projects.map(&:compile).map(&:target).flatten.map(&:to_s).each do |src|
+ Buildr.projects.select{|p|p.jacoco.enabled?}.map(&:compile).map(&:target).flatten.map(&:to_s).each do |src|
ant.fileset :dir=>src.to_s if File.exist?(src)
end
end
ant.sourcefiles(:encoding => 'UTF-8') do |ant|
- Buildr.projects.map(&:compile).map(&:sources).flatten.map(&:to_s).each do |src|
+ Buildr.projects.select{|p|p.jacoco.enabled?}.map(&:compile).map(&:sources).flatten.map(&:to_s).each do |src|
ant.fileset :dir=>src.to_s if File.exist?(src)
end
end
[2/3] buildr git commit: Update JaCoCo version used by the
`buildr/jacoco` addon to 0.7.9
Posted by do...@apache.org.
Update JaCoCo version used by the `buildr/jacoco` addon to 0.7.9
Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/0265b87b
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/0265b87b
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/0265b87b
Branch: refs/heads/master
Commit: 0265b87b66f55160dd1dbfa6ece133fdb6856a4d
Parents: 868f101
Author: Peter Donald <pe...@realityforge.org>
Authored: Sun Oct 29 18:05:36 2017 +1100
Committer: Peter Donald <pe...@realityforge.org>
Committed: Sun Oct 29 18:08:53 2017 +1100
----------------------------------------------------------------------
CHANGELOG | 1 +
addon/buildr/jacoco.rb | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/buildr/blob/0265b87b/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 2278c57..5e7dcff 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
1.5.4 (Pending)
+* Change: JaCoCo Addon: Update JaCoCo version to 0.7.9.
* Fixed: BUILDR-733 - Escape classpath entries in the pathing jar manifest. Submitted by Glenn Croes.
* Fixed: Ensure that the pom is attached to the jar artifact with empty classifier rather than the last
artifact of a type defined. Otherwise a project that defines multiple artifacts of the same type
http://git-wip-us.apache.org/repos/asf/buildr/blob/0265b87b/addon/buildr/jacoco.rb
----------------------------------------------------------------------
diff --git a/addon/buildr/jacoco.rb b/addon/buildr/jacoco.rb
index 8bddf81..8ad0c6f 100644
--- a/addon/buildr/jacoco.rb
+++ b/addon/buildr/jacoco.rb
@@ -18,7 +18,7 @@ module Buildr
# WARNING: Experimental and may change radically.
module JaCoCo
class << self
- VERSION = '0.7.2.201409121644'
+ VERSION = '0.7.9'
def version
@version || Buildr.settings.build['jacoco'] || VERSION
@@ -37,7 +37,7 @@ module Buildr
"org.jacoco:org.jacoco.report:jar:#{version}",
"org.jacoco:org.jacoco.core:jar:#{version}",
"org.jacoco:org.jacoco.ant:jar:#{version}",
- 'org.ow2.asm:asm-debug-all:jar:5.0.1'
+ 'org.ow2.asm:asm-debug-all:jar:5.2'
]
end
end