buildr 1.4.20-java → 1.4.21-java

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTA4ZDEwZGU0YmZkNTk5NTVhNGRmNWJmMjhkYjQzNGZkZmU0MGNmOA==
-  data.tar.gz: !binary |-
-    M2E5YzVhZmNmY2YwMjNhM2I5Yjk1ZDNlOWFlMzdiNGQ1MTk2MDU4MA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NzM3MTgzMDIyMjdjYmRiYjgzY2JmNDc2ODNlMzRkMjY0ZjAzZmUzNGNhMjRm
-    NjE3MmQ2ZjhiNjZkMTdkNmVkZTRkNzM2YjYwMWQ5OThhN2JiYzg2OTE0YTY3
-    OGFjNmI0YzY1MzQ2NTljOWU5MGNlY2JjNzI0YjY0NTAwZjhiNzM=
-  data.tar.gz: !binary |-
-    ZjIzMWQzNGNkY2MxNTA4MWNkN2E5Nzk4Y2QyM2VkN2MzYTAyN2QyZDJhZDMx
-    ZGZmMjk0NmM4Njg2NzI3NjFjMzkzZTQxMzI2ZDRiZTk3ZjdmYTNiYWJlMWQx
-    YmZlYTNmNzAxOTc5ZDYxMDQ2OWYxZmMwZDYyODU0NTRiNDFlNzQ=
+SHA1:
+  metadata.gz: 6c401b6fd397ec0ab238ada30b171452bb582a44
+  data.tar.gz: 50561472d1618f6ffbda2c600b59ccf1b6075e06
+SHA512:
+  metadata.gz: f47f658088f9bb32bfc5a91157cbaba33224898ad79b78ffd1aed1bb765005662db39444ef4bd84c98295723409cfabad7488ac6174588431c6f7e41497189d2
+  data.tar.gz: 92ee81e475516f2f57c4dbd21ab577c13e2d7b380f438ce2fe9e30136c733036f95ab791a81cd3770238cca71d4ec018254bf4ded1ad9f380bc3a79dc652f6d5

data/CHANGELOG

@@ -1,3 +1,34 @@
+1.4.21 (2014-11-28)
+* Change: Upgrade atoulme-Antwrap to 0.7.5 to remove deprecation warnings in
+          modern JRuby. Suggested by Pepijn Van Eeckhoudt.
+* Change: Update the gwt addon to add the validation dependencies required for GWT
+          compiles without requiring that the user specify the dependency.
+* Change: Update ipr.add_gwt_configuration method to support GWT 2.7 configuration
+          parameters and IDEA 14 parameters.
+* Change: Upgrade jacoco to 0.7.2. Submitted by neher.
+* Change: Update checkstyle addon to use Checkstyle 6.0.
+* Added:  Updated the gwt addon to support the upcoming GWT 2.7.x release.
+* Change: Enhance ipr.add_glassfish_configuration to support the ability to
+          define the version of GlassFish in uses. Change the default to 4.1.0
+          as that is the latest supported variant.
+* Fixed:  Change the name of the GlassFish install in ipr.add_glassfish_configuration
+          to use the same convention that IDEA uses by default. i.e. Name the
+          installation "GlassFish 4.1.0" rather than "Glassfish 4.1.0".
+* Change: Change the default version of the jdk in IDEA project files to 1.7.
+* Change: Change the default version of the IDEA project files created to the
+          current release version 13. To revert to the older versions specify
+          ipr.version = '12' in your buildfile.
+* Added:  Enhance the IdeaFile class to easily support mixing in of custom
+          components from either the filesystem or from an artifact.
+* Change: Update rjb to version 1.5.1.
+* Added:  Update checkstyle addon to support downloading checkstyle checks
+          as an artifact.
+* Added:  Update checkstyle addon to supply checkstyle.config.dir property.
+* Added:  Update pmd addon to support downloading rule files as an artifact.
+* Change: Update pmd addon to use pmd version 5.1.3.
+* Fixed:  BUILDR-702 - Retain Unix permission flags when merging
+          zip files into another zip or tar archive. Submitted by Pepijn Van Eeckhoudt.
+
 1.4.20 (2014-08-23)
 * Fixed : BUILDR-688 - Disregard package-info.java files when determining if
           the Javac compiler should be run or not. Submitted by Pepijn Van

data/Rakefile

@@ -31,9 +31,11 @@ end
 # Load the Gem specification for the current platform (Ruby or JRuby).
 def spec(platform = RUBY_PLATFORM[/java/] || 'ruby')
   @specs ||= ['ruby', 'java', 'x86-mswin32'].inject({}) { |hash, spec_platform|
-    $platform = spec_platform
-    raise 'Gem::Specification.load ignores global context (thus $platform) in later versions' unless RUBY_VERSION == '1.9.3'
-    hash.update(spec_platform=>Gem::Specification.load('buildr.gemspec'))
+    ENV['BUILDR_PLATFORM'] = spec_platform
+    hash.update(spec_platform=> Gem::Specification.load('buildr.gemspec'))
+    Gem::Specification._clear_load_cache
+    ENV['BUILDR_PLATFORM'] = nil
+    hash
   }
   @specs[platform]
 end

data/addon/buildr/checkstyle.rb

@@ -23,12 +23,11 @@ module Buildr
       # The specs for requirements
       def dependencies
         [
-          'com.puppycrawl.tools:checkstyle:jar:5.7',
-          'commons-cli:commons-cli:jar:1.2',
+          'com.puppycrawl.tools:checkstyle:jar:6.0',
           'antlr:antlr:jar:2.7.7',
-          'com.google.guava:guava-jdk5:jar:16.0',
-          'com.google.guava:guava-bootstrap-jdk5:jar:16.0',
-          'com.google.collections:google-collections:jar:1.0',
+          'org.antlr:antlr4-runtime:jar:4.3',
+          'com.google.guava:guava:jar:18.0',
+          'commons-cli:commons-cli:jar:1.2',
           'commons-beanutils:commons-beanutils-core:jar:1.8.3',
           'commons-logging:commons-logging:jar:1.1.1'
         ]
@@ -40,17 +39,17 @@ module Buildr
 
         args = []
         if options[:properties_file]
-          args << "-p"
+          args << '-p'
           args << options[:properties_file]
         end
-        args << "-c"
+        args << '-c'
         args << configuration_file
-        args << "-f"
+        args << '-f'
         args << format
-        args << "-o"
+        args << '-o'
         args << output_file
         source_paths.each do |source_path|
-          args << "-r"
+          args << '-r'
           args << source_path
         end
 
@@ -85,8 +84,30 @@ module Buildr
 
       attr_writer :configuration_file
 
+      def configuration_file=(configuration_file)
+        raise 'Configuration artifact already specified' if @configuration_artifact
+        @configuration_file = configuration_file
+      end
+
       def configuration_file
-        @configuration_file || "#{self.config_directory}/checks.xml"
+        if @configuration_file
+          return @configuration_file
+        elsif @configuration_artifact.nil?
+          "#{self.config_directory}/checks.xml"
+        else
+          a = Buildr.artifact(@configuration_artifact)
+          a.invoke
+          a.to_s
+        end
+      end
+
+      def configuration_artifact=(configuration_artifact)
+        raise 'Configuration file already specified' if @configuration_file
+        @configuration_artifact = configuration_artifact
+      end
+
+      def configuration_artifact
+        @configuration_artifact
       end
 
       attr_writer :fail_on_error
@@ -142,6 +163,7 @@ module Buildr
       def properties
         unless @properties
           @properties = {:basedir => self.project.base_dir}
+          @properties['checkstyle.config.dir'] = self.config_directory if File.directory?(self.config_directory)
           @properties['checkstyle.suppressions.file'] = self.suppressions_file if File.exist?(self.suppressions_file)
           @properties['checkstyle.import-control.file'] = self.import_control_file if File.exist?(self.import_control_file)
         end
@@ -175,9 +197,9 @@ module Buildr
 
       after_define do |project|
         if project.checkstyle.enabled?
-          desc "Generate checkstyle xml report."
-          project.task("checkstyle:xml") do
-            puts "Checkstyle: Analyzing source code..."
+          desc 'Generate checkstyle xml report.'
+          project.task('checkstyle:xml') do
+            puts 'Checkstyle: Analyzing source code...'
             mkdir_p File.dirname(project.checkstyle.xml_output_file)
             Buildr::Checkstyle.checkstyle(project.checkstyle.configuration_file,
                                           project.checkstyle.format,
@@ -189,12 +211,12 @@ module Buildr
           end
 
           if project.checkstyle.html_enabled?
-            xml_task = project.task("checkstyle:xml")
-            desc "Generate checkstyle html report."
-            project.task("checkstyle:html" => xml_task) do
-              puts "Checkstyle: Generating report"
+            xml_task = project.task('checkstyle:xml')
+            desc 'Generate checkstyle html report.'
+            project.task('checkstyle:html' => xml_task) do
+              puts 'Checkstyle: Generating report'
               mkdir_p File.dirname(project.checkstyle.html_output_file)
-              Buildr.ant "checkstyle" do |ant|
+              Buildr.ant 'checkstyle' do |ant|
                 ant.xslt :in => project.checkstyle.xml_output_file,
                          :out => project.checkstyle.html_output_file,
                          :style => project.checkstyle.style_file

data/addon/buildr/gwt.rb

@@ -28,46 +28,58 @@ module Buildr
 
       # The specs for requirements
       def dependencies(version = nil)
-        ["com.google.gwt:gwt-dev:jar:#{version || self.version}"]
+        validation_deps =
+          %w(javax.validation:validation-api:jar:1.0.0.GA javax.validation:validation-api:jar:sources:1.0.0.GA)
+        v = version || self.version
+        gwt_dev_jar = "com.google.gwt:gwt-dev:jar:#{v}"
+        if v <= '2.6.1'
+          [gwt_dev_jar] + validation_deps
+        else
+          [
+            gwt_dev_jar,
+            'org.ow2.asm:asm:jar:5.0.3'
+          ] + validation_deps
+        end
       end
 
       def gwtc_main(modules, source_artifacts, output_dir, unit_cache_dir, options = {})
-        cp = Buildr.artifacts(self.dependencies(options[:version])).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
-        style = options[:style] || "OBFUSCATED," # "PRETTY", "DETAILED"
+        base_dependencies = self.dependencies(options[:version])
+        cp = Buildr.artifacts(base_dependencies).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
+        style = options[:style] || 'OBFUSCATED,' # 'PRETTY', 'DETAILED'
         log_level = options[:log_level] #  ERROR, WARN, INFO, TRACE, DEBUG, SPAM, or ALL
         workers = options[:workers] || 2
 
         args = []
         if log_level
-          args << "-logLevel"
+          args << '-logLevel'
           args << log_level
         end
-        args << "-strict"
-        args << "-style"
+        args << '-strict'
+        args << '-style'
         args << style
-        args << "-localWorkers"
+        args << '-localWorkers'
         args << workers
-        args << "-war"
+        args << '-war'
         args << output_dir
         if options[:compile_report_dir]
-          args << "-compileReport"
-          args << "-extra"
+          args << '-compileReport'
+          args << '-extra'
           args << options[:compile_report_dir]
         end
 
         if options[:draft_compile]
-          args << "-draftCompile"
+          args << '-draftCompile'
         end
 
         if options[:enable_closure_compiler].nil? || options[:enable_closure_compiler]
-          args << "-XenableClosureCompiler"
+          args << '-XenableClosureCompiler'
         end
 
         args += modules
 
         properties = options[:properties] ? options[:properties].dup : {}
-        properties["gwt.persistentunitcache"] = "true"
-        properties["gwt.persistentunitcachedir"] = unit_cache_dir
+        properties['gwt.persistentunitcache'] = 'true'
+        properties['gwt.persistentunitcachedir'] = unit_cache_dir
 
         Java::Commands.java 'com.google.gwt.dev.Compiler', *(args + [{:classpath => cp, :properties => properties, :java_args => options[:java_args], :pathing_jar => false}])
       end
@@ -81,10 +93,10 @@ module Buildr
         cp = Buildr.artifacts(self.superdev_dependencies(options[:version])).each(&:invoke).map(&:to_s) + Buildr.artifacts(source_artifacts).each(&:invoke).map(&:to_s)
 
         args = []
-        args << "-port" << (options[:port] || 5050)
-        args << "-workDir" << work_dir
+        args << '-port' << (options[:port] || 5050)
+        args << '-workDir' << work_dir
         (options[:src] || []).each do |src|
-          args << "-src" << src
+          args << '-src' << src
         end
         args << module_name
 
@@ -111,12 +123,28 @@ module Buildr
 
         unit_cache_dir = project._(:target, :gwt, :unit_cache_dir, output_key)
 
+        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.respond_to?(:invoke)
+            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
+        end
+
         task = project.file(output_dir) do
           Buildr::GWT.gwtc_main(module_names,
                                 (dependencies + artifacts).flatten.compact,
                                 output_dir,
                                 unit_cache_dir,
-                                {:version => gwt_detect_version(dependencies)}.merge(options))
+                                {:version => version}.merge(options))
         end
         task.enhance(dependencies)
         task.enhance([project.compile])
@@ -137,8 +165,8 @@ module Buildr
           end
         end
 
-        desc "Run Superdev mode"
-        project.task("superdev") do
+        desc 'Run Superdev mode'
+        project.task('superdev') do
           work_dir = project._(:target, :gwt, :superdev)
           mkdir_p work_dir
           Buildr::GWT.gwt_superdev(module_name,

data/addon/buildr/jacoco.rb

@@ -18,7 +18,7 @@ module Buildr
   # WARNING: Experimental and may change radically.
   module JaCoCo
     class << self
-      VERSION = '0.5.10.201208310627'
+      VERSION = '0.7.2.201409121644'
 
       def version
         @version || Buildr.settings.build['jacoco'] || VERSION
@@ -37,9 +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}",
-          'asm:asm:jar:3.3.1',
-          'asm:asm-commons:jar:3.3.1',
-          'asm:asm-tree:jar:3.3.1'
+          'org.ow2.asm:asm-debug-all:jar:5.0.1'
         ]
       end
     end

data/addon/buildr/pmd.rb

@@ -17,7 +17,7 @@ module Buildr
   # Provides the <code>pmd:rule:xml</code>, <code>pmd:rule:html</code>, <code>pmd:cpd:xml</code>
   # and <code>pmd:cpd:html</code> tasks.
   #
-  # Require explicitly using <code>require "buildr/pmd"</code>.
+  # Require explicitly using <code>require 'buildr/pmd'</code>.
   module Pmd
 
     class << self
@@ -25,7 +25,7 @@ module Buildr
       # The specs for requirements
       def dependencies
         [
-          'net.sourceforge.pmd:pmd:jar:5.1.1',
+          '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',
@@ -38,12 +38,22 @@ module Buildr
         cp = Buildr.artifacts(dependencies).each(&:invoke).map(&:to_s)
         (options[:rule_set_paths] || []).each {|p| cp << p}
 
-        puts "PMD: Analyzing source code..."
+        rule_sets = rule_set_files.dup
+
+        Buildr.artifacts(options[:rule_set_artifacts] || []).each do |artifact|
+          a = artifact.to_s
+          dirname = File.dirname(a)
+          rule_sets << a[dirname.length + 1, a.length]
+          cp << File.dirname(a)
+          artifact.invoke
+        end
+
+        puts 'PMD: Analyzing source code...'
         mkdir_p File.dirname(output_file_prefix)
 
-        Buildr.ant("pmd-report") do |ant|
+        Buildr.ant('pmd-report') do |ant|
           ant.taskdef :name=> 'pmd', :classpath => cp.join(';'), :classname => 'net.sourceforge.pmd.ant.PMDTask'
-          ant.pmd :shortFilenames => true, :rulesetfiles => rule_set_files.join(',') do
+          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'
@@ -59,10 +69,10 @@ module Buildr
         minimum_token_count = options[:minimum_token_count] || 100
         encoding = options[:encoding] || 'UTF-8'
 
-        puts "PMD-CPD: Analyzing source code..."
+        puts 'PMD-CPD: Analyzing source code...'
         mkdir_p File.dirname(output_file_prefix)
 
-        Buildr.ant("cpd-report") do |ant|
+        Buildr.ant('cpd-report') do |ant|
           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|
@@ -85,7 +95,12 @@ module Buildr
       attr_writer :rule_set_files
 
       def rule_set_files
-        @rule_set_files ||= ['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? ? ['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
+      def rule_set_artifacts
+        @rule_set_artifacts ||= []
       end
 
       attr_writer :rule_set_paths
@@ -138,23 +153,23 @@ module Buildr
 
       after_define do |project|
         if project.pmd.enabled?
-          desc "Generate pmd xml report."
-          project.task("pmd:rule:xml") do
-            Buildr::Pmd.pmd(project.pmd.rule_set_files, 'xml', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths)
+          desc 'Generate pmd xml report.'
+          project.task('pmd:rule:xml') do
+            Buildr::Pmd.pmd(project.pmd.rule_set_files, 'xml', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths, :rule_set_artifacts => project.pmd.rule_set_artifacts)
           end
 
-          desc "Generate pmd html report."
-          project.task("pmd:rule:html") do
-            Buildr::Pmd.pmd(project.pmd.rule_set_files, 'html', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths)
+          desc 'Generate pmd html report.'
+          project.task('pmd:rule:html') do
+            Buildr::Pmd.pmd(project.pmd.rule_set_files, 'html', project.pmd.output_file_prefix, project.pmd.flat_source_paths, :rule_set_paths => project.pmd.rule_set_paths, :rule_set_artifacts => project.pmd.rule_set_artifacts)
           end
 
-          desc "Generate pmd cpd xml report."
-          project.task("pmd:cpd:xml") do
+          desc 'Generate pmd cpd xml report.'
+          project.task('pmd:cpd:xml') do
             Buildr::Pmd.cpd('xml', project.pmd.cpd_output_file_prefix, project.pmd.flat_source_paths)
           end
 
-          desc "Generate pmd cpd text report."
-          project.task("pmd:cpd:text") do
+          desc 'Generate pmd cpd text report.'
+          project.task('pmd:cpd:text') do
             Buildr::Pmd.cpd('text', project.pmd.cpd_output_file_prefix, project.pmd.flat_source_paths)
           end
         end

data/buildr.gemspec

@@ -18,9 +18,10 @@ unless defined?(Buildr::VERSION)
   $LOADED_FEATURES << 'buildr/version.rb'
 end
 
-# Rakefile needs to create spec for both platforms (ruby and java), using the
-# $platform global variable.  In all other cases, we figure it out from RUBY_PLATFORM.
-$platform ||= RUBY_PLATFORM[/java/] || 'ruby'
+# Rakefile needs to create spec for all platforms (ruby and java), using the
+# BUILDR_PLATFORM environment variable. In all other cases, we figure it out
+# from RUBY_PLATFORM.
+$platform = ENV['BUILDR_PLATFORM'] || RUBY_PLATFORM[/java/] || Gem::Platform::CURRENT
 
 Gem::Specification.new do |spec|
   spec.name           = 'buildr'
@@ -29,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.email          = 'users@buildr.apache.org'
   spec.homepage       = 'http://buildr.apache.org/'
   spec.summary        = 'Build like you code'
+  spec.licenses        = ['Apache-2.0']
   spec.description    = <<-TEXT
 Apache Buildr is a build system for Java-based applications, including support
 for Scala, Groovy and a growing number of JVM languages and tools.  We wanted
@@ -63,8 +65,8 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'rubyzip',              '0.9.9'
   spec.add_dependency 'json_pure',            '1.8.0'
   spec.add_dependency 'hoe',                  '3.7.1'
-  spec.add_dependency 'rjb',                  '1.4.9' if ($platform.to_s == 'x86-mswin32' || $platform.to_s == 'ruby')
-  spec.add_dependency 'atoulme-Antwrap',      '~> 0.7.4'
+  spec.add_dependency 'rjb',                  '1.5.1' if ($platform.to_s == 'x86-mswin32' || $platform.to_s == 'ruby')
+  spec.add_dependency 'atoulme-Antwrap',      '0.7.5'
   spec.add_dependency 'diff-lcs',             '1.2.4'
   spec.add_dependency 'rspec-expectations',   '2.14.3'
   spec.add_dependency 'rspec-mocks',          '2.14.3'
@@ -74,7 +76,7 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'minitar',              '0.5.4'
   spec.add_dependency 'jruby-openssl',        '~> 0.8.2' if $platform.to_s == 'java'
   spec.add_dependency 'bundler'
-  spec.add_dependency 'orderedhash'
+  spec.add_dependency 'orderedhash',          '0.0.6'
   spec.add_dependency 'win32console'          '1.3.2' if $platform.to_s == 'x86-mswin32'
 
   # Unable to get this consistently working under jruby on windows