realityforge-buildr 1.5.15 → 1.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8fa34dd92a2579440a4004d0b4a90d43e0cba4302d19e2f7d983db46984123d
-  data.tar.gz: 1b3adb97db7e6bd180232bd89a97d177c3701423a37eee8711e1e14c6b87b00e
+  metadata.gz: 1932d8782ef4f08cac42f5941f4f98922ea4a5323ead460b1cfe429447a920b6
+  data.tar.gz: cfac26c31803f3579cef1876d48969c0c0166107636d107b851b34b2142d436b
 SHA512:
-  metadata.gz: 97881c109b09796e52353d719ba96ea0efc7277f5ce8f6f80c30e12109ebd202e6b97aae56f1833f3d09d12ec870cd906ac90183174d3b881b3903d5c638c385
-  data.tar.gz: 4ff07b06229fe1cbcdbf0e47028e8ac8758c408f0929a7a5397edf05d6653fb54866e433b5970f0acc14fe611b42ec0e100aa25aac0db639fe3d8975aa4ded88
+  metadata.gz: fc78f9279e57e8fbbad90e9bc7e0d60cc755f02d573a8a13f87986535549ece7c76597b6be505b54c6f8491ba6677dc267d949aebcf5304c1b5077a3de119404
+  data.tar.gz: 222f81cd3439630178a37adf725b1879946b3aa9eab171a1dce2dd996439aee8046992e9e95de2520bfb002aea535b70f9f8f3fb047044efcc0b9761ec9a60d8

data/addon/buildr/api_diff_tool.rb

@@ -0,0 +1,78 @@
+module Buildr
+  class ApiDiffTool
+    class << self
+      def generate_differences_report(artifact_coordinate, old_version, new_version, new_file, output_file, options = {})
+        revapi = Buildr.artifact('org.realityforge.revapi.diff:revapi-diff:jar:all:0.08')
+        revapi.invoke
+
+        old_artifact = Buildr.artifact("#{artifact_coordinate}:#{old_version}")
+        old_artifact.invoke
+
+        unless new_file
+          new_artifact = Buildr.artifact("#{artifact_coordinate}:#{new_version}")
+          new_artifact.invoke
+          new_file = new_artifact.to_s
+        end
+
+        FileUtils.mkdir_p File.dirname(output_file)
+
+        args = []
+        args << Java::Commands.path_to_bin('java')
+        args << '-jar'
+        args << revapi.to_s
+        args << '--old-api'
+        args << "#{artifact_coordinate}:#{old_version}::#{old_artifact.to_s}"
+        if options[:support_libs]
+          options[:support_libs].each do |lib|
+            args << '--old-api-support'
+            args << lib.to_s
+          end
+        end
+        args << '--new-api'
+        args << "#{artifact_coordinate}:#{new_version}::#{new_file}"
+        if options[:support_libs]
+          options[:support_libs].each do |lib|
+            args << '--new-api-support'
+            args << lib.to_s
+          end
+        end
+        args << '--output-file'
+        args << output_file.to_s
+
+        sh args.join(' ')
+        if File.exist?(output_file)
+          data = JSON.parse(IO.read(output_file, :encoding => 'UTF-8'))
+          FileUtils.rm_f output_file if data.empty?
+        end
+      end
+
+      def update_differences_report(artifact_coordinate, old_version, new_version, new_file, output_directory, options = {})
+        output_file = "#{output_directory}/#{old_version}-#{new_version}.json"
+        generate_differences_report(artifact_coordinate, old_version, new_version, new_file, output_file, options)
+        sh "git add #{output_file}" if File.exist?(output_file)
+      end
+
+      def test_differences_report(artifact_coordinate, old_version, new_version, new_file, output_directory, options = {})
+        report_file = "#{output_directory}/#{old_version}-#{new_version}.json"
+        tmp = nil
+        begin
+          tmp = Tempfile.open("#{old_version}-#{new_version}.json")
+          tmp.close
+          generate_differences_report(artifact_coordinate, old_version, new_version, new_file, tmp.path, options)
+
+          report_content = File.exist?(report_file) ? IO.read(report_file, :encoding => 'UTF-8') : ''
+          test_content = File.exist?(tmp.path) ? IO.read(tmp.path, :encoding => 'UTF-8') : ''
+          if report_content != test_content
+            if File.exist?(report_file)
+              raise "Differences report at #{report_file} does not record the correct set differences between #{old_version} and #{new_version} for #{artifact_coordinate}"
+            else
+              raise "No differences report at #{report_file} but differences exist between #{old_version} and #{new_version} for #{artifact_coordinate}"
+            end
+          end
+        ensure
+          tmp.close unless tmp.nil?
+        end
+      end
+    end
+  end
+end

data/addon/buildr/git_auto_version.rb

@@ -22,8 +22,7 @@ module Buildr
         unless project.version
           version_suffix = ENV['BUILD_NUMBER'] ? "-#{ENV['BUILD_NUMBER']}" : ''
           version_prefix = ENV['VERSION_PREFIX'] ? "#{ENV['VERSION_PREFIX']}-" : ''
-          git_version = `git describe --tags --always`.strip
-          git_version = git_version.gsub(/^v([0-9])/, '\1')
+          git_version = `git describe --always`.strip
           project.version = version_prefix + git_version + version_suffix
         end
       end

data/addon/buildr/gwt.rb

@@ -266,10 +266,6 @@ module Buildr
           args << '-XenableClosureCompiler'
         end
 
-        if options[:js_exports]
-          args << '-generateJsInteropExports'
-        end
-
         args += modules
 
         properties = options[:properties] ? options[:properties].dup : {}

data/addon/buildr/pmd.rb

@@ -126,7 +126,7 @@ module Buildr
 
       # An array of paths that should be excluded no matter how they are added to pmd
       def exclude_paths
-        @source_paths ||= []
+        @exclude_paths ||= []
       end
 
       # An array of additional projects to scan for main and test sources

data/addon/buildr/release_tool.rb

@@ -0,0 +1,289 @@
+#
+# Licensed 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
+  class ReleaseTool
+    class << self
+      def define_release_task(options = {})
+        task_name = options[:task_name] || 'perform_release'
+        description = options[:description] || 'Perform a release'
+        workspace_dir = options[:workspace_dir] || File.dirname(Buildr.application.buildfile.to_s)
+
+        ENV['PREVIOUS_PRODUCT_VERSION'] = nil if ENV['PREVIOUS_PRODUCT_VERSION'].to_s == ''
+        ENV['PRODUCT_VERSION'] = nil if ENV['PRODUCT_VERSION'].to_s == ''
+
+        desc description
+        task task_name do
+          in_dir(workspace_dir) do
+            yield ReleaseTool.new
+          end
+          if ENV['STAGE']
+            if ENV['LAST_STAGE'] == ENV['STAGE']
+              puts "LAST_STAGE specified '#{ENV['LAST_STAGE']}', later stages were skipped"
+            else
+              raise "Invalid STAGE specified '#{ENV['STAGE']}' that did not match any stage"
+            end
+          end
+        end
+      end
+
+      def derive_versions_from_changelog(options = {})
+        ENV['PREVIOUS_PRODUCT_VERSION'] ||= IO.read('CHANGELOG.md')[/^### \[v(\d+\.\d+(\.\d+)?)\]/, 1] || '0.00'
+        ENV['PRODUCT_VERSION'] ||= derive_next_version(ENV['PREVIOUS_PRODUCT_VERSION'], options)
+      end
+
+      def derive_next_version(current_version, options = {})
+        return options[:next_version_action].call(current_version) if options[:next_version_action]
+        version_parts = current_version.split('.')
+        "#{version_parts[0]}.#{sprintf('%02d', version_parts[1].to_i + 1)}#{version_parts.length > 2 ? ".#{version_parts[2]}" : ''}"
+      end
+
+      private
+
+      def in_dir(dir)
+        current = Dir.pwd
+        begin
+          Dir.chdir(dir)
+          yield
+        ensure
+          Dir.chdir(current)
+        end
+      end
+    end
+
+    def extract_version_from_changelog(options = {})
+      stage('ExtractVersion', 'Extract the last version from CHANGELOG.md and derive next version unless specified', :always_run => true) do
+        Buildr::ReleaseTool.derive_versions_from_changelog(options)
+        # Also initialize release date if required
+        ENV['RELEASE_DATE'] ||= Time.now.strftime('%Y-%m-%d')
+      end
+    end
+
+    def zapwhite
+      stage('ZapWhite', 'Ensure that zapwhite produces no changes') do
+        sh 'bundle exec zapwhite'
+      end
+    end
+
+    def ensure_git_clean
+      stage('GitClean', 'Ensure there is nothing to commit and the working tree is clean') do
+        status_output = `git status -s 2>&1`.strip
+        raise 'Uncommitted changes in git repository. Please commit them prior to release.' if 0 != status_output.size
+      end
+    end
+
+    def verify_no_todo
+      stage('TodoScan', 'Verify that there are no TODO notes in codebase') do
+        task('todos:scan').invoke
+      end
+    end
+
+    def cleanup_staging
+      stage('StagingCleanup', 'Remove artifacts from staging repository') do
+        task('staging:cleanup').invoke
+      end
+    end
+
+    def build(options = {})
+      additional_tasks = options[:additional_tasks] || ''
+      stage('Build', 'Build the project to ensure that the tests pass') do
+        sh "bundle exec buildr clean package #{additional_tasks} install PRODUCT_VERSION=#{ENV['PRODUCT_VERSION']}#{ENV['TEST'].nil? ? '' : " TEST=#{ENV['TEST']}"}#{Buildr.application.options.trace ? ' --trace' : ''}"
+      end
+    end
+
+    def patch_changelog(repository_name, options = {})
+      stage('PatchChangelog', 'Patch the changelog to update from previous release') do
+        changelog = IO.read('CHANGELOG.md')
+        from = '0.00' == ENV['PREVIOUS_PRODUCT_VERSION'] ? `git rev-list --max-parents=0 HEAD`.strip : "v#{ENV['PREVIOUS_PRODUCT_VERSION']}"
+
+        header = "### [v#{ENV['PRODUCT_VERSION']}](https://github.com/#{repository_name}/tree/v#{ENV['PRODUCT_VERSION']}) (#{ENV['RELEASE_DATE']}) · [Full Changelog](https://github.com/spritz/spritz/compare/#{from}...v#{ENV['PRODUCT_VERSION']})"
+
+        sub_header_text = ''
+
+        api_diff_directory = options[:api_diff_directory]
+        api_diff_filename = api_diff_directory ? "#{api_diff_directory}/#{ENV['PREVIOUS_PRODUCT_VERSION']}-#{ENV['PRODUCT_VERSION']}.json" : nil
+        if api_diff_filename && File.exist?(api_diff_filename)
+
+          api_diff_site = options[:api_diff_website]
+          if api_diff_site
+            header += " · [API Differences](#{api_diff_site}old=#{ENV['PREVIOUS_PRODUCT_VERSION']}&new=#{ENV['PRODUCT_VERSION']})"
+          end
+
+          changes = JSON.parse(IO.read(api_diff_filename))
+          non_breaking_changes = changes.select { |j| j['classification']['SOURCE'] == 'NON_BREAKING' }.size
+          potentially_breaking_changes = changes.select { |j| j['classification']['SOURCE'] == 'POTENTIALLY_BREAKING' }.size
+          breaking_changes = changes.select { |j| j['classification']['SOURCE'] == 'BREAKING' }.size
+          change_descriptions = []
+          change_descriptions << "#{non_breaking_changes} non breaking API change#{1 == non_breaking_changes ? '' : 's'}" unless 0 == non_breaking_changes
+          change_descriptions << "#{potentially_breaking_changes} potentially breaking API change#{1 == potentially_breaking_changes ? '' : 's'}" unless 0 == potentially_breaking_changes
+          change_descriptions << "#{breaking_changes} breaking API change#{1 == breaking_changes ? '' : 's'}" unless 0 == breaking_changes
+
+          if change_descriptions.size > 0
+            description = "The release includes "
+            if 1 == change_descriptions.size
+              description += "#{change_descriptions[0]}."
+            elsif 2 == change_descriptions.size
+              description += "#{change_descriptions[0]} and #{change_descriptions[1]}."
+            else
+              description += "#{change_descriptions[0]}, #{change_descriptions[1]} and #{change_descriptions[2]}."
+            end
+
+            sub_header_text = description
+          end
+        end
+
+        header_suffix = options[:header_suffix]
+        header += header_suffix if header_suffix
+        header += "\n\n#{sub_header_text}" unless sub_header_text.empty?
+        header += "\n"
+
+        release_notes_file = options[:release_notes_summary_file]
+        if release_notes_file && File.exist?(release_notes_file)
+          summary_content = IO.read(release_notes_file).strip
+          unless summary_content.empty?
+            header += summary_content + "\n"
+            IO.write(release_notes_file, "\n")
+          end
+        end
+
+        header += <<CONTENT
+
+Changes in this release:
+CONTENT
+
+        IO.write('CHANGELOG.md', changelog.gsub("### Unreleased\n", header))
+
+        sh 'git reset 2>&1 1> /dev/null'
+        sh "git add #{release_notes_file}" if File.exist?(release_notes_file)
+        sh 'git add CHANGELOG.md'
+        sh 'git commit -m "Update CHANGELOG.md in preparation for release"'
+      end
+    end
+
+    def patch_maven_version_in_readme
+      stage('PatchReadme', 'Patch the README to update from previous release') do
+        contents = IO.read('README.md')
+        contents = contents.
+          gsub("<version>#{ENV['PREVIOUS_PRODUCT_VERSION']}</version>", "<version>#{ENV['PRODUCT_VERSION']}</version>").
+          gsub("/#{ENV['PREVIOUS_PRODUCT_VERSION']}/", "/#{ENV['PRODUCT_VERSION']}/").
+          gsub("-#{ENV['PREVIOUS_PRODUCT_VERSION']}-", "-#{ENV['PRODUCT_VERSION']}-")
+        IO.write('README.md', contents)
+
+        sh 'git reset 2>&1 1> /dev/null'
+        sh 'git add README.md'
+        sh 'git commit -m "Update README.md in preparation for release"'
+      end
+    end
+
+    def tag_project
+      stage('TagProject', 'Tag the project') do
+        sh "git tag v#{ENV['PRODUCT_VERSION']}"
+      end
+    end
+
+    def stage_release(options = {})
+      release_to = options[:release_to] || (raise "StageRelease stage must specify :release_to configuration")
+      stage('StageRelease', 'Stage the release') do
+        IO.write('_buildr.rb', "repositories.release_to = #{release_to.inspect}")
+        sh 'bundle exec buildr clean upload TEST=no GWT=no'
+        sh 'rm -f _buildr.rb'
+      end
+    end
+
+    def maven_central_publish(options = {})
+      additional_tasks = options[:additional_tasks] || ''
+      stage('MavenCentralPublish', 'Publish artifacts to Maven Central') do
+        sh "bundle exec buildr clean mcrt:publish_if_tagged #{additional_tasks} TEST=no GWT=no"
+      end
+    end
+
+    def patch_changelog_post_release
+      stage('PatchChangelogPostRelease', 'Patch the changelog post release to prepare for next development iteration') do
+        changelog = IO.read('CHANGELOG.md')
+        changelog = changelog.gsub("# Change Log\n", <<HEADER)
+# Change Log
+
+### Unreleased
+HEADER
+        IO.write('CHANGELOG.md', changelog)
+
+        `bundle exec zapwhite`
+        sh 'git add CHANGELOG.md'
+        sh 'git commit -m "Update CHANGELOG.md in preparation for next development iteration"'
+      end
+    end
+
+    def push_changes
+      stage('PushChanges', 'Push changes to git repository') do
+        sh 'git push'
+        sh 'git push --tags'
+      end
+    end
+
+    def github_release(repository_name)
+      stage('GithubRelease', 'Create a Release on GitHub') do
+        changelog = IO.read('CHANGELOG.md')
+        start = changelog.index("### [v#{ENV['PRODUCT_VERSION']}]")
+        raise "Unable to locate version #{ENV['PRODUCT_VERSION']} in change log" if -1 == start
+        start = changelog.index("\n", start)
+        start = changelog.index("\n", start + 1)
+
+        end_index = changelog.index('### [v', start)
+        end_index = changelog.length if end_index.nil?
+
+        changes = changelog[start, end_index - start]
+
+        changes = changes.strip
+
+        tag = "v#{ENV['PRODUCT_VERSION']}"
+
+        version_parts = ENV['PRODUCT_VERSION'].split('.')
+        prerelease = '0' == version_parts[0]
+
+        require 'octokit'
+
+        client = Octokit::Client.new(:netrc => true, :auto_paginate => true)
+        client.login
+        client.create_release(repository_name, tag, :name => tag, :body => changes, :draft => false, :prerelease => prerelease)
+
+        candidates = client.list_milestones(repository_name).select { |m| m[:title].to_s == tag }
+        unless candidates.empty?
+          milestone = candidates[0]
+          unless milestone[:state] == 'closed'
+            client.update_milestone(repository_name, milestone[:number], :state => 'closed')
+          end
+        end
+      end
+    end
+
+    def stage(stage_name, description, options = {})
+      if ENV['STAGE'].nil? || ENV['STAGE'] == stage_name || options[:always_run]
+        puts "🚀 Release Stage: #{stage_name} - #{description}"
+        begin
+          yield
+        rescue Exception => e
+          puts '💣 Error completing stage.'
+          puts "Fix the error and re-run release process passing: STAGE=#{stage_name}#{ ENV['PREVIOUS_PRODUCT_VERSION'] ? " PREVIOUS_PRODUCT_VERSION=#{ENV['PREVIOUS_PRODUCT_VERSION']}" : ''}#{ ENV['PREVIOUS_PRODUCT_VERSION'] ? " PRODUCT_VERSION=#{ENV['PRODUCT_VERSION']}" : ''}"
+          raise e
+        end
+        ENV['STAGE'] = nil unless options[:always_run]
+      elsif !ENV['STAGE'].nil?
+        puts "Skipping Stage: #{stage_name} - #{description}"
+      end
+      if ENV['LAST_STAGE'] == stage_name
+        ENV['STAGE'] = ENV['LAST_STAGE']
+      end
+    end
+  end
+end

data/lib/buildr/ide/idea.rb

@@ -431,40 +431,6 @@ module Buildr #:nodoc:
         end
       end
 
-      def add_ejb_facet(options = {})
-        name = options[:name] || 'EJB'
-
-        default_ejb_roots = [buildr_project.iml.main_source_directories, buildr_project.compile.sources, buildr_project.resources.sources].flatten.compact
-        ejb_roots = options[:ejb_roots] || default_ejb_roots
-
-        default_deployment_descriptors = []
-        %w(ejb-jar.xml glassfish-ejb-jar.xml ibm-ejb-jar-bnd.xml ibm-ejb-jar-ext-pme.xml ibm-ejb-jar-ext.xml jboss.xml jbosscmp-jdbc.xml openejb-jar.xml sun-cmp-mapping.xml sun-ejb-jar.xml weblogic-cmp-rdbms-jar.xml weblogic-ejb-jar.xml).
-          each do |descriptor|
-          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
-
-        add_facet(name, 'ejb') do |facet|
-          facet.configuration do |c|
-            c.descriptors do |d|
-              deployment_descriptors.each do |deployment_descriptor|
-                d.deploymentDescriptor :name => File.basename(deployment_descriptor), :url => file_path(deployment_descriptor)
-              end
-            end
-            c.ejbRoots do |e|
-              ejb_roots.each do |ejb_root|
-                e.root :url => file_path(ejb_root)
-              end
-            end
-          end
-        end
-      end
-
       protected
 
       def main_dependency_details
@@ -850,14 +816,16 @@ module Buildr #:nodoc:
               value.list :size => '2' do |list|
                 list.item :index => '0', :class => 'java.lang.String', :itemvalue => 'org.jetbrains.annotations.Nullable'
                 list.item :index => '1', :class => 'java.lang.String', :itemvalue => 'javax.annotation.Nullable'
+                list.item :index => '2', :class => 'java.lang.String', :itemvalue => 'jsinterop.annotations.JsNullable'
               end
             end
           end
           component.option :name => 'myNotNulls' do |option|
             option.value do |value|
-              value.list :size => '2' do |list|
+              value.list :size => '3' do |list|
                 list.item :index => '0', :class => 'java.lang.String', :itemvalue => 'org.jetbrains.annotations.NotNull'
                 list.item :index => '1', :class => 'java.lang.String', :itemvalue => 'javax.annotation.Nonnull'
+                list.item :index => '2', :class => 'java.lang.String', :itemvalue => 'jsinterop.annotations.JsNonNull'
               end
             end
           end
@@ -1419,7 +1387,6 @@ module Buildr #:nodoc:
       def artifact_content(xml, project, projects, options)
         emit_module_output(xml, projects)
         emit_jpa_descriptors(xml, project, options)
-        emit_ejb_descriptors(xml, project, options)
       end
 
       def extension
@@ -1563,12 +1530,17 @@ module Buildr #:nodoc:
                 next unless prj.iml?
                 main_processor = !!prj.compile.options[:processor] || (prj.compile.options[:processor].nil? && !(prj.compile.options[:processor_path] || []).empty?)
                 test_processor = !!prj.test.compile.options[:processor] || (prj.test.compile.options[:processor].nil? && !(prj.test.compile.options[:processor_path] || []).empty?)
+                processor_options = (prj.compile.options[:processor_options] || {}).merge(prj.test.compile.options[:processor_options] || {})
                 if main_processor || test_processor
                   xml.profile(:name => "#{prj.name}", :enabled => true) do
                     xml.sourceOutputDir :name => 'generated/processors/main/java' if main_processor
                     xml.sourceTestOutputDir :name => 'generated/processors/test/java' if test_processor
                     xml.outputRelativeToContentRoot :value => true
                     xml.module :name => prj.iml.name
+                    processor_options.each do |k, v|
+                      xml.option :name => k, :value => v
+                    end
+
                     processor_path = (prj.compile.options[:processor_path] || []) + (prj.test.compile.options[:processor_path] || [])
                     if processor_path.empty?
                       xml.processorPath :useClasspath => true
@@ -1653,16 +1625,6 @@ module Buildr #:nodoc:
         xml.tag!('output-path', resolve_path(output_dir))
       end
 
-      def emit_ejb_descriptors(xml, project, options)
-        if options[:enable_ejb] || (options[:ejb_module_names] && options[:ejb_module_names].size > 0)
-          module_names = options[:ejb_module_names] || [project.iml.name]
-          module_names.each do |module_name|
-            facet_name = options[:ejb_facet_name] || 'EJB'
-            xml.element :id => 'javaee-facet-resources', :facet => "#{module_name}/ejb/#{facet_name}"
-          end
-        end
-      end
-
       def emit_jpa_descriptors(xml, project, options)
         if options[:enable_jpa] || (options[:jpa_module_names] && options[:jpa_module_names].size > 0)
           module_names = options[:jpa_module_names] || [project.iml.name]

data/lib/buildr/java/annotation_processor.rb

@@ -23,6 +23,9 @@ module Buildr
       end
 
       after_define do |project|
+        Buildr.artifacts((project.compile.options[:processor_path] || []) + (project.test.compile.options[:processor_path] || [])).flatten.map(&:to_s).map do |t|
+          Rake::Task['rake:artifacts'].enhance([task(t)])
+        end
         if !!project.compile.options[:processor] || (project.compile.options[:processor].nil? && !(project.compile.options[:processor_path] || []).empty?)
           path = project._(:target, :generated, 'processors/main/java')
           f = project.file(path) do |t|

data/lib/buildr/java/commands.rb

@@ -115,13 +115,15 @@ module Java
       # * :classpath -- One or more file names, tasks or artifact specifications. These are all expanded into artifacts, and all tasks are invoked.
       # * :sourcepath -- Additional source paths to use.
       # * :processor_path -- Annotation processor path. These are all expanded into artifacts, and all tasks are invoked.
+      # * :processor_options -- Annotation processor options.
       # * :javac_args -- Any additional arguments to pass (e.g. -extdirs, -encoding)
       # * :name -- Shows this name, otherwise shows the working directory.
       def javac(*args, &block)
         options = Hash === args.last ? args.pop : {}
-        rake_check_options options, :classpath, :sourcepath, :output, :javac_args, :name, :processor, :processor_path
+        rake_check_options options, :classpath, :sourcepath, :output, :javac_args, :name, :processor, :processor_path, :processor_options
 
         processor = !!options[:processor]
+        processor_options = options[:processor_options] || {}
 
         files = args.flatten.each { |f| f.invoke if f.respond_to?(:invoke) }.map(&:to_s).
           collect { |arg| File.directory?(arg) ? FileList["#{File.expand_path(arg)}/**/*.java"] : File.expand_path(arg) }.flatten
@@ -135,6 +137,9 @@ module Java
         if processor
           processor_path = classpath_from(options[:processor_path])
           cmd_args << '-processorpath' << processor_path.join(File::PATH_SEPARATOR) unless processor_path.empty?
+          processor_options.each do |k, v|
+            cmd_args << "-A#{k}=#{v}"
+          end
         else
           cmd_args << '-proc:none'
         end

data/lib/buildr/java/compiler.rb

@@ -33,7 +33,7 @@ module Buildr #:nodoc:
     # (e.g. ['-implicit:none', '-encoding', 'iso-8859-1'])
     class Javac < Base
 
-      OPTIONS = [:warnings, :debug, :deprecation, :source, :target, :lint, :other, :processor_path, :processor]
+      OPTIONS = [:warnings, :debug, :deprecation, :source, :target, :lint, :other, :processor_path, :processor_options, :processor]
 
       specify :language => :java, :target => 'classes', :target_ext => 'class', :packaging => :jar
 
@@ -45,6 +45,7 @@ module Buildr #:nodoc:
         options[:lint] ||= false
         options[:processor] ||= nil
         options[:processor_path] ||= []
+        options[:processor_options] ||= {}
       end
 
       def compile(sources, target, dependencies) #:nodoc:
@@ -76,6 +77,9 @@ module Buildr #:nodoc:
         args << '-deprecation' if options[:deprecation]
         args << '-source' << options[:source].to_s if options[:source]
         args << '-target' << options[:target].to_s if options[:target]
+        options[:processor_options].each do |k, v|
+          args << "-A#{k}=#{v}"
+        end
         case options[:lint]
           when Array  then args << "-Xlint:#{options[:lint].join(',')}"
           when String then args << "-Xlint:#{options[:lint]}"

data/lib/buildr/java/packaging.rb

@@ -274,7 +274,7 @@ module Buildr #:nodoc:
       include Extension
 
       before_define(:package => :build) do |project|
-        if project.parent && project.parent.manifest
+        if project.parent&.manifest
           project.manifest = project.parent.manifest.dup
         else
           project.manifest = {
@@ -282,7 +282,7 @@ module Buildr #:nodoc:
             'Implementation-Title'=>project.comment || project.name,
             'Implementation-Version'=>project.version }
         end
-        if project.parent && project.parent.meta_inf
+        if project.parent&.meta_inf
           project.meta_inf = project.parent.meta_inf.dup
         else
           project.meta_inf = [project.file('LICENSE')].select { |file| File.exist?(file.to_s) }

data/lib/buildr/java/tests.rb

@@ -95,10 +95,10 @@ module Buildr #:nodoc:
         tmp.close unless tmp.nil?
       end
       # testng-failed.xml contains the list of failed tests *only*
-      failed_tests = File.join(task.report_to.to_s, 'testng-failed.xml')
+      failed_tests = File.join(task.report_to.to_s, task.project.id.to_s, 'Command line test.xml')
       if File.exist?(failed_tests)
         report = File.read(failed_tests)
-        failed = report.scan(/<class name="(.*?)">/im).flatten
+        failed = report.scan(/<testcase [^>]+ classname="([^"]+)">/im).flatten
         # return the list of passed tests
         tests - failed
       else

data/lib/buildr/version.rb

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

data/rakelib/release.rake

@@ -1,5 +1,3 @@
-WORKSPACE_DIR = File.expand_path(File.dirname(__FILE__) + '/..')
-
 ENV['PREVIOUS_PRODUCT_VERSION'] = nil if ENV['PREVIOUS_PRODUCT_VERSION'].to_s == ''
 ENV['PRODUCT_VERSION'] = nil if ENV['PRODUCT_VERSION'].to_s == ''
 
@@ -32,7 +30,8 @@ end
 desc 'Perform a release'
 task 'perform_release' do
 
-  in_dir(WORKSPACE_DIR) do
+  base_directory = File.dirname(Buildr.application.buildfile.to_s)
+  in_dir(base_directory) do
     stage('ExtractVersion', 'Extract the version from the version constant', :always_run => true) do
       ENV['PRODUCT_VERSION'] ||= IO.read('lib/buildr/version.rb')[/VERSION = '(\d+\.\d+\.\d+)(\.dev)?'\.freeze/, 1]
       raise "Unable to extract version from lib/buildr/version.rb" unless ENV['PRODUCT_VERSION']

data/spec/ide/idea_spec.rb

@@ -625,74 +625,6 @@ describe Buildr::IntellijIdea do
       end
     end
 
-    describe "using add_ejb_facet" do
-      before do
-        write "src/main/java/com/bin/foo.java"
-        write "src/main/resources/WEB-INF/ejb-jar.xml"
-
-        @foo = define "foo" do
-          iml.add_ejb_facet
-        end
-        invoke_generate_task
-      end
-
-      it "generates an ejb facet with appropriate deployment descriptors" do
-        doc = xml_document(@foo._("foo.iml"))
-        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
-        deployment_descriptor_xpath = "#{ejb_facet_xpath}/configuration/descriptors/deploymentDescriptor"
-        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='ejb-jar.xml',  url='file://$MODULE_DIR$/src/main/resources/WEB-INF/ejb-jar.xml']")
-      end
-
-      it "generates an ejb facet with derived ejbRoots" do
-        doc = xml_document(@foo._("foo.iml"))
-        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
-        doc.should have_xpath("#{ejb_facet_xpath}/configuration/ejbRoots/root[@url='file://$MODULE_DIR$/src/main/java']")
-        doc.should have_xpath("#{ejb_facet_xpath}/configuration/ejbRoots/root[@url='file://$MODULE_DIR$/src/main/resources']")
-      end
-    end
-
-    describe "using add_ejb_facet specifying parameters" do
-      before do
-        @foo = define "foo" do
-          iml.add_ejb_facet(:ejb_roots => %w[generated/main/java generated/main/resources],
-          :deployment_descriptors => ["generated/main/resources/WEB-INF/ejb-jar.xml"])
-        end
-        invoke_generate_task
-      end
-
-      it "generates an ejb facet with appropriate deployment descriptors" do
-        doc = xml_document(@foo._("foo.iml"))
-        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
-        deployment_descriptor_xpath = "#{ejb_facet_xpath}/configuration/descriptors/deploymentDescriptor"
-        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='ejb-jar.xml',  url='file://$MODULE_DIR$/generated/main/resources/WEB-INF/ejb-jar.xml']")
-      end
-
-      it "generates an ejb facet with derived ejbRoots" do
-        doc = xml_document(@foo._("foo.iml"))
-        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
-        doc.should have_xpath("#{ejb_facet_xpath}/configuration/ejbRoots/root[@url='file://$MODULE_DIR$/generated/main/java']")
-        doc.should have_xpath("#{ejb_facet_xpath}/configuration/ejbRoots/root[@url='file://$MODULE_DIR$/generated/main/resources']")
-      end
-    end
-
-    describe "using add_ejb_facet derived from main_source_directories" do
-      before do
-        write "src/main/resources2/WEB-INF/ejb-jar.xml"
-        @foo = define "foo" do
-          iml.main_source_directories << "src/main/resources2"
-          iml.add_ejb_facet
-        end
-        invoke_generate_task
-      end
-
-      it "generates an ejb facet with appropriate deployment descriptors" do
-        doc = xml_document(@foo._("foo.iml"))
-        ejb_facet_xpath = ensure_facet_xpath(doc, 'ejb', 'EJB')
-        deployment_descriptor_xpath = "#{ejb_facet_xpath}/configuration/descriptors/deploymentDescriptor"
-        doc.should have_xpath("#{deployment_descriptor_xpath}[@name='ejb-jar.xml',  url='file://$MODULE_DIR$/src/main/resources2/WEB-INF/ejb-jar.xml']")
-      end
-    end
-
     describe "with add_data_source" do
       before do
         artifact("org.postgresql:postgresql:jar:9.not-a-version") { |task| write task.name }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.15
+  version: 1.5.18
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -182,6 +182,7 @@ files:
 - NOTICE
 - README.md
 - Rakefile
+- addon/buildr/api_diff_tool.rb
 - addon/buildr/checkstyle-report.xsl
 - addon/buildr/checkstyle.rb
 - addon/buildr/git_auto_version.rb
@@ -189,6 +190,7 @@ files:
 - addon/buildr/gwt.rb
 - addon/buildr/jacoco.rb
 - addon/buildr/pmd.rb
+- addon/buildr/release_tool.rb
 - addon/buildr/shade.rb
 - addon/buildr/single_intermediate_layout.rb
 - addon/buildr/spotbugs.rb