buildr 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75724aff76d417efd0ab58bb34f5cfb8cb3909dc
-  data.tar.gz: 0daff8ed585946ec1c9eac15c0d8b07369b60b0a
+  metadata.gz: 4386addadf1a9bf28cea9094d9f36589a3b0f251
+  data.tar.gz: 7919f9c431cd040d913d0b80c5bd4054f0c61eba
 SHA512:
-  metadata.gz: 5beb8321ba75ab4e22827cab11b5f84f3faae2ca1371590f8b7ba1479a0a7e53c3bff4ab8e4b17e7db4a2d12c794bdaa2137fe237650def7b09676faae30b078
-  data.tar.gz: e9e31ef3f421c0a0dedf76ab08bd18e34c96eaa1e70c930300a4113ff559fd49e11da317fbff49002103cb449d4b312af726ea78cefe07a9674116d686ada5bf
+  metadata.gz: 16af22f1924a5f02766955b5dc5de45cf9080ba6b9d04e3301c0f5df51e2767c72008b54ceab2c67f5bd64e3efbd81d68696d3a4e9570fa3d93331f35d94a953
+  data.tar.gz: 9ec93c03b87c64e25afe2a02afe74f9903f92ea5c94ec8c71deb77f2229bed232de346c9d608020bed508b4f12394e3dc698a9f9954ded467cf809de504e41fb

data/CHANGELOG

@@ -1,3 +1,27 @@
+1.5.4 (2017-11-29)
+* Added:  Findbugs Addon: Upgrade to version 3.0.1 of findbugs.
+* Added:  GPG Addon: Add boolean configuration setting `project.gpg` that can be set to false via
+          `project.gpg = false` to avoid signing and uploading packages. This is useful when some
+          projects are not intended for publishing.
+* Fixed:  JaCoCo Addon: Projects that have jacoco disabled will no longer appear in the JaCoCo reports.
+* Change: JaCoCo Addon: Update JaCoCo version to 0.7.9.
+* Fixed:  BUILDR-733 - Escape classpath entries in the pathing jar manifest. Submitted by Glenn Croes.
+* Fixed:  Ensure that the pom is attached to the jar artifact with empty classifier rather than the last
+          artifact of a type defined. Otherwise a project that defines multiple artifacts of the same type
+          (i.e. `package(:jar)` and `package(:jar, :classifier => :gwt)`) could have the pom named after
+          the package with the classifier rather than the package without a classifer. (i.e. the pom could
+          be incorrectly defined as `mypackage-1.0.0-gwt.pom` rather than `mypackage-1.0.0.pom`).
+* Added:  GWT Addon: Add support for GWT 2.8.2 release and make it the default version unless otherwise specified.
+* Added:  GWT Addon: Added support for `:js_exports` boolean to enable "JsInteropExports".
+* Added:  IDEA Extension: Added support for `:open_in_browser` boolean passed to `ipr.add_gwt_configuration`
+* Added:  BUILDR-732 - Support bnd version 2.1.0 or more. Submitted By Eric Bruneton.
+* Added:  Support to compiling Kotlin
+* Fixed:  Remove section on development builds in the Contributing section.
+* Added:  New way to concatenate file contents when merging several archives together.
+* Added:  New way to transform file contents when merging several archives together.
+* Fixed:  Removed .class files from being checked in.
+* Added:  Support both Jetty 6 and Jetty 9 as addons. Added integration tests to cover their use.
+
 1.5.3 (2017-05-17)
 * Change: Add support for gwt 2.8.1 to gwt addon.
 * Fixed:  Avoid error "undefined local variable or method `pom'" when invoking the `JarTask` without it being
@@ -10,7 +34,7 @@
 
 1.5.1 (2017-03-11)
 * Change: In the 'buildr/git_auto_version' addon strip out any versions that start with a 'v' character as
-          most projects on git repositories prefix version tags with a "v" to avoid collisions with any branchs
+          most projects on git repositories prefix version tags with a "v" to avoid collisions with any branches
           named after the version which are typically without the "v" character.
 * Fixed:  GWT Addon: The GWT project publishes invalid jars that can not be included on source path when
           the javadoc tool is executing. Work around this issue in GWT by removing them from the documentation

data/addon/buildr/bnd.rb

@@ -27,7 +27,13 @@ module Buildr
 
       # The specs for requirements
       def dependencies
-        ["biz.aQute:bnd:jar:#{version}"]
+        if Gem::Version.new(version) <= Gem::Version.new('1.50.0')
+          ["biz.aQute:bnd:jar:#{version}"]
+        elsif Gem::Version.new(version) <= Gem::Version.new('2.4.0')
+          ["biz.aQute.bnd:bnd:jar:#{version}"]
+        else
+          ["biz.aQute.bnd:biz.aQute.bnd:jar:#{version}"]
+        end
       end
 
       def bnd_main(*args)
@@ -110,7 +116,7 @@ module Buildr
 
           Buildr::Bnd.bnd_main( bnd_filename )
           begin
-            Buildr::Bnd.bnd_main('print', '-verify', filename )
+            Buildr::Bnd.bnd_main('print', '-v', filename )
           rescue => e
             rm filename
             raise e

data/addon/buildr/findbugs.rb

@@ -23,10 +23,10 @@ module Buildr
       # The specs for requirements
       def dependencies
         %w(
-          com.google.code.findbugs:findbugs:jar:3.0.0
+          com.google.code.findbugs:findbugs:jar:3.0.1
           com.google.code.findbugs:jFormatString:jar:3.0.0
           com.google.code.findbugs:bcel-findbugs:jar:6.0
-          com.google.code.findbugs:annotations:jar:3.0.0
+          com.google.code.findbugs:annotations:jar:3.0.1
           org.ow2.asm:asm-debug-all:jar:5.0.2
           commons-lang:commons-lang:jar:2.6
           dom4j:dom4j:jar:1.6.1

data/addon/buildr/gpg.rb

@@ -72,8 +72,14 @@ module Buildr
     module ProjectExtension
       include Extension
 
+      attr_writer :gpg
+
+      def gpg?
+        @gpg.nil? ? true : !!@gpg
+      end
+
       after_define do |project|
-        Buildr::GPG.sign_and_upload_all_packages(project)
+        Buildr::GPG.sign_and_upload_all_packages(project) if project.gpg?
       end
     end
   end

data/addon/buildr/gwt.rb

@@ -22,7 +22,7 @@ module Buildr
       end
 
       def version
-        @version || Buildr.settings.build['gwt'] || '2.8.1'
+        @version || Buildr.settings.build['gwt'] || '2.8.2'
       end
 
       # The specs for requirements
@@ -93,6 +93,42 @@ module Buildr
               com.ibm.icu:icu4j:jar:50.1.1
               tapestry:tapestry:jar:4.0.2
 
+              javax.annotation:javax.annotation-api:jar:1.2
+              javax.servlet:javax.servlet-api:jar:3.1.0
+              org.eclipse.jetty:jetty-annotations:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-continuation:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-http:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-io:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-jndi:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-plus:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-security:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-server:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-servlet:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-servlets:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-util:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-webapp:jar:9.2.14.v20151106
+              org.eclipse.jetty:jetty-xml:jar:9.2.14.v20151106
+              org.eclipse.jetty.toolchain:jetty-schemas:jar:3.1.M0
+          ) + validation_deps
+        elsif v == '2.8.2'
+          %w(
+              com.google.jsinterop:jsinterop-annotations:jar:1.0.1
+              com.google.jsinterop:jsinterop-annotations:jar:sources:1.0.1
+              org.w3c.css:sac:jar:1.3
+              com.google.gwt:gwt-dev:jar:2.8.2
+              com.google.gwt:gwt-user:jar:2.8.2
+              com.google.code.gson:gson:jar:2.6.2
+              org.ow2.asm:asm:jar:5.0.3
+              org.ow2.asm:asm-util:jar:5.0.3
+              org.ow2.asm:asm-tree:jar:5.0.3
+              org.ow2.asm:asm-commons:jar:5.0.3
+              colt:colt:jar:1.2.0
+              ant:ant:jar:1.6.5
+              commons-collections:commons-collections:jar:3.2.2
+              commons-io:commons-io:jar:2.4
+              com.ibm.icu:icu4j:jar:50.1.1
+              tapestry:tapestry:jar:4.0.2
+
               javax.annotation:javax.annotation-api:jar:1.2
               javax.servlet:javax.servlet-api:jar:3.1.0
               org.eclipse.jetty:jetty-annotations:jar:9.2.14.v20151106
@@ -150,6 +186,10 @@ module Buildr
           args << '-XenableClosureCompiler'
         end
 
+        if options[:js_exports]
+          args << '-generateJsInteropExports'
+        end
+
         args += modules
 
         properties = options[:properties] ? options[:properties].dup : {}

data/addon/buildr/jacoco.rb

@@ -18,7 +18,7 @@ module Buildr
   # WARNING: Experimental and may change radically.
   module JaCoCo
     class << self
-      VERSION = '0.7.2.201409121644'
+      VERSION = '0.7.9'
 
       def version
         @version || Buildr.settings.build['jacoco'] || VERSION
@@ -37,7 +37,7 @@ module Buildr
           "org.jacoco:org.jacoco.report:jar:#{version}",
           "org.jacoco:org.jacoco.core:jar:#{version}",
           "org.jacoco:org.jacoco.ant:jar:#{version}",
-          'org.ow2.asm:asm-debug-all:jar:5.0.1'
+          'org.ow2.asm:asm-debug-all:jar:5.2'
         ]
       end
     end
@@ -146,21 +146,21 @@ module Buildr
               desc 'Generate JaCoCo reports.'
               task 'reports' do
                 Buildr.ant 'jacoco' do |ant|
-                  ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do |ant|
+                  ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do
                     ant.classpath :path => Buildr.artifacts(Buildr::JaCoCo.ant_spec).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
                   end
-                  ant.report do |ant|
-                    ant.executiondata do |ant|
+                  ant.report do
+                    ant.executiondata do
                       ant.file :file => project.jacoco.destfile
                     end
 
-                    ant.structure(:name => project.name) do |ant|
+                    ant.structure(:name => project.name) do
                       if project.compile.target
-                        ant.classfiles do |ant|
+                        ant.classfiles do
                           ant.fileset :dir => project.compile.target
                         end
                       end
-                      ant.sourcefiles(:encoding => 'UTF-8') do |ant|
+                      ant.sourcefiles(:encoding => 'UTF-8') do
                         project.compile.sources.each do |path|
                           ant.fileset :dir => path.to_s
                         end
@@ -179,25 +179,25 @@ module Buildr
       namespace 'jacoco' do
         desc 'Generate JaCoCo reports.'
         task 'report' do
-          Buildr.ant 'jacoco' do |ant|
-            ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do |ant|
+          Buildr.ant('jacoco') do |ant|
+            ant.taskdef(:resource => 'org/jacoco/ant/antlib.xml') do
               ant.classpath :path => Buildr.artifacts(Buildr::JaCoCo.ant_spec).each(&:invoke).map(&:to_s).join(File::PATH_SEPARATOR)
             end
-            ant.report do |ant|
-              ant.executiondata do |ant|
-                Buildr.projects.each do |project|
+            ant.report do
+              ant.executiondata do
+                Buildr.projects.select{|p|p.jacoco.enabled?}.each do |project|
                   ant.fileset :file=>project.jacoco.destfile if File.exist?(project.jacoco.destfile)
                 end
               end
 
-              ant.structure(:name => 'Jacoco Report') do |ant|
-                ant.classfiles do |ant|
-                  Buildr.projects.map(&:compile).map(&:target).flatten.map(&:to_s).each do |src|
+              ant.structure(:name => 'Jacoco Report') do
+                ant.classfiles do
+                  Buildr.projects.select{|p|p.jacoco.enabled?}.map(&:compile).map(&:target).flatten.map(&:to_s).each do |src|
                     ant.fileset :dir=>src.to_s if File.exist?(src)
                   end
                 end
-                ant.sourcefiles(:encoding => 'UTF-8') do |ant|
-                  Buildr.projects.map(&:compile).map(&:sources).flatten.map(&:to_s).each do |src|
+                ant.sourcefiles(:encoding => 'UTF-8') do
+                  Buildr.projects.select{|p|p.jacoco.enabled?}.map(&:compile).map(&:sources).flatten.map(&:to_s).each do |src|
                     ant.fileset :dir=>src.to_s if File.exist?(src)
                   end
                 end

data/addon/buildr/jetty.rb

@@ -39,13 +39,22 @@ module Buildr
   class Jetty
 
     # Which version of Jetty we're using by default (change with options.jetty.version).
-    VERSION = "6.1.3"
-    SLF4J_VERSION = "1.4.3"
+    VERSION = '9.4.6.v20170531'
+    SLF4J_VERSION = '1.7.25'
 
     # Libraries used by Jetty.
-    REQUIRES = [ "org.mortbay.jetty:jetty:jar:#{VERSION}", "org.mortbay.jetty:jetty-util:jar:#{VERSION}",
-      "org.mortbay.jetty:servlet-api-2.5:jar:#{VERSION}", "org.slf4j:slf4j-api:jar:#{SLF4J_VERSION}",
-      "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}", "org.slf4j:jcl104-over-slf4j:jar:#{SLF4J_VERSION}" ]
+    REQUIRES = [ "org.eclipse.jetty:jetty-server:jar:#{VERSION}",
+      "org.eclipse.jetty:jetty-webapp:jar:#{VERSION}",
+      "org.eclipse.jetty:jetty-http:jar:#{VERSION}",
+      "org.eclipse.jetty:jetty-util:jar:#{VERSION}",
+      "org.eclipse.jetty:jetty-io:jar:#{VERSION}",
+      "org.eclipse.jetty:jetty-servlet:jar:#{VERSION}",
+      "org.eclipse.jetty:jetty-security:jar:#{VERSION}",
+      "org.eclipse.jetty:jetty-xml:jar:#{VERSION}",
+      "org.slf4j:slf4j-api:jar:#{SLF4J_VERSION}",
+      "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}", 
+      "org.slf4j:jcl-over-slf4j:jar:#{SLF4J_VERSION}",
+      'javax.servlet:javax.servlet-api:jar:3.1.0' ]
 
     Java.classpath <<  REQUIRES
     Java.classpath << File.dirname(__FILE__)

data/addon/buildr/jetty6.rb

@@ -0,0 +1,243 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with this
+# work for additional information regarding copyright ownership.  The ASF
+# licenses this file 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.
+
+require 'uri'
+require 'net/http'
+require 'thread'
+
+module Buildr
+
+  # Provides a collection of tasks and methods for using Jetty, specifically as a server
+  # for testing your application.
+  #
+  # Build files should always start Jetty by invoking the #use task, typically as
+  # a prerequisite. This task will start Jetty once during the build, and shut it down
+  # when the build completes.
+  #
+  # If you want to keep Jetty running across builds, and look at error messages, you can
+  # start Jetty in a separate console with:
+  #   buildr jetty:start
+  # To stop this instance of Jetty, simply kill the process (Ctrl-C) or run:
+  #   buildr jetty:stop
+  #
+  # If you start Jetty separately from the build, the #use task will connect to that
+  # existing server. Since you are using Jetty across several builds, you will want to
+  # cleanup any mess created by each build. You can use the #setup and #teardown tasks,
+  # which are called when Jetty is first used in the build, and when the build ends.
+  class Jetty6
+
+    # Which version of Jetty we're using by default (change with options.jetty.version).
+    VERSION = "6.1.3"
+    SLF4J_VERSION = "1.4.3"
+
+    # Libraries used by Jetty.
+    REQUIRES = [ "org.mortbay.jetty:jetty:jar:#{VERSION}", "org.mortbay.jetty:jetty-util:jar:#{VERSION}",
+      "org.mortbay.jetty:servlet-api-2.5:jar:#{VERSION}", "org.slf4j:slf4j-api:jar:#{SLF4J_VERSION}",
+      "org.slf4j:slf4j-simple:jar:#{SLF4J_VERSION}", "org.slf4j:jcl104-over-slf4j:jar:#{SLF4J_VERSION}" ]
+
+    Java.classpath <<  REQUIRES
+    Java.classpath << File.dirname(__FILE__)
+
+    # Default URL for Jetty (change with options.jetty.url).
+    URL = "http://localhost:8080"
+
+    class << self
+
+      # :call-seq:
+      #   instance() => Jetty
+      #
+      # Returns an instance of Jetty.
+      def instance()
+        @instance ||= Jetty6.new("jetty", URL)
+      end
+
+    end
+
+    def initialize(name, url) #:nodoc:
+      @url = url
+      namespace name do
+        @setup = task("setup")
+        @teardown = task("teardown")
+        @use = task("use") { fire }
+      end
+    end
+
+    # The URL for the Jetty server. Leave as is if you want to use the default server
+    # (http://localhost:8080).
+    attr_accessor :url
+
+    # :call-seq:
+    #    start(pipe?)
+    #
+    # Starts Jetty. This method does not return, it keeps the thread running until
+    # Jetty is stopped. If you want to run Jetty parallel with other tasks in the build,
+    # invoke the #use task instead.
+    def start(sync = nil)
+      begin
+        puts "classpath #{Java.classpath.inspect}"
+        port = URI.parse(url).port
+        puts "Starting Jetty at http://localhost:#{port}" if verbose
+        Java.load
+        jetty = Java.org.apache.buildr.Jetty6Wrapper.new(port)
+        sync << "Started" if sync
+        sleep # Forever
+      rescue Interrupt # Stopped from console
+      rescue Exception=>error
+        puts "#{error.class}: #{error.message}"
+      end
+      exit! # No at_exit
+    end
+
+    # :call-seq:
+    #    stop()
+    #
+    # Stops Jetty. Stops a server running in a separate process.
+    def stop()
+      uri = URI.parse(url)
+      begin
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          http.request_post "/buildr/stop", ""
+        end
+      rescue Errno::ECONNREFUSED
+        # Expected if Jetty server not running.
+      rescue EOFError
+        # We get EOFError because Jetty is brutally killed.
+      end
+      puts "Jetty server stopped"
+    end
+
+    # :call-seq:
+    #   running?() => boolean
+    #
+    # Returns true if it finds a running Jetty server that supports the Buildr
+    # requests for deploying, stopping, etc.
+    def running?()
+      uri = URI.parse(url)
+      begin
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          response = http.request_get("/buildr/")
+          response.is_a?(Net::HTTPSuccess) && response.body =~ /Alive/
+        end
+      rescue Errno::ECONNREFUSED, Errno::EBADF
+        false
+      end
+    end
+
+    # :call-seq:
+    #   deploy(url, webapp) => path
+    #
+    # Deploy a WAR in the specified URL.
+    def deploy(url, webapp)
+      use.invoke
+      uri = URI.parse(url)
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        response = http.request_post("/buildr/deploy", "webapp=#{webapp}&path=#{uri.path}")
+        if Net::HTTPOK === response && response.body =~ /Deployed/
+          path = response.body.split[1]
+          puts "Deployed #{webapp}, context path #{uri.path}" if trace?
+          path
+        else
+          fail "Deployment failed: #{response}"
+        end
+      end
+    end
+
+    # :call-seq:
+    #   undeploy(url) => boolean
+    #
+    # Undeploys a WAR from the specified URL.
+    def undeploy(url)
+      use.invoke
+      uri = URI.parse(url)
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        response = http.request_post("/buildr/undeploy", "path=#{uri.path}")
+        if Net::HTTPOK === response && response.body =~ /Undeployed/
+          true
+        else
+          fail "Deployment failed: #{response}"
+        end
+      end
+    end
+
+    # :call-seq:
+    #   setup(*prereqs) => task
+    #   setup(*prereqs) { |task| .. } => task
+    #
+    # This task executes when Jetty is first used in the build. You can use it to
+    # deploy artifacts into Jetty.
+    def setup(*prereqs, &block)
+      @setup.enhance prereqs, &block
+    end
+
+    # :call-seq:
+    #   teardown(*prereqs) => task
+    #   teardown(*prereqs) { |task| .. } => task
+    #
+    # This task executes when the build is done. You can use it to undeploy artifacts
+    # previously deployed into Jetty.
+    def teardown(*prereqs, &block)
+      @teardown.enhance prereqs, &block
+    end
+
+    # :call-seq:
+    #   use(*prereqs) => task
+    #   use(*prereqs) { |task| .. } => task
+    #
+    # If you intend to use Jetty, invoke this task. It will start a new instance of
+    # Jetty and close it when the build is done. However, if you already have a server
+    # running in the background (e.g. jetty:start), it will use that server and will
+    # not close it down.
+    def use(*prereqs, &block)
+      @use.enhance prereqs, &block
+    end
+
+  protected
+
+    # If you want to start Jetty inside the build, call this method instead of #start.
+    # It will spawn a separate process that will run Jetty, and will stop Jetty when
+    # the build ends. However, if you already started Jetty from the console (with
+    # take jetty:start), it will use the existing instance without shutting it down.
+    def fire()
+      unless running?
+        sync = Queue.new
+        Thread.new { start sync }
+        # Wait for Jetty to fire up before doing anything else.
+        sync.pop == "Started" or fail "Jetty not started"
+        puts "Jetty started" if verbose
+        at_exit { stop }
+      end
+      @setup.invoke
+      at_exit { @teardown.invoke }
+    end
+
+  end
+
+  namespace "jetty" do
+    desc "Start an instance of Jetty running in the background"
+    task("start") { Jetty6.instance.start }
+    desc "Stop an instance of Jetty running in the background"
+    task("stop") { Jetty6.instance.stop }
+  end
+
+  # :call-seq:
+  #   jetty() => Jetty
+  #
+  # Returns a Jetty object. You can use this to discover the Jetty#use task,
+  # configure the Jetty#setup and Jetty#teardown tasks, deploy and undeploy to Jetty.
+  def jetty()
+    @jetty ||= Jetty6.instance
+  end
+
+end