realityforge-buildr 1.5.9 → 1.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aead139867720099e785867e129cdbd0ac5d7755c9aecaa82cad4ba79e8b703
-  data.tar.gz: e5b61d9c94ec8ca7cda8ca3583cf99223b9e47226a2a8c7e8bf4620521ee7eb4
+  metadata.gz: 63d48d00ff2c45664c2dee85712e4c8014d1015519e3cf24fca25428c5cb2232
+  data.tar.gz: 0de204d07f99d6bb57b4e7d1ca68c44e22aeecac0e84ed4c4eb35ab4f454412d
 SHA512:
-  metadata.gz: d6f7cbf839087fd897e8cea08b42697a1cf5109eba3a77223c70db7e9a124f83e98c2627d411f5b8effad5e691cf2dfffedfc01ae2bf886e5d6d781eb688a49e
-  data.tar.gz: c23a3d5b5c4f8bc1996395405d83d059244cd9ed71b97a9fbc653eb05a42b7884e186c936017f561c5fd8b065b3bcb0ed0e7795f67410d6f3d048d0e482c934e
+  metadata.gz: 117f3e4c4d92fd43da908c0a32b468c9eca92d6ca6a79817f8a27d70241da999d8999b6ed9d9af721f71cf8be81c467db02f8331530c16b1ed03ffb1316c27f4
+  data.tar.gz: 0a9f1a1a159a23bf386027068d7285510ea223838f5bda0e5482d2e596dbccdeb585250be197916ba4eb473174cc104771470b61a28738079e5eeccd238221c3

data/addon/buildr/jacoco.rb

@@ -148,6 +148,9 @@ module Buildr
           options[:html_output_directory] = project._(:reports, :jacoco, 'docs')
 
           unless execution_files.empty?
+            FileUtils.mkdir_p File.dirname(options[:xml_output_file])
+            FileUtils.mkdir_p File.dirname(options[:csv_output_file])
+            FileUtils.mkdir_p options[:html_output_directory]
             Buildr::JaCoCo.jacoco_report(execution_files, class_paths, source_paths, options)
           end
         end

data/addon/buildr/shade.rb

@@ -0,0 +1,42 @@
+#
+# 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
+  # Provides the shade method.
+  module Shade
+    class << self
+      def shade(input_jar, output_jar, relocations = {})
+
+        shaded_jar = (input_jar.to_s + '-shaded')
+        a = Buildr.artifact('org.realityforge.shade:shade-cli:jar:1.0.0')
+        a.invoke
+
+        args = []
+        args << Java::Commands.path_to_bin('java')
+        args << '-jar'
+        args << a.to_s
+        args << '--input'
+        args << input_jar.to_s
+        args << '--output'
+        args << shaded_jar.to_s
+        relocations.each_pair do |k, v|
+          args << "-r#{k}=#{v}"
+        end
+
+        sh args.join(' ')
+        FileUtils.mv shaded_jar, output_jar.to_s
+      end
+    end
+  end
+end

data/addon/buildr/top_level_generate_dir.rb

@@ -25,7 +25,7 @@ module Buildr
       include Extension
 
       before_define do |project|
-        project.layout[:target, :generated] = "generated"
+        project.layout[:target, :generated] = 'generated'
         project.clean { rm_rf project._(:target, :generated) }
       end
     end

data/buildr.gemspec

@@ -35,12 +35,12 @@ for those one-off tasks, with a language that's a joy to use.
   TEXT
 
   spec.files          = Dir['{addon,bin,lib,rakelib,spec}/**/*', '*.{gemspec}'] +
-                        %w(LICENSE NOTICE CHANGELOG.md README.md Rakefile)
+                        %w(LICENSE NOTICE README.md Rakefile)
   spec.require_paths  = 'lib', 'addon'
   spec.bindir         = 'bin'
   spec.executable     = 'buildr'
 
-  spec.extra_rdoc_files = 'README.md', 'CHANGELOG.md', 'LICENSE', 'NOTICE'
+  spec.extra_rdoc_files = 'README.md', 'LICENSE', 'NOTICE'
   spec.rdoc_options     = '--title', 'Buildr', '--main', 'README.md',
                           '--webcvs', 'https://github.com/realityforge/buildr'
   spec.post_install_message = 'To get started run buildr --help'

data/lib/buildr.rb

@@ -50,6 +50,7 @@ require 'buildr/core/test'
 require 'buildr/java/commands'
 require 'buildr/core/transports'
 require 'buildr/java/pom'
+require 'buildr/java/publish'
 require 'buildr/core/doc'
 require 'buildr/packaging/version_requirement'
 require 'buildr/packaging/artifact_namespace'
@@ -65,6 +66,7 @@ require 'buildr/java/packaging'
 require 'buildr/java/commands'
 require 'buildr/java/doc'
 require 'buildr/java/custom_pom'
+require 'buildr/java/annotation_processor'
 require 'buildr/ide/idea'
 
 # Methods defined in Buildr are both instance methods (e.g. when included in Project)

data/lib/buildr/core/transports.rb

@@ -273,7 +273,7 @@ module URI
         headers['Cache-Control'] = 'no-cache'
         headers['User-Agent'] = "Buildr-#{Buildr::VERSION}"
         request = Net::HTTP::Get.new(request_uri.empty? ? '/' : request_uri, headers)
-        request.basic_auth URI.decode(self.user), URI.decode(self.password) if self.user
+        request.basic_auth CGI.unescape(self.user), CGI.unescape(self.password) if self.user
         http.verify_mode = ::OpenSSL::SSL.const_get(ENV['SSL_VERIFY_MODE']) if ENV['SSL_VERIFY_MODE']
         http.ca_path = ENV['SSL_CA_CERTS'] if ENV['SSL_CA_CERTS']
         http.request request do |response|
@@ -330,7 +330,7 @@ module URI
         end
         headers = { 'Content-MD5'=>Digest::MD5.hexdigest(content.string), 'Content-Type'=>'application/octet-stream', 'User-Agent'=>"Buildr-#{Buildr::VERSION}" }
         request = Net::HTTP::Put.new(request_uri.empty? ? '/' : request_uri, headers)
-        request.basic_auth URI.decode(self.user), URI.decode(self.password) if self.user
+        request.basic_auth CGI.unescape(self.user), CGI.unescape(self.password) if self.user
         response = nil
         with_progress_bar options[:progress], path.split('/').last, content.size do |progress|
           request.content_length = content.size

data/lib/buildr/ide/idea.rb

@@ -56,6 +56,12 @@ module Buildr #:nodoc:
         self.components << create_component(name, attrs, &xml)
       end
 
+      def add_component_in_lambda(name, attrs = {}, &xml)
+        self.components << lambda do
+          create_component(name, attrs, &xml)
+        end
+      end
+
       def add_component_from_file(filename)
         self.components << lambda do
           raise "Unable to locate file #{filename} adding component to idea file" unless File.exist?(filename)
@@ -719,6 +725,16 @@ module Buildr #:nodoc:
         @jdk_version ||= buildr_project.compile.options.source || '1.7'
       end
 
+      def nonnull_assertions?
+        @nonnull_assertions.nil? ? true : !!@nonnull_assertions
+      end
+
+      attr_writer :nonnull_assertions
+
+      def wildcard_resource_patterns
+        @wildcard_resource_patterns ||= %w(!?*.java !?*.form !?*.class !?*.groovy !?*.scala !?*.flex !?*.kt !?*.clj !?*.aj)
+      end
+
       def add_artifact(name, type, build_on_make = false)
         add_to_composite_component(self.artifacts) do |xml|
           xml.artifact(:name => name, :type => type, 'build-on-make' => build_on_make) do |xml|
@@ -793,7 +809,7 @@ module Buildr #:nodoc:
         }.merge(options)
 
         if params[:url]
-          if /jdbc\:jtds\:sqlserver\:\/\/[^:\\]+(\:\d+)?\/([^;]*)(\;.*)?/ =~ params[:url]
+          if /jdbc:jtds:sqlserver:\/\/[^:\\]+(:\d+)?\/([^;]*)(;.*)?/ =~ params[:url]
             database_name = $2
             params[:schema_pattern] = "#{database_name}.*"
             params[:default_schemas] = "#{database_name}.*"
@@ -803,6 +819,47 @@ module Buildr #:nodoc:
         add_data_source(name, params)
       end
 
+      def add_javac_settings(javac_args)
+        add_component('JavacSettings') do |xml|
+          xml.option(:name => 'ADDITIONAL_OPTIONS_STRING', :value => javac_args)
+        end
+      end
+
+      def add_code_insight_settings(options = {})
+        excluded_names = options[:excluded_names] || default_code_sight_excludes
+        excluded_names += (options[:extra_excluded_names] || [])
+        add_component('JavaProjectCodeInsightSettings') do |xml|
+          xml.tag!('excluded-names') do
+            excluded_names.each do |excluded_name|
+              xml << "<name>#{excluded_name}</name>"
+            end
+          end
+        end
+      end
+
+      def add_nullable_manager
+        add_component('NullableNotNullManager') do |component|
+          component.option :name => 'myDefaultNullable', :value => 'javax.annotation.Nullable'
+          component.option :name => 'myDefaultNotNull', :value => 'javax.annotation.Nonnull'
+          component.option :name => 'myNullables' do |option|
+            option.value do |value|
+              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'
+              end
+            end
+          end
+          component.option :name => 'myNotNulls' do |option|
+            option.value do |value|
+              value.list :size => '2' 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'
+              end
+            end
+          end
+        end
+      end
+
       def add_less_compiler_component(project, options = {})
         source_dir = options[:source_dir] || project._(:source, :main, :webapp, :less).to_s
         source_pattern = options[:pattern] || '*.less'
@@ -1376,6 +1433,7 @@ module Buildr #:nodoc:
           lambda { modules_component },
           vcs_component,
           artifacts_component,
+          compiler_configuration_component,
           lambda { data_sources_component },
           configurations_component,
           lambda { framework_detection_exclusion_component }
@@ -1477,6 +1535,60 @@ module Buildr #:nodoc:
         create_composite_component('ArtifactManager', {}, self.artifacts)
       end
 
+      def compiler_configuration_component
+        lambda do
+          create_component('CompilerConfiguration') do |component|
+            component.addNotNullAssertions :enabled => 'false' unless nonnull_assertions?
+            component.wildcardResourcePatterns do |xml|
+              wildcard_resource_patterns.each do |pattern|
+                xml.entry :name => pattern.to_s
+              end
+            end
+            component.annotationProcessing do |xml|
+              xml.profile(:default => true, :name => 'Default', :enabled => true) do
+                xml.sourceOutputDir :name => 'generated/processors/main/java'
+                xml.sourceTestOutputDir :name => 'generated/processors/test/java'
+                xml.outputRelativeToContentRoot :value => true
+                xml.processorPath :useClasspath => true
+              end
+              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?
+                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_path = (prj.compile.options[:processor_path] || []) + (prj.test.compile.options[:processor_path] || [])
+                    if processor_path.empty?
+                      xml.processorPath :useClasspath => true
+                    else
+                      xml.processorPath :useClasspath => false do
+                        Buildr.artifacts(processor_path).each do |path|
+                          xml.entry :name => resolve_path(path.to_s)
+                        end
+                      end
+                    end
+                  end
+                else
+                  disabled << prj
+                end
+              end
+              unless disabled.empty?
+                xml.profile(:name => 'Disabled') do
+                  disabled.each do |p|
+                    xml.module :name => p.iml.name
+                  end
+                end
+              end
+            end
+          end
+        end
+      end
+
       def configurations_component
         create_composite_component('ProjectRunConfigurationManager', {}, self.configurations)
       end
@@ -1487,6 +1599,21 @@ module Buildr #:nodoc:
 
     private
 
+      def default_code_sight_excludes
+        %w(
+          com.sun.istack.internal.NotNull
+          com.sun.istack.internal.Nullable
+          org.jetbrains.annotations.Nullable
+          org.jetbrains.annotations.NotNull
+          org.testng.AssertJUnit
+          org.testng.internal.Nullable
+          org.mockito.internal.matchers.NotNull
+          edu.umd.cs.findbugs.annotations.Nonnull
+          edu.umd.cs.findbugs.annotations.Nullable
+          edu.umd.cs.findbugs.annotations.SuppressWarnings
+      )
+      end
+
       def to_artifact_name(project, options)
         options[:name] || project.iml.id
       end

data/lib/buildr/java/annotation_processor.rb

@@ -0,0 +1,61 @@
+# This file is licensed to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+module Buildr
+  module ProcessorPath
+    module ProjectExtension
+      include Extension
+
+      before_define do |project|
+        if project.iml?
+          project.iml.instance_variable_set('@main_generated_source_directories', [])
+          project.iml.instance_variable_set('@test_generated_source_directories', [])
+        end
+      end
+
+      after_define do |project|
+        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|
+            mkdir_p t.to_s
+          end
+          project.compile.enhance([f])
+          project.compile.options[:other] = [] unless project.compile.options[:other]
+          project.compile.options[:other] += ['-s', path]
+          project.iml.main_generated_source_directories << path if project.iml?
+
+          project.clean do
+            rm_rf path
+          end
+        end
+        if !!project.test.compile.options[:processor] || (project.test.compile.options[:processor].nil? && !(project.test.compile.options[:processor_path] || []).empty?)
+          path = project._(:target, :generated, 'processors/test/java')
+          f = project.file(path) do |t|
+            mkdir_p t.to_s
+          end
+          project.test.compile.enhance([f])
+          project.test.compile.options[:other] = [] unless project.test.compile.options[:other]
+          project.test.compile.options[:other] += ['-s', path]
+          project.iml.test_generated_source_directories << path if project.iml?
+
+          project.clean do
+            rm_rf path
+          end
+        end
+      end
+    end
+  end
+end
+
+class Buildr::Project
+  include Buildr::ProcessorPath::ProjectExtension
+end

data/lib/buildr/java/commands.rb

@@ -63,14 +63,14 @@ module Java
           cmd_args << "cd '#{options[:dir]}' && "
         end
         cmd_args << path_to_bin('java')
-        cp = classpath_from(options)
+        cp = classpath_from(options[:classpath])
 
         unless cp.empty?
           if options[:pathing_jar] == true
             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')
@@ -112,14 +112,16 @@ module Java
       #
       # The last argument may be a Hash with additional options:
       # * :output -- Target directory for all compiled class files.
-      # * :classpath -- One or more file names, tasks or artifact specifications.
-      #   These are all expanded into artifacts, and all tasks are invoked.
+      # * :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.
       # * :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
+        rake_check_options options, :classpath, :sourcepath, :output, :javac_args, :name, :processor, :processor_path
+
+        processor = !!options[:processor]
 
         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
@@ -127,9 +129,15 @@ module Java
 
         cmd_args = []
         cmd_args << path_to_bin('javac')
-        cp = classpath_from(options)
+        cp = classpath_from(options[:classpath])
         cmd_args << '-classpath' << cp.join(File::PATH_SEPARATOR) unless cp.empty?
         cmd_args << '-sourcepath' << [options[:sourcepath]].flatten.join(File::PATH_SEPARATOR) if options[:sourcepath]
+        if processor
+          processor_path = classpath_from(options[:processor_path])
+          cmd_args << '-processorpath' << processor_path.join(File::PATH_SEPARATOR) unless processor_path.empty?
+        else
+          cmd_args << '-proc:none'
+        end
         cmd_args << '-d' << File.expand_path(options[:output].to_s) if options[:output]
         cmd_args += options[:javac_args].flatten if options[:javac_args]
         Tempfile.open('javac') do |tmp|
@@ -221,9 +229,8 @@ module Java
       #
       # Extracts the classpath from the options, expands it by calling artifacts, invokes
       # each of the artifacts and returns an array of paths.
-      def classpath_from(options)
-        Buildr.artifacts(options[:classpath] || []).map(&:to_s).
-          map { |t| task(t).invoke; File.expand_path(t) }
+      def classpath_from(classpath)
+        Buildr.artifacts(classpath || []).flatten.map(&:to_s).map { |t| task(t).invoke; File.expand_path(t) }
       end
     end
   end

data/lib/buildr/java/compiler.rb

@@ -33,9 +33,9 @@ module Buildr #:nodoc:
     # (e.g. ['-implicit:none', '-encoding', 'iso-8859-1'])
     class Javac < Base
 
-      OPTIONS = [:warnings, :debug, :deprecation, :source, :target, :lint, :other]
+      OPTIONS = [:warnings, :debug, :deprecation, :source, :target, :lint, :other, :processor_path, :processor]
 
-      specify :language=>:java, :target=>'classes', :target_ext=>'class', :packaging=>:jar
+      specify :language => :java, :target => 'classes', :target_ext => 'class', :packaging => :jar
 
       def initialize(project, options) #:nodoc:
         super
@@ -43,15 +43,20 @@ module Buildr #:nodoc:
         options[:warnings] ||= false
         options[:deprecation] ||= false
         options[:lint] ||= false
+        options[:processor] ||= nil
+        options[:processor_path] ||= []
       end
 
       def compile(sources, target, dependencies) #:nodoc:
         check_options options, OPTIONS
+        processor = !!options[:processor] || options[:processor].nil?
         Java::Commands.javac(files_from_sources(sources),
                              :classpath => dependencies,
                              :sourcepath => sources.select { |source| File.directory?(source) },
                              :output => target,
-                             :javac_args => self.javac_args)
+                             :processor => processor,
+                             :processor_path => (processor ? options[:processor_path] : []),
+                             :javac_args => javac_args)
       end
 
       # Filter out source files that are known to not produce any corresponding .class output file. If we leave

data/lib/buildr/java/publish.rb

@@ -0,0 +1,262 @@
+#
+# 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.
+#
+
+require 'net/http'
+require 'net/https'
+require 'json'
+
+module Buildr
+  class MavenCentral
+    class << self
+      def define_publish_tasks(options = {})
+        candidate_branches = options[:branches] || %w(master)
+        desc 'Publish release on maven central'
+        task 'mcrt:publish' do
+          project = options[:project] || Buildr.projects[0].root_project
+          profile_name = options[:profile_name] || (raise ':profile_name not specified when defining tasks')
+          username = options[:username] || (raise ':username name not specified when defining tasks')
+          password = options[:password] || ENV['MAVEN_CENTRAL_PASSWORD'] || (raise "Unable to locate environment variable with name 'MAVEN_CENTRAL_PASSWORD'")
+          MavenCentral.buildr_release(project, profile_name, username, password)
+        end
+
+        desc 'Publish release to maven central iff current HEAD is a tag'
+        task 'mcrt:publish_if_tagged' do
+          tag = MavenCentral.get_head_tag_if_any
+          if tag.nil?
+            puts 'Current HEAD is not a tag. Skipping publish step.'
+          else
+            puts "Current HEAD is a tag: #{tag}"
+            if MavenCentral.is_tag_on_candidate_branches?(tag, candidate_branches)
+              task('mcrt:publish').invoke
+            end
+          end
+        end
+      end
+
+      def get_head_tag_if_any
+        version = `git describe --exact-match --tags 2>&1`
+        if 0 == $?.exitstatus && version =~ /^v[0-9]/ && (ENV['TRAVIS_BUILD_ID'].nil? || ENV['TRAVIS_TAG'].to_s != '')
+          version.strip
+        else
+          nil
+        end
+      end
+
+      def is_tag_on_branch?(tag, branch)
+        output = `git tag --merged #{branch} 2>&1`
+        tags = output.split
+        tags.include?(tag)
+      end
+
+      def is_tag_on_candidate_branches?(tag, branches)
+        sh 'git fetch origin'
+        branches.each do |branch|
+          if is_tag_on_branch?(tag, branch)
+            puts "Tag #{tag} is on branch: #{branch}"
+            return true
+          elsif is_tag_on_branch?(tag, "origin/#{branch}")
+            puts "Tag #{tag} is on branch: origin/#{branch}"
+            return true
+          else
+            puts "Tag #{tag} is not on branches: #{branch} or origin/#{branch}"
+          end
+        end
+        false
+      end
+
+      def buildr_release(project, profile_name, username, password)
+        release_to_url = Buildr.repositories.release_to[:url]
+        release_to_username = Buildr.repositories.release_to[:username]
+        release_to_password = Buildr.repositories.release_to[:password]
+
+        begin
+          Buildr.repositories.release_to[:url] = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
+          Buildr.repositories.release_to[:username] = username
+          Buildr.repositories.release_to[:password] = password
+
+          project.task(':package').invoke
+
+          r = MavenCentral.new
+          r.username = username
+          r.password = password
+          r.user_agent = "Buildr-#{Buildr::VERSION}"
+          while r.get_staging_repositories(profile_name, false).size != 0
+            puts 'Another project currently staging. Waiting for other repository to complete. Please visit the website https://oss.sonatype.org/index.html#stagingRepositories to view the other staging attempts.'
+            sleep 1
+          end
+          puts "Beginning upload to staging repository #{profile_name}"
+
+          project.task(':upload').invoke
+
+          r.release_sole_auto_staging(profile_name)
+        ensure
+          Buildr.repositories.release_to[:url] = release_to_url
+          Buildr.repositories.release_to[:username] = release_to_username
+          Buildr.repositories.release_to[:password] = release_to_password
+        end
+      end
+    end
+
+    attr_writer :username
+
+    def username
+      @username || (raise 'Username not yet specified')
+    end
+
+    attr_writer :password
+
+    def password
+      @password || (raise 'Password not yet specified')
+    end
+
+    attr_writer :user_agent
+
+    def user_agent
+      @user_agent || "Ruby-#{RUBY_VERSION}"
+    end
+
+    def get_staging_repositories(profile_name, ignore_transitioning_repositories = true)
+      result = get_request('https://oss.sonatype.org/service/local/staging/profile_repositories')
+      result = JSON.parse(result)
+      result['data'].select do |repo|
+        repo['profileName'] == profile_name &&
+          repo['userId'] == self.username &&
+          repo['userAgent'] == self.user_agent &&
+          (!ignore_transitioning_repositories || !repo['transitioning']) &&
+          get_my_ip_addresses.any? { |a| a == repo['ipAddress'] }
+      end
+    end
+
+    def get_my_ip_addresses
+      addresses = Socket.ip_address_list.collect { |a| a.ip_address.to_s }
+      commands = [
+        "dig +short myip.opendns.com @resolver1.opendns.com",
+        "curl ifconfig.me",
+        "curl icanhazip.com",
+        "curl ipecho.net/plain",
+        "curl ifconfig.co",
+        "dig TXT +short o-o.myaddr.l.google.com @ns1.google.com | awk -F'\"' '{ print $2 }'"
+      ]
+      commands.each do |cmd|
+        begin
+          addresses << `#{cmd}`.strip
+        rescue Exception
+          # ignored
+        end
+      end
+      urls = %w[http://www.myexternalip.com/raw https://diagnostic.opendns.com/myip]
+      urls.each do |url|
+        begin
+          addresses << Net::HTTP.get(URI(url)).strip
+        rescue Exception
+          # ignored
+        end
+      end
+      begin
+        addresses << JSON.parse(Net::HTTP.get(URI('https://api.ipify.org?format=json')))['ip']
+      rescue Exception
+        # ignored
+      end
+      addresses.sort.uniq
+    end
+
+    def close_repository(repository_id, description)
+      post_request('https://oss.sonatype.org/service/local/staging/bulk/close',
+                   JSON.pretty_generate('data' => { 'description' => description, 'stagedRepositoryIds' => [repository_id] }))
+    end
+
+    def promote_repository(repository_id, description)
+      post_request('https://oss.sonatype.org/service/local/staging/bulk/promote',
+                   JSON.pretty_generate('data' => { 'autoDropAfterRelease' => true,
+                                                    'description' => description,
+                                                    'stagedRepositoryIds' => [repository_id] }))
+    end
+
+    def drop_repository(repository_id, description)
+      post_request('https://oss.sonatype.org/service/local/staging/bulk/drop',
+                   JSON.pretty_generate('data' => { 'description' => description, 'stagedRepositoryIds' => [repository_id] }))
+    end
+
+    def release_sole_auto_staging(profile_name)
+      candidates = get_staging_repositories(profile_name)
+      if candidates.empty?
+        raise 'Release process unable to find any staging repositories.'
+      elsif 1 != candidates.size
+        raise 'Release process found multiple staging repositories that could be the release just uploaded. Please visit the website https://oss.sonatype.org/index.html#stagingRepositories and manually complete the release.'
+      else
+        candidate = candidates[0]
+        puts "Requesting close of staging repository #{profile_name}:#{candidate['repositoryId']}"
+        begin
+          close_repository(candidate['repositoryId'], "Closing repository for #{profile_name}")
+        rescue Exception => e
+          puts "#{e.class.name}: #{e.message}"
+          puts e.backtrace.join("\n")
+          raise 'Failed to close repository. It is likely that the release does not conform to Maven Central release requirements. Please visit the website https://oss.sonatype.org/index.html#stagingRepositories and manually complete the release.'
+        end
+        while get_staging_repositories(profile_name).size == 0
+          puts 'Waiting for repository to close...'
+          sleep 1
+        end
+        puts "Requesting promotion of staging repository #{profile_name}:#{candidate['repositoryId']}"
+        begin
+          promote_repository(candidate['repositoryId'], "Promoting repository for #{profile_name}")
+        rescue Exception => e
+          puts "#{e.class.name}: #{e.message}"
+          puts e.backtrace.join("\n")
+          raise 'Failed to promote repository. Please visit the website https://oss.sonatype.org/index.html#stagingRepositories and manually complete the release.'
+        end
+        repositories = get_staging_repositories(profile_name, false)
+        while repositories.size == 1
+          puts 'Waiting for repository to be promoted...'
+          sleep 1
+          if repositories[0]['notifications'] != 0
+            raise 'Failed to promote repository. Please visit the website https://oss.sonatype.org/index.html#stagingRepositories and manually complete the release.'
+          end
+          repositories = get_staging_repositories(profile_name, false)
+        end
+      end
+    end
+
+    private
+
+    def create_http(uri)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http
+    end
+
+    def setup_standard_request(request)
+      request['Accept'] = 'application/json,application/vnd.siesta-error-v1+json,application/vnd.siesta-validation-errors-v1+json'
+      request.basic_auth(self.username, self.password)
+      request.add_field('User-Agent', self.user_agent)
+    end
+
+    def get_request(url)
+      uri = URI.parse(url)
+      request = Net::HTTP::Get.new(uri.request_uri)
+      setup_standard_request(request)
+      create_http(uri).request(request).body
+    end
+
+    def post_request(url, content)
+      uri = URI.parse(url)
+      request = Net::HTTP::Post.new(uri.request_uri)
+      setup_standard_request(request)
+      request.add_field('Content-Type', 'application/json')
+      request.body = content
+      create_http(uri).request(request).body
+    end
+  end
+end

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.9'.freeze
+  VERSION = '1.5.14'.freeze
 end

data/rakelib/release.rake

@@ -79,7 +79,7 @@ task 'perform_release' do
 
     stage('PostReleaseUpdateVersion', 'Update the version to the non-dev version') do
       filename = 'lib/buildr/version.rb'
-      parts = ENV['PRODUCT_VERSION'].split
+      parts = ENV['PRODUCT_VERSION'].split('.')
       next_version = "#{parts[0]}.#{parts[1]}.#{parts[2].to_i + 1}"
       content = IO.read(filename).sub(/VERSION = '(.*)'\.freeze/, "VERSION = '#{next_version}.dev'.freeze")
       IO.write(filename, content)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.14
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -175,11 +175,9 @@ executables:
 extensions: []
 extra_rdoc_files:
 - README.md
-- CHANGELOG.md
 - LICENSE
 - NOTICE
 files:
-- CHANGELOG.md
 - LICENSE
 - NOTICE
 - README.md
@@ -191,6 +189,7 @@ files:
 - addon/buildr/gwt.rb
 - addon/buildr/jacoco.rb
 - addon/buildr/pmd.rb
+- addon/buildr/shade.rb
 - addon/buildr/single_intermediate_layout.rb
 - addon/buildr/spotbugs.rb
 - addon/buildr/top_level_generate_dir.rb
@@ -214,12 +213,14 @@ files:
 - lib/buildr/core/transports.rb
 - lib/buildr/core/util.rb
 - lib/buildr/ide/idea.rb
+- lib/buildr/java/annotation_processor.rb
 - lib/buildr/java/commands.rb
 - lib/buildr/java/compiler.rb
 - lib/buildr/java/custom_pom.rb
 - lib/buildr/java/doc.rb
 - lib/buildr/java/packaging.rb
 - lib/buildr/java/pom.rb
+- lib/buildr/java/publish.rb
 - lib/buildr/java/test_result.rb
 - lib/buildr/java/tests.rb
 - lib/buildr/packaging/archive.rb

data/CHANGELOG.md

@@ -1,5 +0,0 @@
-# Change Log
-
-### Unreleased
-
-* First release after extraction from Apache Buildr.