realityforge-buildr 1.5.17 → 1.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65fb6b6cc188f8b1e7b200f0ad1b56b838d89347c58d9f413d01e233fe96f920
-  data.tar.gz: f19e4cd3a75ced32f067d865cd4bb3c96553416f869e0dc9ebacf2012cb26f5a
+  metadata.gz: 1932d8782ef4f08cac42f5941f4f98922ea4a5323ead460b1cfe429447a920b6
+  data.tar.gz: cfac26c31803f3579cef1876d48969c0c0166107636d107b851b34b2142d436b
 SHA512:
-  metadata.gz: ee6bc9306443afd70e60d15cf49646a95c866c18672c064e5613a989277b38ceca892c562135d180920a48fc5cf1486d20ec51436dcef6d64aeef80d6ba4db0c
-  data.tar.gz: 5adee0791894e792b062d7488eb0f044b54d380969c5899651691f988af22c09a188ecbfc4d2e719c2f848ce1785531d448ee3c1d2afe620344854d3682f44c6
+  metadata.gz: fc78f9279e57e8fbbad90e9bc7e0d60cc755f02d573a8a13f87986535549ece7c76597b6be505b54c6f8491ba6677dc267d949aebcf5304c1b5077a3de119404
+  data.tar.gz: 222f81cd3439630178a37adf725b1879946b3aa9eab171a1dce2dd996439aee8046992e9e95de2520bfb002aea535b70f9f8f3fb047044efcc0b9761ec9a60d8

data/addon/buildr/git_auto_version.rb

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

data/addon/buildr/gwt.rb

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

data/addon/buildr/release_tool.rb

@@ -148,6 +148,15 @@ module Buildr
         header += "\n\n#{sub_header_text}" unless sub_header_text.empty?
         header += "\n"
 
+        release_notes_file = options[:release_notes_summary_file]
+        if release_notes_file && File.exist?(release_notes_file)
+          summary_content = IO.read(release_notes_file).strip
+          unless summary_content.empty?
+            header += summary_content + "\n"
+            IO.write(release_notes_file, "\n")
+          end
+        end
+
         header += <<CONTENT
 
 Changes in this release:
@@ -156,6 +165,7 @@ CONTENT
         IO.write('CHANGELOG.md', changelog.gsub("### Unreleased\n", header))
 
         sh 'git reset 2>&1 1> /dev/null'
+        sh "git add #{release_notes_file}" if File.exist?(release_notes_file)
         sh 'git add CHANGELOG.md'
         sh 'git commit -m "Update CHANGELOG.md in preparation for release"'
       end

data/lib/buildr/ide/idea.rb

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

data/lib/buildr/java/annotation_processor.rb

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

data/lib/buildr/java/commands.rb

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

data/lib/buildr/java/compiler.rb

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

data/lib/buildr/java/tests.rb

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

data/lib/buildr/version.rb

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

data/rakelib/release.rake

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

data/spec/ide/idea_spec.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realityforge-buildr
 version: !ruby/object:Gem::Version
-  version: 1.5.17
+  version: 1.5.18
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake