buildr 1.4.14-java → 1.4.15-java

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGM1ODI5NDM3ZmM2ODMzNzlmZjIzNzk1OGJhODNlMzAxYTAwN2M0Yg==
+    YjdiY2JlYmM1MTIxZWQ5ZjA1MTFhODViOTkzZDExNDg5ZGQ3ZjI1Mg==
   data.tar.gz: !binary |-
-    YTJiMGJjZDg4NDkyNWNkZDFmYjFiOTFiOTIwZjc5NTcwYzBhN2U3ZA==
+    NjQzZTFkYmM3NGFlZTBjYTc1MmEyNDdmMDZkNDRmZjE5NTk5NzYwZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    N2U4ZDYyYmJjNjQ2OTk1N2E5ZWU2YTI1N2FkMDAyM2E3NmQ2NjE0MGZiNGY2
-    NTM0MDcyYzIwN2U0OWI3MDk0ZTIyYzEwZTQyOGYxM2Q1Y2NlYTdkOTM4Nzg0
-    NmI0M2FkYmQ3MzIxZGQyNDY2MDBjOGJlYzZkNDI5M2ZjMzY3YzI=
+    N2VjNzliZTBlNWU3MzkwYzcxNGE5OTdiOGY2NzU0YzA4MTNiYjI3OTNhNzM0
+    MjUzN2MzNmY1ZWM2MGVmN2FjN2NmN2I3ZTRmZjA4N2Y1ZTAxZDcxZmZmN2M4
+    OGUyMDQ5Njc5NDVmZmYwZGI0NGI0OGE0NmM1Y2E5ZmNmYzZjZDY=
   data.tar.gz: !binary |-
-    N2RjNTVkZjExMDY1YmU4ODdmMGVlNDg5NjEyNzRhMmM4MWE0NjY5ODk3NWQ0
-    YTE1Y2ExZWJiNzliMDcwMTIyOWNiMGE5ZDI3ZjExN2NiNzljY2FhOGNhYzky
-    ZGQxMWRjMjU1N2YwYjk0MTQyNmIzZDlkZTJmZmZlMjQyMTFlNjg=
+    M2MzNmE1OGYxNjc3ODg5NjRiYzcyYTEyODcyYWUzNDNiMmVjZDI0ZTBiN2M4
+    ZjA5OGVmMTVkNzBlMmE2NzRkZmQyYWZmOWE1ZWFkNzMxM2RjZjkxY2VkNDNj
+    YjYxNmIyZGIxNTBlNWZkYTMyOGU1M2U3MTAzMTMxODAzNjZiNWU=

data/CHANGELOG

@@ -1,3 +1,27 @@
+1.4.15 (2013-11-06)
+* Change: Update to TestNG 6.8.7.
+* Change: Updated the 'test_jar' package type to have a
+          classifier of 'tests' and thus match maven
+          conventions. Reported by Chris Bozic.
+* Fixed:  BUILDR-689 - Ensure that war file includes generated
+          assets rather than the "source" assets that may have
+          been filtered.
+* Fixed:  BUILDR-689 - Define assets task before the project is
+          defined to avoid "undefined method `project='" if the
+          project attempts to generate into the same directory.
+* Added:  BUILDR-679 - Support uploading to a snapshot repository
+          defined by repositories.snapshot_to if the artifact is
+          a snapshot. Submitted by Tammo van Lessen.
+* Change: Update the jaxb_xjc addon to add output directory to
+          generated IDEA project files.
+* Change: Update the default output directory used in the jaxb_xjc
+          addon to use Maven conventions.
+* Fixed:  Bug in IdeaProject.partition_dependencies resulted in
+          projects being rebuilt if artifacts were added to the
+          project with dependencies on the current project.
+* Fixed:  BUILDR-605 - Ensure package task invokes included paths.
+* Fixed:  BUILDR-609 - compile.from should accept Task argument.
+
 1.4.14 (2013-10-11)
 * Change: Remove highline dependency.
 * Fixed:  BUILDR-682 - Fix the documentation for releasing using

data/addon/buildr/bnd.rb

@@ -156,4 +156,4 @@ end
 
 class Buildr::Project
   include Buildr::Bnd::ProjectExtension
-end
+end

data/addon/buildr/git_auto_version.rb

@@ -30,4 +30,4 @@ end
 
 class Buildr::Project
   include Buildr::GitAutoVersion::ProjectExtension
-end
+end

data/addon/buildr/gpg.rb

@@ -81,4 +81,4 @@ end
 
 class Buildr::Project
   include Buildr::GPG::ProjectExtension
-end
+end

data/addon/buildr/jaxb_xjc.rb

@@ -47,9 +47,11 @@ module Buildr
       args = args.dup
       files = Array === files ? files.flatten : [files]
 
-      target_dir = options[:directory] || path_to(:target, :generated, :jaxb)
+      target_dir = File.expand_path(options[:directory] || _(:target, :generated, :jaxb, 'main/java'))
       timestamp_file = File.expand_path("#{target_dir}/jaxb-#{options[:id] || 1}.cache")
 
+      project.iml.main_source_directories << target_dir if project.iml?
+
       file(target_dir => timestamp_file)
 
       file(timestamp_file => files.flatten) do |task|
@@ -69,4 +71,4 @@ end
 
 class Buildr::Project
   include Buildr::JaxbXjc
-end
+end

data/addon/buildr/package_as_nsis.rb

@@ -77,4 +77,4 @@ end
 
 class Buildr::Project
   include Buildr::PackageAsNsis
-end
+end

data/addon/buildr/sonar.rb

@@ -139,4 +139,4 @@ end
 
 class Buildr::Project
   include Buildr::Sonar::ProjectExtension
-end
+end

data/addon/buildr/top_level_generate_dir.rb

@@ -34,4 +34,4 @@ end
 
 class Buildr::Project
   include Buildr::TopLevelGenerateDir::ProjectExtension
-end
+end

data/buildr.gemspec

@@ -58,6 +58,8 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'builder',              '3.2.2'
   spec.add_dependency 'net-ssh',              '2.7.0'
   spec.add_dependency 'net-sftp',             '2.1.2'
+  # Required for sftp support under windows
+  spec.add_dependency "jruby-pageant",        '1.1.1' if $platform.to_s == 'java'
   spec.add_dependency 'rubyzip',              '0.9.9'
   spec.add_dependency 'json_pure',            '1.8.0'
   spec.add_dependency 'rubyforge',            '2.0.4'
@@ -78,7 +80,7 @@ for those one-off tasks, with a language that's a joy to use.
 
   # Unable to get this consistently working under jruby on windows
   unless $platform.to_s == 'java'
-    spec.add_development_dependency 'jekyll', '1.2.1'
+    spec.add_development_dependency 'jekyll', '0.11.2'
     spec.add_development_dependency 'RedCloth', '4.2.9'
     spec.add_development_dependency 'jekylltask', '1.1.0'
     spec.add_development_dependency 'rdoc', '4.0.1'

data/doc/download.textile

@@ -20,6 +20,18 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2(#dist).  Binaries and Source Code
 
+h3. buildr 1.4.14 (2013-10-11)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.4.14-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14-java.gem | "f90047a502b964943bda09b0a76b98f2":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14-java.gem.asc |
+| "buildr-1.4.14-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14-x86-mswin32.gem | "f98125eb8edae9ecb720d04d895b113b":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14-x86-mswin32.gem.asc |
+| "buildr-1.4.14.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14.gem | "b797e2a07b7da07a317ea90ec1d7a36c":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.gem.asc |
+| "buildr-1.4.14.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14.tgz | "ddece5f90aef3ccd589eeff81af2a686":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.tgz.asc |
+| "buildr-1.4.14.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.14/buildr-1.4.14.zip | "40c0bffb0b2d3ca1ad43a5e0020e2afb":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.14/buildr-1.4.14.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.14/KEYS)
+
+
 h3. buildr 1.4.13 (2013-10-02)
 
 |_. Package |_. MD5 Checksum |_. PGP |

data/doc/index.textile

@@ -46,6 +46,27 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
+Highlights from Buildr 1.4.15 (2013-11-06)
+* Change: Updated the 'test_jar' package type to have a
+          classifier of 'tests' and thus match maven
+          conventions. Reported by Chris Bozic.
+* Fixed:  BUILDR-689 - Ensure that war file includes generated
+          assets rather than the "source" assets that may have
+          been filtered.
+* Fixed:  BUILDR-689 - Define assets task before the project is
+          defined to avoid "undefined method `project='" if the
+          project attempts to generate into the same directory.
+* Added:  BUILDR-679 - Support uploading to a snapshot repository
+          defined by repositories.snapshot_to if the artifact is
+          a snapshot. Submitted by Tammo van Lessen.
+* Change: Update the default output directory used in the jaxb_xjc
+          addon to use Maven conventions.
+* Fixed:  Bug in IdeaProject.partition_dependencies resulted in
+          projects being rebuilt if artifacts were added to the
+          project with dependencies on the current project.
+* Fixed:  BUILDR-605 - Ensure package task invokes included paths.
+* Fixed:  BUILDR-609 - compile.from should accept Task argument.
+
 Highlights from Buildr 1.4.14 (2013-10-11)
 * Fixed:  Fixed regression in gwt addon.
 * Fixed:  Fixed regression using transitive dependencies due to

data/doc/packaging.textile

@@ -585,6 +585,14 @@ Of course, you'll need to tell Buildr about the release server:
 repositories.release_to = 'sftp://john:secret@release/usr/share/repo'
 {% endhighlight %}
 
+If you have separate repositories for releases and snapshots, you can specify them accordingly. Buildr takes care of picking the correct one.
+
+{% highlight ruby %}
+repositories.release_to = 'sftp://john:secret@release/usr/share/repo/releases'
+repositories.snapshot_to = 'sftp://john:secret@release/usr/share/repo/snapshots'
+{% endhighlight %}
+
+
 This example uses the SFTP protocol.  In addition, you can use the HTTP protocol -- Buildr supports HTTP and HTTPS, Basic Authentication and uploads using PUT -- or point to a directory on your file system.
 
 The URL in this example contains the release server ("release"), path to repository ("user/share/repo") and username/password for access.  The way SFTP works, you specify the path on the release server, and give the user permissions to create directories and files inside the repository.  The file system path is different from the path you use to download these artifacts through an HTTP server, and starts at the root, not the user's home directory.

data/doc/settings_profiles.textile

@@ -58,6 +58,7 @@ repositories.release_to[:username] = ENV['USERNAME']
 repositories.release_to[:password] = ENV['PASSWORD']
 {% endhighlight %}
 
+The same works for the @repositories.snapshot_to@ hash.
 
 h2(#personal). Personal Settings
 

data/lib/buildr/core/application.rb

@@ -668,6 +668,18 @@ module Rake #:nodoc
   end
 end
 
+# Under windows, paths passed to mkpath, mkdir_p and mkdirs need to be normalized.
+# Otherwise ruby may decide to treat the drive component as a directory (i.e.
+# create a directory named "C:"). This patch hooks in at a low level to work around
+# this issue.
+module FileUtils
+  def fu_list(arg) #:nodoc:
+    [arg].flatten.map { |path| Buildr::Util.normalize_path(path) }
+  end
+
+  private_module_function :fu_list
+end
+
 module FileUtils
   def fu_output_message(msg)   #:nodoc:
     if Rake::FileUtilsExt::DEFAULT == RakeFileUtils.verbose_flag

data/lib/buildr/core/assets.rb

@@ -31,7 +31,7 @@ module Buildr #:nodoc:
       def paths
         unless @paths
           @paths = []
-          @paths << project._(:source, :main, :webapp) if File.exist?(project._(:source, :main, :webapp))
+          @paths << project._(:source, :main, :assets) if File.exist?(project._(:source, :main, :assets))
         end
         @paths
       end
@@ -72,21 +72,21 @@ module Buildr #:nodoc:
         Project.local_task("assets")
       end
 
+      before_define do |project|
+        # Force the construction of the assets task
+        project.assets.paths
+      end
+
       # Access the asset task
       def assets
         if @assets.nil?
-          @assets = AssetsTask.define_task(project._(:target, :main, :webapp) => [])
+          @assets = AssetsTask.define_task(project._(:target, :main, :assets) => [])
           @assets.project = self
           project.task('assets').enhance([@assets])
           project.build.enhance([@assets])
         end
         @assets
       end
-
-      after_define do |project|
-        # Force construction
-        project.assets
-      end
     end
   end
 end

data/lib/buildr/core/compile.rb

@@ -92,7 +92,7 @@ module Buildr #:nodoc:
               if (!File.directory?(found)) && found.match(/.*\.#{Array(source_ext).join('|')}/)
                 return true
               end
-              } if File.exist? path
+              } if File.exist? path.to_s
             }
           false
         end

data/lib/buildr/core/console.rb

@@ -194,7 +194,7 @@ module Buildr #nodoc
               require 'Win32/Console/ANSI'
             end
           end
-        rescue Java::JavaLang::IncompatibleClassChangeError
+        rescue
           # Unfortunately we have multiple incompatible jline libraries
           # in the classpath. This is probably because we are using jruby
           # 1.7.5 with a library like scala and both use incompatible jline

data/lib/buildr/core/progressbar.rb

@@ -158,4 +158,4 @@ protected
     @total == 0 ? ['%s %8s %s', :title, :count, :elapsed] : ['%s: %s |--| %8s/%s %s', :title, :percentage, :count, :total, :time]
   end
 
-end
+end

data/lib/buildr/core/util.rb

@@ -27,7 +27,7 @@ module Buildr #:nodoc:
     #
     # Gem.win_platform? only checks these RUBY_PLATFORM global,
     # that in some cases like when running on JRuby is not
-    # succifient for our purpose:
+    # sufficient for our purpose:
     #
     # For JRuby, the value for RUBY_PLATFORM will always be 'java'
     # That's why this function checks on Config::CONFIG['host_os']

data/lib/buildr/ide/idea.rb

@@ -299,6 +299,7 @@ module Buildr #:nodoc:
       def add_web_facet(options = {})
         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] = "/" }
         webroots = options[:webroots] || default_webroots
         default_deployment_descriptors = []
@@ -647,12 +648,19 @@ module Buildr #:nodoc:
 
       def add_configuration(name, type, factory_name, default = false)
         add_to_composite_component(self.configurations) do |xml|
-          xml.configuration(:name => name, :type => type, :factoryName => factory_name, :default => default) do |xml|
+          options = {:type => type, :factoryName => factory_name}
+          options[:name] = name unless default
+          options[:default] = true if default
+          xml.configuration(options) do |xml|
             yield xml if block_given?
           end
         end
       end
 
+      def add_default_configuration(type, factory_name)
+        add_configuration(nil, type, factory_name)
+      end
+
       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]}"
@@ -1013,7 +1021,7 @@ module Buildr #:nodoc:
         dependencies.each do |dependency|
           artifacts = Buildr.artifacts(dependency)
           artifacts_as_strings = artifacts.map(&:to_s)
-          all_projects = Buildr::Project.instance_variable_get("@projects").keys - [buildr_project.name]
+          all_projects = Buildr::Project.instance_variable_get("@projects").keys
           project = Buildr.projects(all_projects).detect do |project|
             [project.packages, project.compile.target, project.resources.target, project.test.compile.target, project.test.resources.target].flatten.
               detect { |component| artifacts_as_strings.include?(component.to_s) }

data/lib/buildr/java/ecj.rb

@@ -66,4 +66,4 @@ end
 
 Java.classpath << "org.eclipse.jdt.core.compiler:ecj:jar:3.5.1"
 # Adding ecj before javac
-Buildr::Compiler.compilers.unshift Buildr::Compiler::Ecj
+Buildr::Compiler.compilers.unshift Buildr::Compiler::Ecj

data/lib/buildr/java/external.rb

@@ -70,4 +70,4 @@ module Buildr #:nodoc:
   end
 end
 
-Buildr::Compiler.compilers << Buildr::Compiler::ExternalJavac
+Buildr::Compiler.compilers << Buildr::Compiler::ExternalJavac

data/lib/buildr/java/packaging.rb

@@ -684,13 +684,10 @@ module Buildr #:nodoc:
           # Add libraries in WEB-INF lib, and classes in WEB-INF classes
           war.with :classes=>[compile.target, resources.target].compact
           war.with :libs=>compile.dependencies
-          # Add included files, or the webapp directory.
-          assets.paths.each do |asset|
-            war.tap do |war|
-              war.enhance([asset])
-            end
-            war.include asset, :as => '.'
-          end
+          webapp = path_to(:source, :main, :webapp)
+          war.with webapp if File.exist?(webapp)
+          war.enhance([assets])
+          war.include assets.to_s, :as => '.' unless assets.paths.empty?
         end
       end
 

data/lib/buildr/java/tests.rb

@@ -296,7 +296,7 @@ module Buildr #:nodoc:
   # * :args -- Arguments passed to the TestNG command line runner.
   class TestNG < TestFramework::Java
 
-    VERSION = '6.8.5'
+    VERSION = '6.8.7'
 
     class << self
       def version

data/lib/buildr/packaging/archive.rb

@@ -62,7 +62,7 @@ module Buildr #:nodoc:
       #   include(:from=>path) => self
       #   include(*files, :merge=>true) => self
       def include(*args)
-        options = args.pop if Hash === args.last
+        options = Hash === args.last ? args.pop : nil
         files = to_artifacts(args)
         raise 'AchiveTask.include() values should not include nil' if files.include? nil
 
@@ -207,6 +207,7 @@ module Buildr #:nodoc:
         @sources << proc { source }
         @actions << proc do |file_map|
           file = source.to_s
+          file(file).invoke
           unless excluded?(file)
             if File.directory?(file)
               in_directory file do |file, rel_path|

data/lib/buildr/packaging/artifact.rb

@@ -179,7 +179,8 @@ module Buildr #:nodoc:
     #
     # Uploads the artifact, its POM and digital signatures to remote server.
     #
-    # In the first form, uses the upload options specified by repositories.release_to.
+    # In the first form, uses the upload options specified by repositories.release_to
+    # or repositories.snapshot_to if the subject is a snapshot artifact.
     # In the second form, uses a URL that includes all the relevant information.
     # In the third form, uses a hash with the options :url, :username, :password,
     # and :permissions. All but :url are optional.
@@ -188,6 +189,7 @@ module Buildr #:nodoc:
     end
 
     def upload_task(upload_to = nil)
+      upload_to ||= Buildr.repositories.snapshot_to if snapshot? && Buildr.repositories.snapshot_to != nil && Buildr.repositories.snapshot_to[:url] != nil
       upload_to ||= Buildr.repositories.release_to
       upload_to = { :url=>upload_to } unless Hash === upload_to
       raise ArgumentError, 'Don\'t know where to upload, perhaps you forgot to set repositories.release_to' unless upload_to[:url]
@@ -715,6 +717,54 @@ module Buildr #:nodoc:
       @release_to
     end
 
+    # :call-seq:
+    #   snapshot_to = url
+    #   snapshot_to = hash
+    #
+    # Specifies the release server. Accepts a Hash with different repository settings
+    # (e.g. url, username, password), or a String to only set the repository URL.
+    #
+    # Besides the URL, all other settings depend on the transport protocol in use.
+    #
+    # For example:
+    #   repositories.snapshot_to = 'sftp://john:secret@example.com/var/www/repo/'
+    #
+    #   repositories.snapshot_to = { :url=>'sftp://example.com/var/www/repo/',
+    #                                :username='john', :password=>'secret' }
+    # Or in the settings.yaml file:
+    #   repositories:
+    #     snapshot_to: sftp://john:secret@example.com/var/www/repo/
+    #
+    #   repositories:
+    #     snapshot_to:
+    #       url: sftp://example.com/var/www/repo/
+    #       username: john
+    #       password: secret
+    def snapshot_to=(options)
+      options = { :url=>options } unless Hash === options
+      @snapshot_to = options
+    end
+
+    # :call-seq:
+    #   snapshot_to => hash
+    #
+    # Returns the current snapshot release server setting as a Hash. This is a more convenient way to
+    # configure the settings, as it allows you to specify the settings progressively.
+    #
+    # For example, the Buildfile will contain the repository URL used by all developers:
+    #   repositories.snapshot_to[:url] ||= 'sftp://example.com/var/www/repo'
+    # Your private buildr.rb will contain your credentials:
+    #   repositories.snapshot_to[:username] = 'john'
+    #   repositories.snapshot_to[:password] = 'secret'
+    def snapshot_to
+      unless @snapshot_to
+        value = (Buildr.settings.user['repositories'] && Buildr.settings.user['repositories']['snapshot_to']) \
+          || (Buildr.settings.build['repositories'] && Buildr.settings.build['repositories']['snapshot_to'])
+        @snapshot_to = Hash === value ? value.inject({}) { |hash, (key, value)| hash.update(key.to_sym=>value) } : { :url=>Array(value).first }
+      end
+      @snapshot_to
+    end
+
   end
 
   # :call-seq: