Merge branch '3.x'

nebhale · nebhale · commit faf033f63364 · 2017-07-04T16:21:17.000+01:00
diff --git a/ci/versions-json.sh b/ci/versions-json.sh
@@ -25,5 +25,5 @@ eval "$(rbenv init -)"
 
 pushd java-buildpack
   bundle install --quiet
-  bundle exec rake versions:pivotal_network
+  bundle exec rake versions:json
 popd
diff --git a/ci/versions-json.yml b/ci/versions-json.yml
@@ -27,4 +27,4 @@ caches:
 - path: gems
 
 run:
-  path: java-buildpack/ci/versions-pivotal-network.sh
+  path: java-buildpack/ci/versions-json.sh
diff --git a/rakelib/versions_task.rb b/rakelib/versions_task.rb
@@ -19,6 +19,7 @@
 require 'java_buildpack/repository/version_resolver'
 require 'java_buildpack/util/configuration_utils'
 require 'java_buildpack/util/cache/download_cache'
+require 'json'
 require 'rake/tasklib'
 require 'rakelib/package'
 require 'terminal-table'
@@ -35,8 +36,8 @@ def initialize
       version_task
 
       namespace 'versions' do
+        version_json_task
         version_markdown_task
-        version_pivotal_network_task
         version_yaml_task
       end
     end
@@ -222,21 +223,24 @@ def version_task
       end
     end
 
-    def version_markdown_task
-      desc 'Display the versions of buildpack dependencies in Markdown form'
-      task markdown: [] do
-        versions['dependencies']
+    def version_json_task
+      desc 'Display the versions of buildpack dependencies in JSON form'
+      task json: [] do
+        puts JSON.pretty_generate(versions['dependencies']
           .sort_by { |dependency| dependency['name'].downcase }
-          .each { |dependency| puts "| #{dependency['name']} | `#{dependency['version']}` |" }
+          .map { |dependency| "#{dependency['name']} #{dependency['version']}" })
       end
     end
 
-    def version_pivotal_network_task
-      desc 'Display the versions of buildpack dependencies in Pivotal Network form'
-      task pivotal_network: [] do
+    def version_markdown_task
+      desc 'Display the versions of buildpack dependencies in Markdown form'
+      task markdown: [] do
+        puts '| Dependency | Version |'
+        puts '| ---------- | ------- |'
+
         versions['dependencies']
           .sort_by { |dependency| dependency['name'].downcase }
-          .each { |dependency| puts "#{dependency['name']} #{dependency['version']}" }
+          .each { |dependency| puts "| #{dependency['name']} | `#{dependency['version']}` |" }
       end
     end
 
