realityforge-buildr 1.5.12 → 1.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3774de57cc666c2148d221a1511f0a6ffa4ebbe1567443e121bc900e5e8ee4fb
-  data.tar.gz: 5d691cfc07a1ceafb83b750158314a51cbb1a810e9566434c1f9a85037f36296
+  metadata.gz: 65fb6b6cc188f8b1e7b200f0ad1b56b838d89347c58d9f413d01e233fe96f920
+  data.tar.gz: f19e4cd3a75ced32f067d865cd4bb3c96553416f869e0dc9ebacf2012cb26f5a
 SHA512:
-  metadata.gz: fb053f6f9851fad7ffe939ad731da43883effac9be2ab8a53da8803e28c0946f104b4cf8d67dca17aef58f04c6da5465f4422927e0198fe5e88f92b9fcfbc6cf
-  data.tar.gz: 9031da8968321ec54d7acc645cb9f42693b255e9ffe143e07dfdc925e34e1c057e505178e7881316c89df9c718f9253fed85800cfd992a135c4e4bc634d79221
+  metadata.gz: ee6bc9306443afd70e60d15cf49646a95c866c18672c064e5613a989277b38ceca892c562135d180920a48fc5cf1486d20ec51436dcef6d64aeef80d6ba4db0c
+  data.tar.gz: 5adee0791894e792b062d7488eb0f044b54d380969c5899651691f988af22c09a188ecbfc4d2e719c2f848ce1785531d448ee3c1d2afe620344854d3682f44c6

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/checkstyle.rb

@@ -220,7 +220,7 @@ module Buildr
           project.task('checkstyle:xml') do
             puts 'Checkstyle: Analyzing source code...'
             mkdir_p File.dirname(project.checkstyle.xml_output_file)
-            source_paths = project.checkstyle.complete_source_paths.select{|p| !p.start_with?(project._(:generated).to_s)}
+            source_paths = project.checkstyle.complete_source_paths.select{|p| !p.start_with?(project._(:target, :generated).to_s)}
             source_paths = source_paths.collect{|p|::Buildr::Util.relative_path(File.expand_path(p.to_s), project.base_dir)}
             Buildr::Checkstyle.checkstyle(project.checkstyle.configuration_file,
                                           project.checkstyle.format,

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,279 @@
+#
+# 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"
+
+        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 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/addon/buildr/shade.rb

@@ -15,27 +15,7 @@
 module Buildr
   # Provides the shade method.
   module Shade
-
     class << self
-
-      # The specs for requirements
-      def dependencies
-        %w(
-          net.sourceforge.pmd:pmd-core:jar:6.11.0
-          net.sourceforge.pmd:pmd-java:jar:6.11.0
-          net.sourceforge.pmd:pmd-java8:jar:6.11.0
-          jaxen:jaxen:jar:1.1.6
-          commons-io:commons-io:jar:2.6
-          com.beust:jcommander:jar:1.72
-          org.ow2.asm:asm:jar:7.1
-          com.google.code.gson:gson:jar:2.8.5
-          net.java.dev.javacc:javacc:jar:5.0
-          net.sourceforge.saxon:saxon:jar:9.1.0.8
-          org.apache.commons:commons-lang3:jar:3.8.1
-          org.antlr:antlr4-runtime:jar:4.7
-        )
-      end
-
       def shade(input_jar, output_jar, relocations = {})
 
         shaded_jar = (input_jar.to_s + '-shaded')
@@ -51,7 +31,7 @@ module Buildr
         args << '--output'
         args << shaded_jar.to_s
         relocations.each_pair do |k, v|
-          args << "-r#{k}#{v}"
+          args << "-r#{k}=#{v}"
         end
 
         sh args.join(' ')

data/lib/buildr/ide/idea.rb

@@ -117,7 +117,7 @@ module Buildr #:nodoc:
 
       def create_component(name, attrs = {})
         target = StringIO.new
-        Builder::XmlMarkup.new(:target => target, :indent => 2).component({:name => name}.merge(attrs)) do |xml|
+        Builder::XmlMarkup.new(:target => target, :indent => 2).component({ :name => name }.merge(attrs)) do |xml|
           yield xml if block_given?
         end
         Buildr::IntellijIdea.new_document(target.string).root
@@ -219,7 +219,7 @@ module Buildr #:nodoc:
       end
 
       def annotation_paths
-        @annotation_paths ||= [buildr_project._(:source, :main, :annotations)].select {|p| File.exist?(p)}
+        @annotation_paths ||= [buildr_project._(:source, :main, :annotations)].select { |p| File.exist?(p) }
       end
 
       def main_source_directories
@@ -349,7 +349,7 @@ module Buildr #:nodoc:
         name = options[:name] || 'Web'
         default_webroots = {}
         default_webroots[buildr_project._(:source, :main, :webapp)] = '/' if File.exist?(buildr_project._(:source, :main, :webapp))
-        buildr_project.assets.paths.each {|p| default_webroots[p] = '/' }
+        buildr_project.assets.paths.each { |p| default_webroots[p] = '/' }
         webroots = options[:webroots] || default_webroots
         default_deployment_descriptors = []
         %w(web.xml sun-web.xml glassfish-web.xml jetty-web.xml geronimo-web.xml context.xml weblogic.xml jboss-deployment-structure.xml jboss-web.xml ibm-web-bnd.xml ibm-web-ext.xml ibm-web-ext-pme.xml).
@@ -375,7 +375,7 @@ module Buildr #:nodoc:
               end
             end
           end
-          default_enable_jsf = webroots.keys.any?{|webroot| File.exist?("#{webroot}/WEB-INF/faces-config.xml")}
+          default_enable_jsf = webroots.keys.any? { |webroot| File.exist?("#{webroot}/WEB-INF/faces-config.xml") }
           enable_jsf = options[:enable_jsf].nil? ? default_enable_jsf : options[:enable_jsf]
           enable_jsf = false if buildr_project.root_project.ipr? && buildr_project.root_project.ipr.version >= '13'
           f.facet(:type => 'jsf', :name => 'JSF') do |jsf|
@@ -404,8 +404,8 @@ module Buildr #:nodoc:
           provider = options[:provider_enabled]
         else
           provider = nil
-          {'org.hibernate.ejb.HibernatePersistence' => 'Hibernate',
-           'org.eclipse.persistence.jpa.PersistenceProvider' => 'EclipseLink'}.
+          { 'org.hibernate.ejb.HibernatePersistence' => 'Hibernate',
+            'org.eclipse.persistence.jpa.PersistenceProvider' => 'EclipseLink' }.
             each_pair do |match, candidate_provider|
             deployment_descriptors.each do |descriptor|
               if File.exist?(descriptor) && /#{Regexp.escape(match)}/ =~ IO.read(descriptor)
@@ -608,7 +608,7 @@ module Buildr #:nodoc:
         unless paths.empty?
           xml.tag!('annotation-paths') do |xml|
             paths.each do |path|
-              xml.root(:url=> file_path(path))
+              xml.root(:url => file_path(path))
             end
           end
         end
@@ -618,14 +618,14 @@ module Buildr #:nodoc:
         xml.content(:url => 'file://$MODULE_DIR$') do
           # Source folders
           [
-            {:dirs => (self.main_source_directories.dup - self.main_generated_source_directories)},
-            {:dirs => self.main_generated_source_directories, :generated => true},
-            {:type => 'resource', :dirs => (self.main_resource_directories.dup - self.main_generated_resource_directories)},
-            {:type => 'resource', :dirs => self.main_generated_resource_directories, :generated => true},
-            {:test => true, :dirs => (self.test_source_directories - self.test_generated_source_directories)},
-            {:test => true, :dirs => self.test_generated_source_directories, :generated => true},
-            {:test => true, :type => 'resource', :dirs => (self.test_resource_directories - self.test_generated_resource_directories)},
-            {:test => true, :type => 'resource', :dirs => self.test_generated_resource_directories, :generated => true},
+            { :dirs => (self.main_source_directories.dup - self.main_generated_source_directories) },
+            { :dirs => self.main_generated_source_directories, :generated => true },
+            { :type => 'resource', :dirs => (self.main_resource_directories.dup - self.main_generated_resource_directories) },
+            { :type => 'resource', :dirs => self.main_generated_resource_directories, :generated => true },
+            { :test => true, :dirs => (self.test_source_directories - self.test_generated_source_directories) },
+            { :test => true, :dirs => self.test_generated_source_directories, :generated => true },
+            { :test => true, :type => 'resource', :dirs => (self.test_resource_directories - self.test_generated_resource_directories) },
+            { :test => true, :type => 'resource', :dirs => self.test_generated_resource_directories, :generated => true },
           ].each do |content|
             content[:dirs].map { |dir| dir.to_s }.compact.sort.uniq.each do |dir|
               options = {}
@@ -658,14 +658,14 @@ module Buildr #:nodoc:
       end
 
       def generate_project_dependency(xml, other_project, export, test = false)
-        attribs = {:type => 'module', 'module-name' => other_project}
+        attribs = { :type => 'module', 'module-name' => other_project }
         attribs[:exported] = '' if export
         attribs[:scope] = 'TEST' if test
         xml.orderEntry attribs
       end
 
       def generate_module_lib(xml, path, export, source_path, annotations_path, test = false)
-        attribs = {:type => 'module-library'}
+        attribs = { :type => 'module-library' }
         attribs[:exported] = '' if export
         attribs[:scope] = 'TEST' if test
         xml.orderEntry attribs do
@@ -691,7 +691,7 @@ module Buildr #:nodoc:
         net = []
         all = self.excluded_directories.map { |dir| buildr_project._(dir.to_s) }.sort_by { |d| d.size }
         all.each_with_index do |dir, i|
-          unless all[0 ... i].find { |other| dir =~ /^#{other}/ }
+          unless all[0...i].find { |other| dir =~ /^#{other}/ }
             net << dir
           end
         end
@@ -725,6 +725,10 @@ module Buildr #:nodoc:
         @jdk_version ||= buildr_project.compile.options.source || '1.7'
       end
 
+      def compiler_configuration_options
+        @compiler_configuration_options ||= {}
+      end
+
       def nonnull_assertions?
         @nonnull_assertions.nil? ? true : !!@nonnull_assertions
       end
@@ -781,7 +785,7 @@ module Buildr #:nodoc:
 
       def add_postgres_data_source(name, options = {})
         if options[:url].nil? && options[:database]
-         default_url = "jdbc:postgresql://#{(options[:host] || '127.0.0.1')}:#{(options[:port] || '5432')}/#{options[:database]}"
+          default_url = "jdbc:postgresql://#{(options[:host] || '127.0.0.1')}:#{(options[:port] || '5432')}/#{options[:database]}"
         end
 
         params = {
@@ -901,7 +905,7 @@ module Buildr #:nodoc:
           }
           classpath = options[:classpath] || []
           xml.tag!('data-source', data_source_options) do |xml|
-            xml.tag!('synchronize', (options[:synchronize]||'true'))
+            xml.tag!('synchronize', (options[:synchronize] || 'true'))
             xml.tag!('jdbc-driver', options[:driver]) if options[:driver]
             xml.tag!('jdbc-url', options[:url]) if options[:url]
             xml.tag!('user-name', options[:username]) if options[:username]
@@ -1002,7 +1006,7 @@ module Buildr #:nodoc:
         end
       end
 
-      def add_exploded_ear_artifact(project, options ={})
+      def add_exploded_ear_artifact(project, options = {})
         artifact_name = to_artifact_name(project, options)
 
         add_artifact(artifact_name, 'exploded-ear', build_on_make(options)) do |xml|
@@ -1478,7 +1482,7 @@ module Buildr #:nodoc:
             buildr_project.projects.select { |subp| subp.iml? }.each do |subproject|
               module_path = subproject.base_dir.gsub(/^#{buildr_project.base_dir}\//, '')
               path = "#{module_path}/#{subproject.iml.name}.iml"
-              attribs = {:fileurl => "file://$PROJECT_DIR$/#{path}", :filepath => "$PROJECT_DIR$/#{path}"}
+              attribs = { :fileurl => "file://$PROJECT_DIR$/#{path}", :filepath => "$PROJECT_DIR$/#{path}" }
               if subproject.iml.group == true
                 attribs[:group] = subproject.parent.name.gsub(':', '/')
               elsif !subproject.iml.group.nil?
@@ -1528,7 +1532,7 @@ module Buildr #:nodoc:
       end
 
       def data_sources_component
-        create_composite_component('DataSourceManagerImpl', {:format => 'xml', :hash => '3208837817'}, self.data_sources)
+        create_composite_component('DataSourceManagerImpl', { :format => 'xml', :hash => '3208837817' }, self.data_sources)
       end
 
       def artifacts_component
@@ -1538,6 +1542,9 @@ module Buildr #:nodoc:
       def compiler_configuration_component
         lambda do
           create_component('CompilerConfiguration') do |component|
+            compiler_configuration_options.each_pair do |k, v|
+              component.option :name => k, :value => v
+            end
             component.addNotNullAssertions :enabled => 'false' unless nonnull_assertions?
             component.wildcardResourcePatterns do |xml|
               wildcard_resource_patterns.each do |pattern|
@@ -1554,8 +1561,8 @@ module Buildr #:nodoc:
               disabled = []
               Buildr.projects.each do |prj|
                 next unless prj.iml?
-                main_processor = !!prj.compile.options[:processor] || prj.compile.options[:processor].nil?
-                test_processor = !!prj.test.compile.options[:processor] || prj.test.compile.options[:processor].nil?
+                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?)
                 if main_processor || test_processor
                   xml.profile(:name => "#{prj.name}", :enabled => true) do
                     xml.sourceOutputDir :name => 'generated/processors/main/java' if main_processor
@@ -1597,7 +1604,7 @@ module Buildr #:nodoc:
         resolve_path_from_base(path, '$PROJECT_DIR$')
       end
 
-    private
+      private
 
       def default_code_sight_excludes
         %w(
@@ -1717,7 +1724,7 @@ module Buildr #:nodoc:
         ].compact
 
         files.each do |ideafile|
-          module_dir =  File.dirname(ideafile.filename)
+          module_dir = File.dirname(ideafile.filename)
           idea.enhance do |task|
             mkdir_p module_dir
             info "Writing #{ideafile.filename}"

data/lib/buildr/java/commands.rb

@@ -70,7 +70,7 @@ module Java
             paths = cp.map do |c|
               File.directory?(c) && !c.end_with?('/') ? "#{c}/" : c.to_s
             end
-            manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.map{|p| URI.encode(p)}.join(" ")}])
+            manifest = Buildr::Packaging::Java::Manifest.new([{'Class-Path' => paths.map{|p| CGI.escape(p)}.join(" ")}])
             tjar = Tempfile.new(%w[javacmd .jar])
             Zip::OutputStream.open(tjar.path) do |zos|
               zos.put_next_entry('META-INF/MANIFEST.MF')

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/packaging/artifact.rb

@@ -246,9 +246,8 @@ module Buildr #:nodoc:
       # Username/password may be part of URI, or separate entities.
       uri = URI.parse(upload_to[:url].clone)
       uri.path = uri.path + '/' unless uri.path[-1] == '/'
-      to_escape = "!\"\#$%&'()*+,-./:;<=>?@{}|~`'"
-      uri.user = URI.encode(upload_to[:username], to_escape) if upload_to[:username]
-      uri.password = URI.encode(upload_to[:password], to_escape) if upload_to[:password]
+      uri.user = CGI.escape(upload_to[:username]) if upload_to[:username]
+      uri.password = CGI.escape(upload_to[:password]) if upload_to[:password]
 
       path = group.gsub('.', '/') + "/#{id}/#{version}/#{upload_name}"
 

data/lib/buildr/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.12
+  version: 1.5.17
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-20 00:00:00.000000000 Z
+date: 2021-05-23 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