realityforge-buildr 1.5.10 → 1.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18706f32d591f5eee4b371e56f0e9ab2eae2faeab9e3b108c785727939c9089a
-  data.tar.gz: d27fbad9b2d4ec3a1965d15cfbde2ad56222f6f0569a574c280dfe59d5e23fa7
+  metadata.gz: d8fa34dd92a2579440a4004d0b4a90d43e0cba4302d19e2f7d983db46984123d
+  data.tar.gz: 1b3adb97db7e6bd180232bd89a97d177c3701423a37eee8711e1e14c6b87b00e
 SHA512:
-  metadata.gz: 408323c4e663adaa82994b3192a48def7380cf05aa4b6bf264617195141f7d1cb4875918d32a7bb8e6dea03a0b5c3a5e83f49739c27122dd58214ef23f63b08a
-  data.tar.gz: a06f1222cb77ec21ed799ab6655f4bfcb761fa150c4459e20710314e40500546b0e73faf980ce8c2089dfe1eda11cfccbdea7b9bc1fb4b9a04280104966f05b5
+  metadata.gz: 97881c109b09796e52353d719ba96ea0efc7277f5ce8f6f80c30e12109ebd202e6b97aae56f1833f3d09d12ec870cd906ac90183174d3b881b3903d5c638c385
+  data.tar.gz: 4ff07b06229fe1cbcdbf0e47028e8ac8758c408f0929a7a5397edf05d6653fb54866e433b5970f0acc14fe611b42ec0e100aa25aac0db639fe3d8975aa4ded88

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/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/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/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'

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

@@ -23,30 +23,32 @@ module Buildr
       end
 
       after_define do |project|
-        if project.compile.options.processor?
-          project.file(project._(:target, :generated, 'processors/main/java'))
-          project.compile.enhance do
-            mkdir_p project._(:target, :generated, 'processors/main/java')
+        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', project._(:target, :generated, 'processors/main/java')]
-          project.iml.main_generated_source_directories << project._(:target, :generated, 'processors/main/java') if project.iml?
+          project.compile.options[:other] += ['-s', path]
+          project.iml.main_generated_source_directories << path if project.iml?
 
           project.clean do
-            rm_rf project._(:target, :generated, 'processors/main/java')
+            rm_rf path
           end
         end
-        if project.test.compile.options.processor?
-          project.file(project._(:target, :generated, 'processors/test/java'))
-          project.test.compile.enhance do
-            mkdir_p project._(:target, :generated, 'processors/test/java')
+        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', project._(:target, :generated, 'processors/test/java')]
-          project.iml.test_generated_source_directories << project._(:target, :generated, 'processors/test/java') if project.iml?
+          project.test.compile.options[:other] += ['-s', path]
+          project.iml.test_generated_source_directories << path if project.iml?
 
           project.clean do
-            rm_rf project._(:target, :generated, 'processors/test/java')
+            rm_rf path
           end
         end
       end

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/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.10'.freeze
+  VERSION = '1.5.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.15
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-19 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -220,6 +220,7 @@ files:
 - 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