Merge branch 'develop'

CHANGELOG

@@ -1,3 +1,9 @@
+v1.3.1 May 08, 2015
+====================
+
+* Bump buildpack-packager to support custom buildpack manifests.
+  (https://www.pivotaltracker.com/story/show/93717296)
+
 v1.3.0 Apr 22, 2015
 ====================
 

README.md

@@ -56,7 +56,7 @@ The buildpack only supports the two most stable patches for each dependency in t
 
 ### Deprecated Versions
 
-If you would like to build the buildpack with previously supported dependency versions, you can update `manifest.yml` with entries from `.deprecated.manifest.yml`, and re-build.
+If you would like to build the buildpack with previously supported dependency versions, provide the `--use-custom-manifest=manifest-including-unsupported.yml` option to `buildpack-packager`.
 
 ## Contributing
 

VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

cf.Gemfile

@@ -2,8 +2,8 @@ source "https://rubygems.org"
 
 ruby '2.1.5'
 
-gem 'machete', git: 'https://github.com/cf-buildpacks/machete', tag: 'v0.0.9'
-gem 'buildpack-packager', git: 'https://github.com/cloudfoundry-incubator/buildpack-packager', tag: 'v2.1.2'
+gem 'machete', git: 'https://github.com/cf-buildpacks/machete', tag: 'v0.0.12'
+gem 'buildpack-packager', git: 'https://github.com/cloudfoundry-incubator/buildpack-packager', tag: 'v2.2.0'
 gem 'rspec'
 gem 'rspec-instafail'
 gem 'pry'

cf.Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: https://github.com/cf-buildpacks/machete
-  revision: 1e587171dcd88c20f0ed670e341f1b1609db6673
-  tag: v0.0.9
+  revision: c9225f3b7b6b8eb9be787e67e1133bb950a3fb76
+  tag: v0.0.12
   specs:
-    machete (0.0.9)
+    machete (0.0.10)
       httparty
 
 GIT
   remote: https://github.com/cloudfoundry-incubator/buildpack-packager
-  revision: 501f8de837ce3ee1b5f005cc24d6469cde05eedf
-  tag: v2.1.2
+  revision: d255bd6bc4ae2bbf5e49630479b0f06709647f30
+  tag: v2.2.0
   specs:
     buildpack-packager (0.0.1)
       activesupport (~> 4.1.8)
@@ -34,7 +34,7 @@ GEM
     json (1.8.2)
     kwalify (0.7.2)
     method_source (0.8.2)
-    minitest (5.6.0)
+    minitest (5.6.1)
     multi_xml (0.5.5)
     pry (0.10.1)
       coderay (~> 1.1.0)

.deprecated.manifest.yml → manifest-including-unsupported.yml

@@ -7,6 +7,13 @@ url_to_dependency_map:
     version: $1
 
 dependencies:
+  - name: go
+    version: 1.1
+    uri: http://go.googlecode.com/files/go1.1.linux-amd64.tar.gz
+    md5: f55f28330ae5fb07df0ae31fbab713e6
+    cf_stacks:
+      - lucid64
+      - cflinuxfs2
   - name: go
     version: 1.1.1
     uri: http://go.googlecode.com/files/go1.1.1.linux-amd64.tar.gz
@@ -22,9 +29,9 @@ dependencies:
       - lucid64
       - cflinuxfs2
   - name: go
-    version: 1.1
-    uri: http://go.googlecode.com/files/go1.1.linux-amd64.tar.gz
-    md5: f55f28330ae5fb07df0ae31fbab713e6
+    version: 1.2
+    uri: http://go.googlecode.com/files/go1.2.linux-amd64.tar.gz
+    md5: 68901bbf8a04e71e0b30aa19c3946b21
     cf_stacks:
       - lucid64
       - cflinuxfs2
@@ -35,13 +42,6 @@ dependencies:
     cf_stacks:
       - lucid64
       - cflinuxfs2
-  - name: go
-    version: 1.2
-    uri: http://go.googlecode.com/files/go1.2.linux-amd64.tar.gz
-    md5: 68901bbf8a04e71e0b30aa19c3946b21
-    cf_stacks:
-      - lucid64
-      - cflinuxfs2
   - name: go
     version: 1.2.2
     uri: https://storage.googleapis.com/golang/go1.2.2.linux-amd64.tar.gz