buildr 1.4.24 → 1.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf20984ae2dd15bd6458177ddf5269371c4d98f0
-  data.tar.gz: 4ff180d97b201efecd5fc628bccb64fb424b46aa
+  metadata.gz: 43b43e223f9b6d6c3a7864bc6b8f09e9062f485d
+  data.tar.gz: d32547db15caf2e9443698e989b1db7f48d4943d
 SHA512:
-  metadata.gz: c90ff97b512210d6c052a75c494ec48f75262f7fd115949a6fe7623e2c727bdb092126419f1e20e23d6a294208a12c514bc9544e6f683bdb352b62e4d7b1e133
-  data.tar.gz: 6d78972103b067e2c75975a450c4b844bab23102303a2aa7f0d5cf4c756f20d1da87674e504a618e2d2e15a55edcdf8b22b38316b86387bdf6b519ae62859d3e
+  metadata.gz: c0ae91aa8456425ca3e7bd8bdd271532ed2ecdfed0239cfddf33aa87d6c4193830906ca5b98b571f2062dd80b40aae388cd3a877187af3e08122c7c2e4f7f0f3
+  data.tar.gz: 7372d7a16a19a7058c59f0bc147b4493d5f3a12c061d6132c976be3f08aa094c2d99a104940f814dd785be5c0449327a1509dba8c17218bcb72c51f3b1ab8720

data/CHANGELOG

@@ -1,3 +1,9 @@
+1.4.25 (2016-04-18)
+* Change: BUILDR-712 Update jruby-openssl dependency version or support a range of versions
+* Change: Update gwt addon to add the GWT artifacts to project dependencies as specs rather
+          than files.
+* Change: Support the project.root_project utility method to retrieve the top level project.
+
 1.4.24 (2016-03-19)
 * Added:  Support the :no_invoke parameter being passed to Buildr.project() and
           Buildr.projects() to avoid attempting to call invoke when retrieving the projects.

data/addon/buildr/gwt.rb

@@ -136,8 +136,8 @@ module Buildr
         Buildr::GWT.dependencies(version).each do |d|
           a = artifact(d)
           a.invoke if a.respond_to?(:invoke)
-          project.iml.main_dependencies << a.to_s unless !project.iml? || existing_deps.include?(a.to_s)
-          project.compile.dependencies << a.to_s unless existing_deps.include?(a.to_s)
+          project.iml.main_dependencies << a unless !project.iml? || existing_deps.include?(a.to_s)
+          project.compile.dependencies << a unless existing_deps.include?(a.to_s)
           additional_gwt_deps << a
         end
 

data/buildr.gemspec

@@ -70,7 +70,7 @@ for those one-off tasks, with a language that's a joy to use.
   spec.add_dependency 'diff-lcs',             '1.2.4'
   spec.add_dependency 'xml-simple',           '1.1.2'
   spec.add_dependency 'minitar',              '0.5.4'
-  spec.add_dependency 'jruby-openssl',        '~> 0.8.2' if $platform.to_s == 'java'
+  spec.add_dependency 'jruby-openssl',        '~> 0.9.16' if $platform.to_s == 'java'
   spec.add_dependency 'bundler'
   spec.add_dependency 'orderedhash',          '0.0.6'
   spec.add_dependency 'win32console'          '1.3.2' if $platform.to_s == 'x86-mswin32'

data/doc/download.textile

@@ -18,16 +18,28 @@ The source code is included in both source and binary distribution, the Gem dist
 
 h2(#dist).  Binaries and Source Code
 
+h3. buildr 1.4.24 (2016-03-19)
+
+|_. Package |_. MD5 Checksum |_. PGP |
+| "buildr-1.4.24-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.24/buildr-1.4.24-java.gem | "9253f047f331e485309916f5863734b2":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24-java.gem.asc |
+| "buildr-1.4.24-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.24/buildr-1.4.24-x86-mswin32.gem | "efac2aff46e1595eb361ef409158a929":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24-x86-mswin32.gem.asc |
+| "buildr-1.4.24.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.24/buildr-1.4.24.gem | "5775fd509990659f98af2cf87a5f9e41":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24.gem.asc |
+| "buildr-1.4.24.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.24/buildr-1.4.24.tgz | "ab2e5cfa34cdb032efc59f73a430b23a":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24.tgz.asc |
+| "buildr-1.4.24.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.24/buildr-1.4.24.zip | "f7f89315d76200d8f72f921346c6e06c":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.24/buildr-1.4.24.zip.asc |
+
+p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.24/KEYS)
+
+
 h3. buildr 1.4.23 (2015-06-12)
 
 |_. Package |_. MD5 Checksum |_. PGP |
-| "buildr-1.4.23-java.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23-java.gem | "e2e437989933c8602ba0b41b9bcc4988":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-java.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-java.gem.asc |
-| "buildr-1.4.23-x86-mswin32.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem | "0977069ebdf6b902b86f9c0a757d70c9":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem.asc |
-| "buildr-1.4.23.gem":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23.gem | "012cc3319768f8fa37f5743284d5ad31":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.gem.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.gem.asc |
-| "buildr-1.4.23.tgz":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23.tgz | "40acd29febb55bec063ec8a77bf40fc1":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.tgz.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.tgz.asc |
-| "buildr-1.4.23.zip":http://www.apache.org/dyn/closer.cgi/buildr/1.4.23/buildr-1.4.23.zip | "f3ad77a50e4c8c88b91994ff6b703bcd":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.zip.md5 | "Sig":http://www.apache.org/dist/buildr/1.4.23/buildr-1.4.23.zip.asc |
+| "buildr-1.4.23-java.gem":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23-java.gem | "e2e437989933c8602ba0b41b9bcc4988":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23-java.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23-java.gem.asc |
+| "buildr-1.4.23-x86-mswin32.gem":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem | "0977069ebdf6b902b86f9c0a757d70c9":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23-x86-mswin32.gem.asc |
+| "buildr-1.4.23.gem":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23.gem | "012cc3319768f8fa37f5743284d5ad31":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23.gem.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23.gem.asc |
+| "buildr-1.4.23.tgz":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23.tgz | "40acd29febb55bec063ec8a77bf40fc1":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23.tgz.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23.tgz.asc |
+| "buildr-1.4.23.zip":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23.zip | "f3ad77a50e4c8c88b91994ff6b703bcd":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23.zip.md5 | "Sig":http://archive.apache.org/dist/buildr/1.4.23/buildr-1.4.23.zip.asc |
 
-p>. ("Release signing keys":http://www.apache.org/dist/buildr/1.4.23/KEYS)
+p>. ("Release signing keys":http://archive.apache.org/dist/buildr/1.4.23/KEYS)
 
 
 h3. buildr 1.4.22 (2015-02-28)

data/doc/index.textile

@@ -46,6 +46,12 @@ So let's get started.  You can "read the documentation online":quick_start.html,
 
 h2(#news).  What's New
 
+Highlights from Buildr 1.4.25 (2016-04-18)
+* Change: BUILDR-712 Update jruby-openssl dependency version or support a range of versions
+* Change: Update gwt addon to add the GWT artifacts to project dependencies as specs rather
+          than files.
+* Change: Support the project.root_project utility method to retrieve the top level project.
+
 Highlights from Buildr 1.4.24 (2016-03-19)
 * Added:  Support the :no_invoke parameter being passed to Buildr.project() and
           Buildr.projects() to avoid attempting to call invoke when retrieving the projects.

data/lib/buildr/core/project.rb

@@ -412,6 +412,20 @@ module Buildr #:nodoc:
       @callbacks = Project.global_callbacks.dup
     end
 
+    #
+    # Returns the root project for this project.
+    #
+    # If this project is a subproject it will find the top
+    # level project and return it, else it will return itself.
+    #
+    def root_project
+      p = project
+      while p.parent
+        p = p.parent
+      end
+      p
+    end
+
     # :call-seq:
     #   base_dir => path
     #

data/lib/buildr/ide/idea.rb

@@ -370,7 +370,7 @@ module Buildr #:nodoc:
           end
           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 root_project.ipr? && root_project.ipr.version >= '13'
+          enable_jsf = false if buildr_project.root_project.ipr? && buildr_project.root_project.ipr.version >= '13'
           f.facet(:type => 'jsf', :name => 'JSF') do |jsf|
             jsf.configuration
           end if enable_jsf
@@ -477,14 +477,6 @@ module Buildr #:nodoc:
 
       protected
 
-      def root_project
-        p = buildr_project
-        while p.parent
-          p = p.parent
-        end
-        p
-      end
-
       def main_dependency_details
         target_dir = buildr_project.compile.target.to_s
         main_dependencies.select { |d| d.to_s != target_dir }.collect do |d|

data/lib/buildr/version.rb

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

data/rakelib/release.rake

@@ -13,31 +13,16 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-desc 'Checkout or update dist to local directory'
-task 'setup-local-dist-svn' do
-  if File.exist?('dist')
-    sh 'svn', 'up', 'site'
-    sh 'svn', 'revert', '--recursive', 'dist'
-  else
-    sh 'svn', 'co', 'https://dist.apache.org/repos/dist/release/buildr', 'dist'
-  end
-end
-
-task 'publish-dist-svn' do
-  cd 'dist'
-  sh 'svn', 'add', '--force', '.'
-  cd '..'
-  sh 'svn', 'commit', 'dist', '-m', 'Publish latest release'
-end
-
 desc 'Release the next version of buildr from existing staged repository'
-task 'release' => %w{setup-local-site-svn setup-local-dist-svn} do
+task 'release' do |task, args|
+  user = args.user || ENV['user'] || `whoami`
+  
   # First, we need to get all the staged files from Apache to _release.
   mkpath '_release'
   lambda do
-    url = "people.apache.org:~/public_html/#{spec.name}/#{spec.version}"
+    url = "home.apache.org:~/public_html/#{spec.name}/#{spec.version}"
     puts "Populating _release directory from #{url} ..."
-    sh 'rsync', '--progress', '--recursive', url, '_release'
+    sh "lftp -e \"mirror public_html/#{spec.name}/#{spec.version} _release/#{spec.version}; bye\" -u #{user} sftp://home.apache.org" 
     puts '[X] Staged files are now in _release'
   end.call
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildr
 version: !ruby/object:Gem::Version
-  version: 1.4.24
+  version: 1.4.25
 platform: ruby
 authors:
 - Apache Buildr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake