buildr 1.4.23-java → 1.4.24-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ac5a79c071e166c1667945c241b632556eb836f
-  data.tar.gz: 8f3ac1ae6d8b42b1396b6ac8a9d604d5433f61a9
+  metadata.gz: 02ab9080c864c8b802ffabc324b6acb8153509cf
+  data.tar.gz: a8ca024e086c63c02818524a41497b026a7b74ff
 SHA512:
-  metadata.gz: 7024ab2e8499015ff09da3a649642edc95ed15d5c64cf9d957500bc7453d13a3840bf6927ded88615a452e359c9aeb2f99d9e88f7f7bdc60d6bdee0cbf81726e
-  data.tar.gz: 0c9b79bff32443ca23715a90f664fdde67d4b106c05029bf43c1888ecb87c40a35c3339912b19e0064dd990638cba39438f69f3043470eda98fb180afd9a5568
+  metadata.gz: 3463f930779b1c370e8d0cda5517f6098028bffd74eb4e5df3aa4530674a14d564b80dc7de4bc4871b3fc92c874145dc2151758de886b69ae0d4451375ed0352
+  data.tar.gz: 22fe3c12421ac0b1ec597a7764712062d1ebc1c1d81741baec7b3a20dbc7eca34d6d3c7fa6a873a5d64324b9927c317d1dd16a439c1df05ef1dafa49ce45463d

data/CHANGELOG

@@ -1,3 +1,33 @@
+1.4.24 (2016-03-19)
+* Added:  Support the :no_invoke parameter being passed to Buildr.project() and
+          Buildr.projects() to avoid attempting to call invoke when retrieving the projects.
+* Added:  Add `exclude_paths` setting to pmd addon to allow paths to be explicitly excluded.
+* Fixed:  Update jDepend addon to ensure target directories are invoked prior to attempting
+          to analyze directories.
+* Added:  Add jdepend.additional_project_names configuration to jDepend addon to
+          ease merging in the source paths from multiple projects into one jDepend task.
+* Added:  Add findbugs.additional_project_names configuration to Findbugs addon to
+          ease merging in the source paths from multiple projects into one Findbugs task.
+* Added:  Add checkstyle.additional_project_names configuration to Checkstyle addon to
+          ease merging in the source paths from multiple projects into one Checkstyle task.
+* Added:  Add pmd.additional_project_names configuration to PMD addon to ease merging in
+          the source paths from multiple projects into one PMD task.
+* Fixed:  In the PMD addon, check that the source directory exists before adding to
+          sources directories to include.
+* Fixed:  BUILDR-709 - Fix "Exception in jacoco.rb [TypeError : can't convert Array into
+          String]". Submitted By Ross Mahony.
+* Added:  Define the 'activate_jruby_facet' addon that activates the jruby facet in
+          generated IDEA project modules.
+* Change: Update the Intellij IDEA plugin to support marking directories as generated.
+* Change: Update the Intellij IDEA plugin to correctly identify project paths as resource
+          directories.
+* Change: Update the default GWT version used in the GWT addon to the latest release 2.7.0.
+* Fixed:  Fix GWT addon to explicitly add gwt-dev artifact to gwt compile path now that
+          the bug that allowed unintended sharing has been fixed.
+* Fixed:  Fix bug in IDEA module generation that resulted in dependencies in IDEA module
+          using shared references to compile dependencies.
+* Change: Update the checkstyle addon to use checkstyle 6.12.1.
+
 1.4.23 (2015-06-12)
 * Change: BUILDR-706 - Update the checkstyle addon use checkstyle 6.6. Submitted
           by Dieter Vrancken.

data/addon/buildr/activate_jruby_facet.rb

@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Buildr
+  module ActivateJrubyFacet
+    module ProjectExtension
+      include Extension
+
+      # A custom extension that just enables the jruby facet in IDEA projects for all projects
+      # that generate idea projects files. This is useful as buildr/rake scripts and other automation
+      # can be identified as ruby projects.
+      after_define do |project|
+        project.iml.add_jruby_facet if project.iml?
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::ActivateJrubyFacet::ProjectExtension
+end

data/addon/buildr/checkstyle.rb

@@ -22,22 +22,21 @@ module Buildr
 
       # The specs for requirements
       def dependencies
-        [
-          'com.puppycrawl.tools:checkstyle:jar:6.6',
-          'antlr:antlr:jar:2.7.7',
-          'org.antlr:antlr4-runtime:jar:4.5',
-          'com.google.guava:guava:jar:18.0',
-          'org.apache.commons:commons-lang3:jar:3.4',
-          'org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1',
-          'commons-cli:commons-cli:jar:1.2',
-          'commons-beanutils:commons-beanutils-core:jar:1.8.3',
-          'commons-logging:commons-logging:jar:1.1.1'
-        ]
+        %w(
+            com.puppycrawl.tools:checkstyle:jar:6.12.1
+            org.antlr:antlr4-runtime:jar:4.5.1-1
+            antlr:antlr:jar:2.7.7
+            com.google.guava:guava:jar:18.0 org.apache.commons:commons-lang3:jar:3.4
+            org.abego.treelayout:org.abego.treelayout.core:jar:1.0.1
+            commons-cli:commons-cli:jar:1.3
+            commons-beanutils:commons-beanutils-core:jar:1.8.3
+            commons-logging:commons-logging:jar:1.1.1
+          )
       end
 
       def checkstyle(configuration_file, format, output_file, source_paths, options = {})
         dependencies = self.dependencies + (options[:dependencies] || [])
-        cp = Buildr.artifacts(dependencies).each { |a| a.invoke() if a.respond_to?(:invoke) }.map(&:to_s)
+        cp = Buildr.artifacts(dependencies).each { |a| a.invoke if a.respond_to?(:invoke) }.map(&:to_s)
 
         args = []
         if options[:properties_file]
@@ -50,11 +49,11 @@ module Buildr
         args << format
         args << '-o'
         args << output_file
-        args += source_paths
+        args += source_paths.select { |p| File.exist?(p) }
 
         begin
           Java::Commands.java 'com.puppycrawl.tools.checkstyle.Main', *(args + [{:classpath => cp, :properties => options[:properties], :java_args => options[:java_args]}])
-        rescue => e
+        rescue Exception => e
           raise e if options[:fail_on_error]
         end
       end
@@ -177,6 +176,35 @@ module Buildr
         @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies].flatten
       end
 
+      # An array of additional projects to scan for main and test sources
+      attr_writer :additional_project_names
+
+      def additional_project_names
+        @additional_project_names ||= []
+      end
+
+      def complete_source_paths
+        paths = self.source_paths.dup
+
+        self.additional_project_names.each do |project_name|
+          p = self.project.project(project_name)
+          paths << [p.compile.sources, p.test.compile.sources].flatten.compact
+        end
+
+        paths.flatten.compact
+      end
+
+      def complete_extra_dependencies
+        deps = self.extra_dependencies.dup
+
+        self.additional_project_names.each do |project_name|
+          p = self.project.project(project_name)
+          deps << [p.compile.dependencies, p.test.compile.dependencies].flatten.compact
+        end
+
+        deps.flatten.compact
+      end
+
       protected
 
       def initialize(project)
@@ -203,10 +231,10 @@ module Buildr
             Buildr::Checkstyle.checkstyle(project.checkstyle.configuration_file,
                                           project.checkstyle.format,
                                           project.checkstyle.xml_output_file,
-                                          project.checkstyle.source_paths.flatten.compact,
+                                          project.checkstyle.complete_source_paths,
                                           :properties => project.checkstyle.properties,
                                           :fail_on_error => project.checkstyle.fail_on_error?,
-                                          :dependencies => project.checkstyle.extra_dependencies)
+                                          :dependencies => project.checkstyle.complete_extra_dependencies)
           end
 
           if project.checkstyle.html_enabled?

data/addon/buildr/findbugs.rb

@@ -154,6 +154,46 @@ module Buildr
         @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies].flatten.compact
       end
 
+      # An array of additional projects to scan for main and test sources
+      attr_writer :additional_project_names
+
+      def additional_project_names
+        @additional_project_names ||= []
+      end
+
+      def complete_source_paths
+        paths = self.source_paths.dup
+
+        self.additional_project_names.each do |project_name|
+          p = self.project.project(project_name)
+          paths << [p.compile.sources, p.test.compile.sources].flatten.compact
+        end
+
+        paths.flatten.compact
+      end
+
+      def complete_analyze_paths
+        paths = self.analyze_paths.dup
+
+        self.additional_project_names.each do |project_name|
+          paths << self.project.project(project_name).compile.target
+        end
+
+        paths.flatten.compact
+      end
+
+      def complete_extra_dependencies
+        deps = self.extra_dependencies.dup
+
+        self.additional_project_names.each do |project_name|
+          p = self.project.project(project_name)
+          deps << [p.compile.dependencies, p.test.compile.dependencies].flatten.compact
+        end
+
+        deps.flatten.compact
+      end
+
+
       protected
 
       def initialize(project)
@@ -179,15 +219,15 @@ module Buildr
               {
                 :properties => project.findbugs.properties,
                 :fail_on_error => project.findbugs.fail_on_error?,
-                :extra_dependencies => project.findbugs.extra_dependencies
+                :extra_dependencies => project.findbugs.complete_extra_dependencies
               }
             options[:exclude_filter] = project.findbugs.filter_file if File.exist?(project.findbugs.filter_file)
             options[:output] = 'xml:withMessages'
             options[:report_level] = project.findbugs.report_level
 
             Buildr::Findbugs.findbugs(project.findbugs.xml_output_file,
-                                      project.findbugs.source_paths.flatten.compact,
-                                      project.findbugs.analyze_paths.flatten.compact,
+                                      project.findbugs.complete_source_paths,
+                                      project.findbugs.complete_analyze_paths,
                                       options)
           end
 
@@ -198,15 +238,15 @@ module Buildr
               {
                 :properties => project.findbugs.properties,
                 :fail_on_error => project.findbugs.fail_on_error?,
-                :extra_dependencies => project.findbugs.extra_dependencies
+                :extra_dependencies => project.findbugs.complete_extra_dependencies
               }
             options[:exclude_filter] = project.findbugs.filter_file if File.exist?(project.findbugs.filter_file)
             options[:output] = 'html'
             options[:report_level] = project.findbugs.report_level
 
             Buildr::Findbugs.findbugs(project.findbugs.html_output_file,
-                                      project.findbugs.source_paths.flatten.compact,
-                                      project.findbugs.analyze_paths.flatten.compact,
+                                      project.findbugs.complete_source_paths,
+                                      project.findbugs.complete_analyze_paths,
                                       options)
           end
         end

data/addon/buildr/gwt.rb

@@ -23,7 +23,7 @@ module Buildr
       end
 
       def version
-        @version || Buildr.settings.build['gwt'] || '2.5.1'
+        @version || Buildr.settings.build['gwt'] || '2.7.0'
       end
 
       # The specs for requirements
@@ -127,22 +127,23 @@ module Buildr
 
         version = gwt_detect_version(dependencies) || Buildr::GWT.version
 
-        if project.iml?
-          existing_deps = project.compile.dependencies.collect do |d|
-            a = artifact(d)
-            a.invoke if a.is_a?(Buildr::Artifact)
-            a.to_s
-          end
-          Buildr::GWT.dependencies(version).each do |d|
-            a = artifact(d)
-            a.invoke if a.respond_to?(:invoke)
-            project.iml.main_dependencies << a.to_s unless existing_deps.include?(a.to_s)
-          end
+        additional_gwt_deps = []
+        existing_deps = project.compile.dependencies.collect do |d|
+          a = artifact(d)
+          a.invoke if a.is_a?(Buildr::Artifact)
+          a.to_s
+        end
+        Buildr::GWT.dependencies(version).each do |d|
+          a = artifact(d)
+          a.invoke if a.respond_to?(:invoke)
+          project.iml.main_dependencies << a.to_s unless !project.iml? || existing_deps.include?(a.to_s)
+          project.compile.dependencies << a.to_s unless existing_deps.include?(a.to_s)
+          additional_gwt_deps << a
         end
 
         task = project.file(output_dir) do
           Buildr::GWT.gwtc_main(module_names,
-                                (dependencies + artifacts).flatten.compact,
+                                (dependencies + artifacts + additional_gwt_deps).flatten.compact,
                                 output_dir,
                                 unit_cache_dir,
                                 {:version => version}.merge(options))

data/addon/buildr/jacoco.rb

@@ -138,7 +138,8 @@ module Buildr
             options << "excludes=#{project.jacoco.excludes.join(':')}" unless project.jacoco.excludes.empty?
 
             agent_config = "-javaagent:#{agent_jar}=#{options.join(',')}"
-            project.test.options[:java_args] = (project.test.options[:java_args] || []) + [agent_config]
+            existing = project.test.options[:java_args] || []
+            project.test.options[:java_args] = (existing.is_a?(Array)? existing : [existing]) + [agent_config]
           end
           namespace 'jacoco' do
             if project.jacoco.generate_xml?

data/addon/buildr/jaxb_xjc.rb

@@ -18,7 +18,7 @@ module Buildr
     class << self
 
       def jaxb_version
-        "2.2.1"
+        '2.2.1'
       end
 
       # The specs for requirements
@@ -32,7 +32,7 @@ module Buildr
 
       # Repositories containing the requirements
       def remote_repository
-        "http://download.java.net/maven/2"
+        'http://download.java.net/maven/2'
       end
 
       def xjc(*args)
@@ -50,15 +50,15 @@ module Buildr
       target_dir = File.expand_path(options[:directory] || _(:target, :generated, :jaxb, 'main/java'))
       timestamp_file = File.expand_path("#{target_dir}/jaxb-#{options[:id] || 1}.cache")
 
-      project.iml.main_source_directories << target_dir if project.iml?
+      project.iml.main_generated_source_directories << target_dir if project.iml?
 
       file(target_dir => timestamp_file)
 
       file(timestamp_file => files.flatten) do |task|
         rm_rf target_dir unless options[:keep_content]
         mkdir_p target_dir
-        args << "-d" << target_dir
-        args << "-p" << options[:package] if options[:package]
+        args << '-d' << target_dir
+        args << '-p' << options[:package] if options[:package]
         args += files.collect{|f| f.to_s}
         JaxbXjc.xjc args
         touch timestamp_file

data/addon/buildr/jdepend.rb

@@ -35,12 +35,12 @@ module Buildr
 
         args = []
         if output_file
-          args << "-file"
+          args << '-file'
           args << output_file
         end
         target_paths.each do |target_path|
           file(target_path).invoke
-          args << target_path.to_s
+          args << target_path.to_s if ::File.exist?(target_path.to_s)
         end
 
         # If no output file then we must be trying to run the swing app
@@ -121,6 +121,28 @@ module Buildr
         }
       end
 
+      # An array of additional projects to scan for target_paths
+      attr_writer :additional_project_names
+
+      def additional_project_names
+        @additional_project_names ||= []
+      end
+
+      def complete_target_paths
+        deps = self.target_paths.dup
+
+        self.additional_project_names.each do |project_name|
+          p = self.project.project(project_name)
+          deps << [p.compile.target, p.test.compile.target].flatten.compact
+        end
+
+        deps = deps.flatten.compact
+        deps.each do |d|
+          d.invoke if d.respond_to?(:invoke)
+        end
+        deps
+      end
+
       protected
 
       def initialize(project)
@@ -140,30 +162,30 @@ module Buildr
 
       after_define do |project|
         if project.jdepend.enabled?
-          desc "Generate JDepend xml report."
-          project.task("jdepend:xml") do
-            puts "JDepend: Analyzing source code..."
+          desc 'Generate JDepend xml report.'
+          project.task('jdepend:xml') do
+            puts 'JDepend: Analyzing source code...'
             mkdir_p File.dirname(project.jdepend.xml_output_file)
             Buildr::JDepend.jdepend(project.jdepend.xml_output_file,
-                                    project.jdepend.target_paths.flatten.compact,
+                                    project.jdepend.complete_target_paths,
                                     project.jdepend.to_options)
           end
 
-          desc "Run JDepend with Swing UI."
-          project.task("jdepend:swing") do
-            puts "JDepend: Analyzing source code..."
+          desc 'Run JDepend with Swing UI.'
+          project.task('jdepend:swing') do
+            puts 'JDepend: Analyzing source code...'
             Buildr::JDepend.jdepend(nil,
-                                    project.jdepend.target_paths.flatten.compact,
+                                    project.jdepend.complete_target_paths,
                                     project.jdepend.to_options)
           end
 
           if project.jdepend.html_enabled?
-            xml_task = project.task("jdepend:xml")
-            desc "Generate JDepend html report."
+            xml_task = project.task('jdepend:xml')
+            desc 'Generate JDepend html report.'
             project.task("jdepend:html" => xml_task) do
-              puts "JDepend: Generating report"
+              puts 'JDepend: Generating report'
               mkdir_p File.dirname(project.jdepend.html_output_file)
-              Buildr.ant "jdepend" do |ant|
+              Buildr.ant 'jdepend' do |ant|
                 ant.xslt :in => project.jdepend.xml_output_file,
                          :out => project.jdepend.html_output_file,
                          :style => project.jdepend.style_file

data/addon/buildr/pmd.rb

@@ -24,13 +24,7 @@ module Buildr
 
       # The specs for requirements
       def dependencies
-        [
-          'net.sourceforge.pmd:pmd:jar:5.1.3',
-          'jaxen:jaxen:jar:1.1.1',
-          'commons-io:commons-io:jar:2.2',
-          'com.beust:jcommander:jar:1.27',
-          'asm:asm:jar:3.2'
-        ]
+        %w(net.sourceforge.pmd:pmd:jar:5.1.3 jaxen:jaxen:jar:1.1.1 commons-io:commons-io:jar:2.2 com.beust:jcommander:jar:1.27 asm:asm:jar:3.2)
       end
 
       def pmd(rule_set_files, format, output_file_prefix, source_paths, options = {})
@@ -56,7 +50,7 @@ module Buildr
           ant.pmd :shortFilenames => true, :rulesetfiles => rule_sets.join(',') do
             ant.formatter :type => format, :toFile => "#{output_file_prefix}.#{format}"
             source_paths.each do |src|
-              ant.fileset :dir=> src, :includes=>'**/*.java'
+              ant.fileset :dir=> src, :includes=>'**/*.java' if File.directory?(src)
             end
           end
 
@@ -76,7 +70,7 @@ module Buildr
           ant.taskdef :name=> 'cpd', :classpath => cp.join(';'), :classname => 'net.sourceforge.pmd.cpd.CPDTask'
           ant.cpd :format => format, :minimumTokenCount => minimum_token_count, :encoding => encoding, :outputFile => "#{output_file_prefix}.#{format}" do
             source_paths.each do |src|
-              ant.fileset :dir=> src, :includes=>'**/*.java'
+              ant.fileset :dir=> src, :includes=>'**/*.java' if File.directory?(src)
             end
           end
 
@@ -95,7 +89,7 @@ module Buildr
       attr_writer :rule_set_files
 
       def rule_set_files
-        @rule_set_files ||= (self.rule_set_artifacts.empty? ? ['rulesets/java/basic.xml', 'rulesets/java/imports.xml', 'rulesets/java/unusedcode.xml', 'rulesets/java/finalizers.xml', 'rulesets/java/braces.xml'] : [])
+        @rule_set_files ||= (self.rule_set_artifacts.empty? ? %w(rulesets/java/basic.xml rulesets/java/imports.xml rulesets/java/unusedcode.xml rulesets/java/finalizers.xml rulesets/java/braces.xml) : [])
       end
 
       # Support specification of rule sets that are distributed as part of a maven repository
@@ -131,8 +125,27 @@ module Buildr
         @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources].flatten.compact
       end
 
+      # An array of paths that should be excluded no matter how they are added to pmd
+      def exclude_paths
+        @source_paths ||= []
+      end
+
+      # An array of additional projects to scan for main and test sources
+      attr_writer :additional_project_names
+
+      def additional_project_names
+        @additional_project_names ||= []
+      end
+
       def flat_source_paths
-        source_paths.flatten.compact
+        paths = source_paths.dup
+
+        self.additional_project_names.each do |project_name|
+          p = self.project.project(project_name)
+          paths << [p.compile.sources, p.test.compile.sources].flatten.compact
+        end
+
+        paths.flatten.select{|p|!self.exclude_paths.include?(p)}.compact
       end
 
       protected