RubyGems - buildr - Versions diffs - 1.4.19-java → 1.4.20-java - Mend

buildr 1.4.19-java → 1.4.20-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

checksums.yaml +8 -8
data/CHANGELOG +22 -0
data/README.rdoc +0 -1
data/Rakefile +1 -0
data/addon/buildr/findbugs.rb +57 -64
data/addon/buildr/pmd.rb +1 -1
data/addon/buildr/single_intermediate_layout.rb +2 -0
data/buildr.gemspec +7 -7
data/doc/download.textile +18 -6
data/doc/index.textile +15 -20
data/lib/buildr/core/generate.rb +1 -1
data/lib/buildr/ide/idea.rb +2 -0
data/lib/buildr/java/compiler.rb +7 -0
data/lib/buildr/java/tests.rb +6 -5
data/lib/buildr/java/version_requirement.rb +4 -2
data/lib/buildr/packaging/version_requirement.rb +6 -5
data/lib/buildr/version.rb +1 -1
data/spec/java/compiler_spec.rb +7 -0
data/spec/java/tests_spec.rb +18 -0
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjBlZTJjN2RkNTQ4YTMxZWJmYjNlMzE5MTQ5MjUwYTIzMGVmNDE3ZQ==
+    OTA4ZDEwZGU0YmZkNTk5NTVhNGRmNWJmMjhkYjQzNGZkZmU0MGNmOA==
   data.tar.gz: !binary |-
-    NjFhYjVhMzE1MWNmMTIzYTc1MzM4ZmUwNGI2N2VkNDhmYjc0MmZlNw==
+    M2E5YzVhZmNmY2YwMjNhM2I5Yjk1ZDNlOWFlMzdiNGQ1MTk2MDU4MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTdiOTZjNzRhNmI2ZjI3MWI2MWQ2ZWRmMjI5ZGZkZTQ3YTFlMTk3MjM4N2Qz
-    NTVlYWY5MTM1MGRiM2IwYWNmYmRkNDA1NWI2ODczNzI1MGI0MzI4ZjZlYTQ3
-    NTA0YzU4OTZiZmJmYjhlZjUxNjlhY2NlNzNiMzczNWQ3NjY3NjA=
+    NzM3MTgzMDIyMjdjYmRiYjgzY2JmNDc2ODNlMzRkMjY0ZjAzZmUzNGNhMjRm
+    NjE3MmQ2ZjhiNjZkMTdkNmVkZTRkNzM2YjYwMWQ5OThhN2JiYzg2OTE0YTY3
+    OGFjNmI0YzY1MzQ2NTljOWU5MGNlY2JjNzI0YjY0NTAwZjhiNzM=
   data.tar.gz: !binary |-
-    ZGQ5OGVmNGM2NjUxMjIzM2RlNjdlNjFlN2VhNTJjODRmM2ZhNjY1YzRiNzYw
-    MGVlNjQ0ZjU0ZmUzMjg2M2RkZGM2Yjc0MTgzZjVlODRmMWI2OTcyZmIyNjdj
-    YzdjYzE5ZGQ3NTczODNjMzk5YzJmNjUyNTUxYTFkYWI4MWUzOGY=
+    ZjIzMWQzNGNkY2MxNTA4MWNkN2E5Nzk4Y2QyM2VkN2MzYTAyN2QyZDJhZDMx
+    ZGZmMjk0NmM4Njg2NzI3NjFjMzkzZTQxMzI2ZDRiZTk3ZjdmYTNiYWJlMWQx
+    YmZlYTNmNzAxOTc5ZDYxMDQ2OWYxZmMwZDYyODU0NTRiNDFlNzQ=

data/CHANGELOG CHANGED Viewed

@@ -1,3 +1,25 @@
+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
+          Eeckhoudt.
+* Fixed : Work around bug/feature of jruby 1.7.13 that caches Gem::Version
+          objects based on constructor parameters that causes issues with
+          Buildr as we mutate the version objects through monkey patching.
+* Change: Upgrade rjb dependency to 1.4.9.
+* Change: BUILDR-701 - Update to JUnit 4.11. Submitted by Jean-Philippe Caruana.
+* Added:  Support the 'report_level' property on findbugs addon.
+* Change: Update the findbugs addon to use the 3.0.0 version of Findbugs.
+* Change: Update the findbugs addon to use the built-in findbugs stylesheet
+          to generate the html report.
+* Fixed:  Ensure that the 'source_paths' and 'extra_dependencies' properties
+          in the findbugs addon does not contain arrays or nils.
+* Fixed:  Ensure that the 'single_intermediate_layout' addon removes the top
+          level target and reports directories during 'clean' phase.
+* Added:  Enhance idea project generation of ejb facet by looking for ejb
+          descriptors in location compatible with ejb-jars.
+* Fixed:  Ensure that the 'source_paths' property in the pmd addon does not
+          contain arrays or nils.
 1.4.19 (2014-07-06)
 * Fixed:  BUILDR-700 - Ensure SNAPSHOT artifacts, constructed using the
           download(artifact('group:artifact:jar:1-SNAPSHOT') =>

data/README.rdoc CHANGED Viewed

@@ -114,7 +114,6 @@ which changes might have broken your build.  To run all the test cases:
   rake spec
 == License
 Licensed to the Apache Software Foundation (ASF) under one or more

data/Rakefile CHANGED Viewed

@@ -32,6 +32,7 @@ end
 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'))
   }
   @specs[platform]

data/addon/buildr/findbugs.rb CHANGED Viewed

@@ -22,48 +22,41 @@ module Buildr
       # The specs for requirements
       def dependencies
-        [
-            'com.google.code.findbugs:findbugs-ant:jar:1.3.9',
-            'com.google.code.findbugs:findbugs:jar:1.3.9',
-            'com.google.code.findbugs:bcel:jar:1.3.9',
-            'com.google.code.findbugs:jsr305:jar:1.3.9',
-            'com.google.code.findbugs:jFormatString:jar:1.3.9',
-            'com.google.code.findbugs:annotations:jar:1.3.9',
-            'dom4j:dom4j:jar:1.6.1',
-            'jaxen:jaxen:jar:1.1.1',
-            'jdom:jdom:jar:1.0',
-            'xom:xom:jar:1.0',
-            'com.ibm.icu:icu4j:jar:2.6.1',
-            'asm:asm:jar:3.1',
-            'asm:asm-analysis:jar:3.1',
-            'asm:asm-tree:jar:3.1',
-            'asm:asm-commons:jar:3.1',
-            'asm:asm-util:jar:3.1',
-            'asm:asm-xml:jar:3.1',
-            'commons-lang:commons-lang:jar:2.4'
-        ]
-      end
-      def findbugs(output_file, source_paths, analyze_paths, options = { })
+        %w(
+          com.google.code.findbugs:findbugs:jar:3.0.0
+          com.google.code.findbugs:jFormatString:jar:3.0.0
+          com.google.code.findbugs:bcel-findbugs:jar:6.0
+          com.google.code.findbugs:annotations:jar:3.0.0
+          org.ow2.asm:asm-debug-all:jar:5.0.2
+          commons-lang:commons-lang:jar:2.6
+          dom4j:dom4j:jar:1.6.1
+          jaxen:jaxen:jar:1.1.6
+        )
+      end
+      def findbugs(output_file, source_paths, analyze_paths, options = {})
         dependencies = (options[:dependencies] || []) + self.dependencies
         cp = Buildr.artifacts(dependencies).each { |a| a.invoke() if a.respond_to?(:invoke) }.map(&:to_s).join(File::PATH_SEPARATOR)
         args = {
-            :output => "xml:withMessages",
-            :outputFile => output_file,
-            :effort => 'max',
-            :pluginList => '',
-            :classpath => cp,
-            :timeout => "90000000",
-            :debug => "false"
+          :output => options[:output] || 'xml',
+          :outputFile => output_file,
+          :effort => 'max',
+          :pluginList => '',
+          :classpath => cp,
+          :reportLevel => options[:report_level] || 'medium',
+          :timeout => '90000000',
+          :debug => 'false'
         }
         args[:failOnError] = true if options[:fail_on_error]
         args[:excludeFilter] = options[:exclude_filter] if options[:exclude_filter]
         args[:jvmargs] = options[:java_args] if options[:java_args]
+        mkdir_p File.dirname(output_file)
         Buildr.ant('findBugs') do |ant|
-          ant.taskdef :name =>'findBugs',
-                      :classname =>'edu.umd.cs.findbugs.anttask.FindBugsTask',
+          ant.taskdef :name => 'findBugs',
+                      :classname => 'edu.umd.cs.findbugs.anttask.FindBugsTask',
                       :classpath => cp
           ant.findBugs args do
             source_paths.each do |source_path|
@@ -97,16 +90,18 @@ module Buildr
         !!@enabled
       end
-      def html_enabled?
-        File.exist?(self.style_file)
-      end
       attr_writer :config_directory
       def config_directory
         @config_directory || project._(:source, :main, :etc, :findbugs)
       end
+      attr_writer :report_level
+      def report_level
+        @report_level || 'medium'
+      end
       attr_writer :report_dir
       def report_dir
@@ -131,12 +126,6 @@ module Buildr
         @html_output_file || "#{self.report_dir}/findbugs.html"
       end
-      attr_writer :style_file
-      def style_file
-        @style_file || "#{self.config_directory}/findbugs-report.xsl"
-      end
       attr_writer :filter_file
       def filter_file
@@ -144,17 +133,17 @@ module Buildr
       end
       def properties
-        @properties ||= { }
+        @properties ||= {}
       end
       attr_writer :java_args
       def java_args
-        @java_args || "-server -Xss1m -Xmx800m -Duser.language=en -Duser.region=EN "
+        @java_args || '-server -Xss1m -Xmx800m -Duser.language=en -Duser.region=EN '
       end
       def source_paths
-        @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources]
+        @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources].flatten.compact
       end
       def analyze_paths
@@ -162,7 +151,7 @@ module Buildr
       end
       def extra_dependencies
-        @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies]
+        @extra_dependencies ||= [self.project.compile.dependencies, self.project.test.compile.dependencies].flatten.compact
       end
       protected
@@ -172,7 +161,6 @@ module Buildr
       end
       attr_reader :project
     end
     module ProjectExtension
@@ -184,11 +172,9 @@ module Buildr
       after_define do |project|
         if project.findbugs.enabled?
-          desc "Generate findbugs xml report."
-          project.task("findbugs:xml") do
-            puts "Findbugs: Analyzing source code..."
-            mkdir_p File.dirname(project.findbugs.xml_output_file)
+          desc 'Generate findbugs xml report.'
+          project.task('findbugs:xml') do
+            puts 'Findbugs: Analyzing source code...'
             options =
               {
                 :properties => project.findbugs.properties,
@@ -196,6 +182,8 @@ module Buildr
                 :extra_dependencies => project.findbugs.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,
@@ -203,18 +191,23 @@ module Buildr
                                       options)
           end
-          if project.findbugs.html_enabled?
-            xml_task = project.task("findbugs:xml")
-            desc "Generate findbugs html report."
-            project.task("findbugs:html" => xml_task) do
-              puts "Findbugs: Generating report"
-              mkdir_p File.dirname(project.findbugs.html_output_file)
-              Buildr.ant "findbugs" do |ant|
-                ant.style :in => project.findbugs.xml_output_file,
-                          :out => project.findbugs.html_output_file,
-                          :style => project.findbugs.style_file
-              end
-            end
+          desc 'Generate findbugs html report.'
+          project.task('findbugs:html') do
+            puts 'Findbugs: Analyzing source code...'
+            options =
+              {
+                :properties => project.findbugs.properties,
+                :fail_on_error => project.findbugs.fail_on_error?,
+                :extra_dependencies => project.findbugs.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,
+                                      options)
           end
         end
       end

data/addon/buildr/pmd.rb CHANGED Viewed

@@ -113,7 +113,7 @@ module Buildr
       end
       def source_paths
-        @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources]
+        @source_paths ||= [self.project.compile.sources, self.project.test.compile.sources].flatten.compact
       end
       def flat_source_paths

data/addon/buildr/single_intermediate_layout.rb CHANGED Viewed

@@ -60,6 +60,8 @@ module Buildr #nodoc
           if top_dir == base_dir && project.iml?
             project.iml.excluded_directories << "#{base_dir}/target"
             project.iml.excluded_directories << "#{base_dir}/reports"
+            clean { rm_rf "#{base_dir}/target" }
+            clean { rm_rf "#{base_dir}/reports" }
           end
           project
         end

data/buildr.gemspec CHANGED Viewed

@@ -26,9 +26,9 @@ Gem::Specification.new do |spec|
   spec.name           = 'buildr'
   spec.version        = Buildr::VERSION.dup
   spec.author         = 'Apache Buildr'
-  spec.email          = "users@buildr.apache.org"
-  spec.homepage       = "http://buildr.apache.org/"
-  spec.summary        = "Build like you code"
+  spec.email          = 'users@buildr.apache.org'
+  spec.homepage       = 'http://buildr.apache.org/'
+  spec.summary        = 'Build like you code'
   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
@@ -49,9 +49,9 @@ for those one-off tasks, with a language that's a joy to use.
   spec.extra_rdoc_files = 'README.rdoc', 'CHANGELOG', 'LICENSE', 'NOTICE'
   spec.rdoc_options     = '--title', 'Buildr', '--main', 'README.rdoc',
                           '--webcvs', 'https://github.com/apache/buildr'
-  spec.post_install_message = "To get started run buildr --help"
+  spec.post_install_message = 'To get started run buildr --help'
-  spec.required_rubygems_version = ">= 1.8.6"
+  spec.required_rubygems_version = '>= 1.8.6'
   # Tested against these dependencies.
   spec.add_dependency 'rake',                 '0.9.2.2'
@@ -59,11 +59,11 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'net-ssh',              '2.7.0'
   spec.add_dependency 'net-sftp',             '2.1.2'
   # Required for sftp support under windows
-  spec.add_dependency "jruby-pageant",        '1.1.1' if $platform.to_s == 'java'
+  spec.add_dependency 'jruby-pageant',        '1.1.1' if $platform.to_s == 'java'
   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.8' if ($platform.to_s == 'x86-mswin32' || $platform.to_s == 'ruby')
+  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 'diff-lcs',             '1.2.4'
   spec.add_dependency 'rspec-expectations',   '2.14.3'

data/doc/download.textile CHANGED Viewed

@@ -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.4.19 (2014-07-06)
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.4.19-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19-java.gem | "bdf35f947eab94766ec4a4ca4b82e73e":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-java.gem.asc |
+| "buildr-1.4.19-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem | "9fbe0ac5148e5d3a6f449dfbd5dfc4a2":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19-x86-mswin32.gem.asc |
+| "buildr-1.4.19.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19.gem | "626af3aabef47a6c55587aaeca5d879d":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.gem.asc |
+| "buildr-1.4.19.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19.tgz | "f9bc0151a6ed9867c40393cced6195f5":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.tgz.asc |
+| "buildr-1.4.19.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.19/buildr-1.4.19.zip | "1c88b93901524e236db41ec69a3bc72a":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.19/buildr-1.4.19.zip.asc |
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.19/KEYS)
 h3. buildr 1.4.18 (2014-06-24)
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.4.18-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18-java.gem | "e71adb986a066d0238325dabdfe577ff":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18-java.gem.asc |
-| "buildr-1.4.18-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18-x86-mswin32.gem | "322d4008c2b8ca45e7e78e0248b35d4a":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18-x86-mswin32.gem.asc |
-| "buildr-1.4.18.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18.gem | "9bb3eb5085bd531ef7b2dc68baf847ad":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.gem.asc |
-| "buildr-1.4.18.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18.tgz | "f6a74d86f76abf9e7de5e2c32ec59946":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.tgz.asc |
-| "buildr-1.4.18.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.18/buildr-1.4.18.zip | "3fba955436b4dd5f88e0f280d765f37b":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.18/buildr-1.4.18.zip.asc |
+| "buildr-1.4.18-java.gem":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18-java.gem | "e71adb986a066d0238325dabdfe577ff":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18-java.gem.asc |
+| "buildr-1.4.18-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18-x86-mswin32.gem | "322d4008c2b8ca45e7e78e0248b35d4a":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18-x86-mswin32.gem.asc |
+| "buildr-1.4.18.gem":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18.gem | "9bb3eb5085bd531ef7b2dc68baf847ad":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18.gem.asc |
+| "buildr-1.4.18.tgz":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18.tgz | "f6a74d86f76abf9e7de5e2c32ec59946":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18.tgz.asc |
+| "buildr-1.4.18.zip":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18.zip | "3fba955436b4dd5f88e0f280d765f37b":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.18/buildr-1.4.18.zip.asc |
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.18/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.18/KEYS)
 h3. buildr 1.4.17 (2014-05-25)

data/doc/index.textile CHANGED Viewed

@@ -46,6 +46,21 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 h2(#news).  What's New
+Highlights from Buildr 1.4.20 (2014-08-23)
+* Fixed : Work around bug/feature of jruby 1.7.13 that caches Gem::Version
+          objects based on constructor parameters that causes issues with
+          Buildr as we mutate the version objects through monkey patching.
+* Change: Upgrade rjb dependency to 1.4.9.
+* Change: BUILDR-701 - Update to JUnit 4.11. Submitted by Jean-Philippe Caruana.
+* Added:  Support the 'report_level' property on findbugs addon.
+* Change: Update the findbugs addon to use the 3.0.0 version of Findbugs.
+* Change: Update the findbugs addon to use the built-in findbugs stylesheet
+          to generate the html report.
+* Fixed:  Ensure that the 'single_intermediate_layout' addon removes the top
+          level target and reports directories during 'clean' phase.
+* Added:  Enhance idea project generation of ejb facet by looking for ejb
+          descriptors in location compatible with ejb-jars.
 Highlights from Buildr 1.4.19 (2014-07-06)
 * Fixed:  BUILDR-700 - Ensure SNAPSHOT artifacts, constructed using the
           download(artifact('group:artifact:jar:1-SNAPSHOT') =>
@@ -57,26 +72,6 @@ Highlights from Buildr 1.4.19 (2014-07-06)
 * Fixed:  Fix bug introduced in 1.4.18 version of custom_pom addon where
           poms are created for artifacts that have a classifier.
-Highlights from Buildr 1.4.18 (2014-06-24)
-* Fixed:  BUILDR-699 - Update the custom_pom addon to avoid failure when
-          used with zip packages.
-* Fixed:  BUILDR-694 - "buildr upload" fails: wrong number of arguments in
-          progress bar read() in Ruby 2.1.0. Submitted By Mark Reibert.
-* Change: Remove support for uploads to RubyForge.org with gem dependencies
-          as the site no longer exists.
-* Change: BUILDR-664 - Update Checkstyle addon so that extra_dependencies is
-          the project dependencies by default. Move the checkstyle dependencies
-          to the start of the classpath to avoid problems running checkstyle.
-          Submitted by Dieter Vrancken.
-* Added:  Extend Intellij IDEA support to allow creation of glassfish,
-          java and ruby scrip configurations.
-* Change: Include additional rules in default pmd rule set:
-* Change: Upgrade the version of PMD in use to 5.1.1 and add additional
-          default rule sets 'finalizers' and 'braces'.
-* Change: Supply a default xsl file for generating the jdepend report.
-* Fixed:  Fix the naming of css_lint addon file so it is made available
-          as an addon.
 This is a partial list -- see the "CHANGELOG":CHANGELOG for full details.
 h2(#notices).  Credits & Notices

data/lib/buildr/core/generate.rb CHANGED Viewed

@@ -135,7 +135,7 @@ EOF
             script += header.split("\n")
             script << "  # you may see hints about which jars are missing and should resolve them correctly"
             script << "  # dependencies  << 'junit should be commented out and replace by correct ARTIFACT definition. Eg"
-            script << "  # dependencies  << 'junit:junit:jar:3.8.2'"
+            script << "  # dependencies  << 'junit:junit:jar:4.11'"
             script << setLayout('src', 'bin') # default values for eclipse
             dot_projects = Dir.glob('**/.project', File::FNM_DOTMATCH).find_all { |dot_project| get_project_natures(dot_project) }
             dot_projects.sort.each { |dot_project| from_eclipse(File.dirname(dot_project), false) } if dot_projects

data/lib/buildr/ide/idea.rb CHANGED Viewed

@@ -414,6 +414,8 @@ module Buildr #:nodoc:
           ejb_roots.each do |path|
             d = "#{path}/WEB-INF/#{descriptor}"
             default_deployment_descriptors << d if File.exist?(d)
+            d = "#{path}/META-INF/#{descriptor}"
+            default_deployment_descriptors << d if File.exist?(d)
           end
         end
         deployment_descriptors = options[:deployment_descriptors] || default_deployment_descriptors

data/lib/buildr/java/compiler.rb CHANGED Viewed

@@ -64,6 +64,13 @@ module Buildr #:nodoc:
         end
       end
+      # Filter out source files that are known to not produce any corresponding .class output file. If we leave
+      # this type of file in the generated compile map the compiler will always be run due to missing output files.
+      def compile_map(sources, target)
+        map = super
+        map.reject! { |key,_| File.basename(key) == 'package-info.java' } || map
+      end
     private
       def javac_args #:nodoc:

data/lib/buildr/java/tests.rb CHANGED Viewed

@@ -96,15 +96,15 @@ module Buildr #:nodoc:
         Buildr.settings.build['jmock'] || VERSION
       end
-      def dependencies
+      def dependencies(versions = {:hamcrest => "1.1"})
         two_or_later = version[0,1].to_i >= 2
         group = two_or_later ? "org.jmock" : "jmock"
         @dependencies ||= ["#{group}:jmock:jar:#{version}"]
         if two_or_later
           @dependencies << "org.jmock:jmock-junit#{Buildr::JUnit.version.to_s[0,1]}:jar:#{version}"
-          @dependencies << "org.hamcrest:hamcrest-core:jar:1.1"
-          @dependencies << "org.hamcrest:hamcrest-library:jar:1.1"
+          @dependencies << "org.hamcrest:hamcrest-core:jar:#{versions[:hamcrest]}"
+          @dependencies << "org.hamcrest:hamcrest-library:jar:#{versions[:hamcrest]}"
         end
         @dependencies
       end
@@ -179,7 +179,7 @@ module Buildr #:nodoc:
     end
     # JUnit version number.
-    VERSION = '4.8.2'
+    VERSION = '4.11'
     class << self
       # :call-seq:
@@ -198,7 +198,8 @@ module Buildr #:nodoc:
       end
       def dependencies
-        @dependencies ||= ["junit:junit:jar:#{version}"]+ JMock.dependencies
+        four11_or_newer = version >= "4.11"
+        @dependencies ||= ["junit:junit:jar:#{version}"]+ (four11_or_newer ? JMock.dependencies({:hamcrest => '1.3'}) : JMock.dependencies)
       end
       def ant_taskdef #:nodoc:

data/lib/buildr/java/version_requirement.rb CHANGED Viewed

@@ -53,7 +53,8 @@ module Buildr #:nodoc:
           raise "Invalid requirement string: #{req}"
         end
         comparator, version = $1, $2
-        version = Gem::Version.new(0).tap { |v| v.version = version }
+        # dup required due to jruby 1.7.13 bug/feature that caches versions?
+        version = Gem::Version.new(0).dup.tap { |v| v.version = version }
         VersionRequirement.new(nil, [$1, version])
       end
@@ -122,7 +123,8 @@ module Buildr #:nodoc:
       return false unless version
       unless version.kind_of?(Gem::Version)
         raise "Invalid version: #{version.inspect}" unless self.class.version?(version)
-        version = Gem::Version.new(0).tap { |v| v.version = version.strip }
+        # dup required due to jruby 1.7.13 bug/feature that caches versions?
+        version = Gem::Version.new(0).dup.tap { |v| v.version = version.strip }
       end
       message = op == :| ? :any? : :all?
       result = requirements.send message do |req|

data/lib/buildr/packaging/version_requirement.rb CHANGED Viewed

@@ -17,11 +17,10 @@
 # Rubygems 1.3.6 removed the 'version' accessor so monkey-patch it back to
 # circumvent version validation.  This is needed because Gem::Version doesn't
 # accept version specs with dashes.
-unless Gem::Version.new(0).respond_to?(:version=)
+unless Gem::Version.new("0").respond_to?(:version=)
   class Gem::Version
     def version=(version)
-      @version = version.to_s
-      @version.strip!
+      @version = version.to_s.strip
       # re-prime @segments
       @segments = nil
@@ -73,7 +72,8 @@ module Buildr #:nodoc:
           raise "Invalid requirement string: #{req}"
         end
         comparator, version = $1, $2
-        version = Gem::Version.new(0).tap { |v| v.version = version }
+        # dup required due to jruby 1.7.13 bug/feature that caches versions?
+        version = Gem::Version.new(0).dup.tap { |v| v.version = version }
         VersionRequirement.new(nil, [$1, version])
       end
@@ -142,7 +142,8 @@ module Buildr #:nodoc:
       return false unless version
       unless version.kind_of?(Gem::Version)
         raise "Invalid version: #{version.inspect}" unless self.class.version?(version)
-        version = Gem::Version.new(0).tap { |v| v.version = version.strip }
+        # dup required due to jruby 1.7.13 bug/feature that caches versions?
+        version = Gem::Version.new(0).dup.tap { |v| v.version = version.strip }
       end
       message = op == :| ? :any? : :all?
       result = requirements.send message do |req|

data/lib/buildr/version.rb CHANGED Viewed

@@ -14,5 +14,5 @@
 # the License.
 module Buildr #:nodoc:
-  VERSION = '1.4.19'.freeze
+  VERSION = '1.4.20'.freeze
 end

data/spec/java/compiler_spec.rb CHANGED Viewed

@@ -106,6 +106,13 @@ describe 'javac compiler' do
     define('foo').compile.invoke
     file('target/classes/UseApt.class').should exist
   end
+  it 'should ignore package-info.java files in up-to-date check' do
+    write 'src/main/java/foo/Test.java', 'package foo; class Test { public void foo() {} }'
+    write 'src/main/java/foo/package-info.java', 'package foo;'
+    lambda{ define('foo').compile.invoke }.should run_task('foo:compile')
+    lambda{ define('bar').compile.invoke }.should_not run_task('bar:compile')
+  end
 end

data/spec/java/tests_spec.rb CHANGED Viewed

@@ -60,6 +60,24 @@ describe Buildr::JUnit do
     project('foo').test.dependencies.should include(artifact("#{group}:jmock:jar:#{JMock.version}"))
   end
+  it 'should not include Hamcrest dependencies for JUnit < 4.11' do
+    begin
+      Buildr.settings.build['junit'] = '4.10'
+      define('foo') { test.using :junit }
+      project('foo').test.compile.dependencies.should_not include(artifact("org.hamcrest:hamcrest-core:jar:1.3"))
+      project('foo').test.dependencies.should_not include(artifact("org.hamcrest:hamcrest-core:jar:1.3"))
+    ensure
+      Buildr.settings.build['junit'] = nil
+    end
+  end
+  it 'should include Hamcrest dependencies for JUnit >= 4.11' do
+    define('foo') { test.using :junit }
+    project('foo').test.compile.dependencies.should include(artifact("org.hamcrest:hamcrest-core:jar:1.3"))
+    project('foo').test.dependencies.should include(artifact("org.hamcrest:hamcrest-core:jar:1.3"))
+  end
   it 'should pick JUnit version from junit build settings' do
     Buildr::JUnit.instance_eval { @dependencies = nil } # JUnit caches JMock dependencies
     Buildr::JMock.instance_eval { @dependencies = nil }

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.19
+  version: 1.4.20
 platform: java
 authors:
 - Apache Buildr
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake