From 8ef0a623b82351593b1a1bd80ae4135268924d8b Mon Sep 17 00:00:00 2001
From: Sambhav Kothari <skothari44@bloomberg.net>
Date: Thu, 1 Apr 2021 13:03:15 +0100
Subject: [PATCH 01/53] Add builder to the project descriptor specification

Signed-off-by: Sambhav Kothari <skothari44@bloomberg.net>
---
 extensions/project-descriptor.md | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 83531a7c..6d5e9fe4 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -9,10 +9,11 @@ A project descriptor is a file that MAY contain configuration for apps, services
   - [Table of Contents](#table-of-contents)
   - [Schema](#schema)
   - [`[project]`](#project)
-  - [`[[project.licenses]]`](#projectlicenses)
-  - [`[build.include]` and `[build.exclude]`](#buildinclude-and-buildexclude)
-  - [`[[build.buildpacks]]`](#buildbuildpacks)
-  - [`[[build.env]]`](#buildenv)
+    - [`[[project.licenses]]`](#projectlicenses)
+  - [`[build]`](#build)
+    - [`[build.include]` and `[build.exclude]`](#buildinclude-and-buildexclude)
+    - [`[[build.buildpacks]]`](#buildbuildpacks)
+    - [`[[build.env]]`](#buildenv)
   - [`[metadata]`](#metadata)
   - [Example](#example)
 
@@ -34,6 +35,7 @@ type = "<string>"
 uri = "<uri>"
 
 [build]
+builder = "<string>"
 include = ["<string>"]
 exclude = ["<string>"]
 [[build.buildpacks]]
@@ -69,16 +71,22 @@ version = "<string>"
 * `documentation-url` - (optional) a URL to the documentation for the project
 * `source-url` - (optional) a URL to the source code for the project
 
-## `[[project.licenses]]`
+### `[[project.licenses]]`
 
 An optional list of project licenses.
 
 * `type` - This MAY use the [SPDX 2.1 license expression](https://spdx.org/spdx-specification-21-web-version), but is not limited to identifiers in the [SPDX Licenses List](https://spdx.org/licenses/).
 * `uri` - If this project is using a nonstandard license, then this key MAY be specified in lieu of or in addition to `type` to point to the license.
 
-## `[build.include]` and `[build.exclude]`
+## `[build]`
 
-A optional list of files to include in the build (while excluding everything else):
+The top-level `[build]` table MAY contain configuration about how to build the project. It MAY include the following keys and others defined below in their individual sub-sections - 
+
+* `builder` - (optional) the builder image to use (ex. "cnbs/sample-builder:bionic")
+
+### `[build.include]` and `[build.exclude]`
+
+An optional list of files to include in the build (while excluding everything else):
 
 ```toml
 [build]
@@ -101,11 +109,11 @@ exclude = [
 
 The `.gitignore` pattern is used in both cases. The `exclude` and `include` keys are mutually exclusive, and if both are present the Lifecycle will error out.
 
-Any files that are excluded (either via `include` or `exclude`) MUST BE excluded before the build (i.e. not only exluded from the final image).
+Any files that are excluded (either via `include` or `exclude`) MUST BE excluded before the build (i.e. not only excluded from the final image).
 
 If both `exclude` and `include` are defined, the build process MUST result in an error.
 
-## `[[build.buildpacks]]`
+### `[[build.buildpacks]]`
 
 The build table MAY contain an array of buildpacks. The schema for this table is:
 
@@ -120,7 +128,7 @@ This defines the buildpacks that a platform should use on the repo.
 
 Either an `id` or a `uri` MUST be included, but MUST NOT include both. If `uri` is provided, `version` MUST NOT be allowed.
 
-## `[[build.env]]`
+### `[[build.env]]`
 
 Used to set environment variables at build time, for example:
 
@@ -147,6 +155,7 @@ id = "io.buildpacks.my-app"
 version = "0.1"
 
 [build]
+builder = "cnbs/sample-builder:bionic"
 include = [
     "cmd/",
     "go.mod",

From 4fd34a17e1e7838a565c2514e1a5e4e2fbfb5d55 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Mon, 26 Apr 2021 15:37:02 -0700
Subject: [PATCH 02/53] add Project Descriptor Reverse Domain RFC

Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 136 +++++++++++++++++++------------
 1 file changed, 83 insertions(+), 53 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 6d5e9fe4..e2b2fcff 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -8,21 +8,29 @@ A project descriptor is a file that MAY contain configuration for apps, services
 - [Project Descriptor](#project-descriptor)
   - [Table of Contents](#table-of-contents)
   - [Schema](#schema)
-  - [`[project]`](#project)
-    - [`[[project.licenses]]`](#projectlicenses)
-  - [`[build]`](#build)
+    - [`[_]`](#_)
+      - [`[_]`](#_-1)
+      - [`[[_.licenses]]`](#_licenses)
+      - [`[_.metadata]`](#_metadata)
+    - [Non-`[_]` Tables](#non-_-tables)
+    - [`[io.buildpacks]`](#iobuildpacks)
+      - [`[io.buildpacks.build.include]` and `[io.buildpacks.build.exclude]`](#iobuildpacksbuildinclude-and-iobuildpacksbuildexclude)
     - [`[build.include]` and `[build.exclude]`](#buildinclude-and-buildexclude)
-    - [`[[build.buildpacks]]`](#buildbuildpacks)
-    - [`[[build.env]]`](#buildenv)
-  - [`[metadata]`](#metadata)
+      - [`[[io.buildpacks.build.buildpacks]]`](#iobuildpacksbuildbuildpacks)
+      - [`[[io.buildpacks.build.env]]`](#iobuildpacksbuildenv)
   - [Example](#example)
 
 ## Schema
 
-The TOML schema of the project descriptor is the following:
+### `[_]`
+
+API Version: `0.2`
+
+The TOML schema of the project section of the project descriptor:
 
 ```toml
-[project]
+[_]
+api = "<string>"
 id = "<string>" # machine readable
 name = "<string>" # human readable
 version = "<string>"
@@ -30,40 +38,32 @@ authors = ["<string>"]
 documentation-url = "<url>"
 source-url = "<url>"
 
-[[project.licenses]]
+[[_.licenses]]
 type = "<string>"
 uri = "<uri>"
 
-[build]
-builder = "<string>"
-include = ["<string>"]
-exclude = ["<string>"]
-[[build.buildpacks]]
-id = "<string>"
-version = "<string>"
-uri = "<string>"
-[[build.env]]
-name = "<string>"
-value = "<string>"
-[metadata]
+[_.metadata]
 # additional arbitrary keys allowed
 ```
 
 The following sections describe each part of the schema in detail.
 
-## `[project]`
-
-The top-level `[project]` table MAY contain configuration about the repository, including `id` and `version`. It MAY also include metadata about how it is authored, documented, and version controlled.
+#### `[_]`
 
-The `project.id`
+The top-level `_` table MAY contain configuration about the repository, including `id` and `version`. It MAY also include metadata about how it is authored, documented, and version controlled. It MUST contain `api`  to denote which version of this API the descriptor is using.
 
 ```toml
-[project]
+[_]
+api = "<string>"
 id = "<string>"
 name = "<string>"
 version = "<string>"
+authors = ["<string>"]
+documentation-url = "<url>"
+source-url = "<url>"
 ```
 
+* `api` - version identifier for the schema of the `_` table and structure of the project descriptor file. This version format follows the rules of the [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
 * `id` - (optional) the machine readable identifier of the project (ex. "com.example.myservice")
 * `name` - (optional) the human readable name of the project (ex. "My Example Service")
 * `version` - (optional) and arbitrary string representing the version of the project
@@ -71,14 +71,53 @@ version = "<string>"
 * `documentation-url` - (optional) a URL to the documentation for the project
 * `source-url` - (optional) a URL to the source code for the project
 
-### `[[project.licenses]]`
+#### `[[_.licenses]]`
 
 An optional list of project licenses.
 
 * `type` - This MAY use the [SPDX 2.1 license expression](https://spdx.org/spdx-specification-21-web-version), but is not limited to identifiers in the [SPDX Licenses List](https://spdx.org/licenses/).
 * `uri` - If this project is using a nonstandard license, then this key MAY be specified in lieu of or in addition to `type` to point to the license.
 
-## `[build]`
+
+#### `[_.metadata]`
+
+Keys in this table are not validated and can be used by users.
+
+```toml
+[_.metadata.foo]
+checksum = "a28a0d7772df1f918da2b1102da4ff35"
+```
+
+### Non-`[_]` Tables
+All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `api` field.
+
+### `[io.buildpacks]`
+
+API Version: `0.1`
+
+This is the Cloud Native Buildpacks' section of the project descriptor. It contains a different API version from [`_`](#_). The TOML schema is the following:
+
+```
+[io.buildpacks]
+api = "<string>"
+
+[io.buildpacks.build]
+include = ["<string>"]
+exclude = ["<string>"]
+
+[[io.buildpacks.build.buildpacks]]
+id = "<string>"
+version = "<string>"
+uri = "<string>"
+
+[[io.buildpacks.build.env]]
+name = "<string>"
+value = "<string>"
+```
+
+* `api` - version identifier for the schema of the `io.buildpacks` table.
+
+#### `[io.buildpacks.build.include]` and `[io.buildpacks.build.exclude]`
 
 The top-level `[build]` table MAY contain configuration about how to build the project. It MAY include the following keys and others defined below in their individual sub-sections - 
 
@@ -89,7 +128,7 @@ The top-level `[build]` table MAY contain configuration about how to build the p
 An optional list of files to include in the build (while excluding everything else):
 
 ```toml
-[build]
+[io.buildpacks.build]
 include = [
     "cmd/",
     "go.mod",
@@ -101,7 +140,7 @@ include = [
 A list of files to exclude from the build (while including everything else):
 
 ```toml
-[build]
+[io.buildpacks.build]
 exclude = [
     "spec/"
 ]
@@ -113,12 +152,12 @@ Any files that are excluded (either via `include` or `exclude`) MUST BE excluded
 
 If both `exclude` and `include` are defined, the build process MUST result in an error.
 
-### `[[build.buildpacks]]`
+#### `[[io.buildpacks.build.buildpacks]]`
 
 The build table MAY contain an array of buildpacks. The schema for this table is:
 
 ```toml
-[[build.buildpacks]]
+[[io.buildpacks.build.buildpacks]]
 id = "<buildpack ID (optional)>"
 version = "<buildpack version (optional default=latest)>"
 uri = "<url or path to the buildpack (optional default=urn:buildpack:<id>)"
@@ -128,29 +167,20 @@ This defines the buildpacks that a platform should use on the repo.
 
 Either an `id` or a `uri` MUST be included, but MUST NOT include both. If `uri` is provided, `version` MUST NOT be allowed.
 
-### `[[build.env]]`
+#### `[[io.buildpacks.build.env]]`
 
 Used to set environment variables at build time, for example:
 
 ```toml
-[[build.env]]
+[[io.buildpacks.build.env]]
 name = "JAVA_OPTS"
 value = "-Xmx1g"
 ```
 
-## `[metadata]`
-
-This table includes a some defined keys, but additional keys are not validated. It can be used to add platform specific metadata. For example:
-
-```toml
-[metadata.heroku]
-pipeline = "foobar"
-```
-
 ## Example
 
 ```toml
-[project]
+[_]
 id = "io.buildpacks.my-app"
 version = "0.1"
 
@@ -163,17 +193,17 @@ include = [
     "*.go"
 ]
 
-[[build.buildpacks]]
+[_.metadata]
+foo = "bar"
+
+[_.metadata.fizz]
+buzz = ["a", "b", "c"]
+
+[[io.buildpacks.build.buildpacks]]
 id = "io.buildpacks/java"
 version = "1.0"
 
-[[build.buildpacks]]
+[[io.buildpacks.build.buildpacks]]
 id = "io.buildpacks/nodejs"
 version = "1.0"
-
-[metadata]
-foo = "bar"
-
-[metadata.fizz]
-buzz = ["a", "b", "c"]
-```
+```
\ No newline at end of file

From 89f25a447d5623d1b8804164e50234cad6b7d84c Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 5 May 2021 12:04:58 -0500
Subject: [PATCH 03/53] update with feedback from @ekcasey

Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 96 ++++++++++++++++++--------------
 1 file changed, 53 insertions(+), 43 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index e2b2fcff..6051a6db 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -7,36 +7,46 @@ A project descriptor is a file that MAY contain configuration for apps, services
 <!-- Using https://github.com/yzhang-gh/vscode-markdown to manage toc -->
 - [Project Descriptor](#project-descriptor)
   - [Table of Contents](#table-of-contents)
-  - [Schema](#schema)
-    - [`[_]`](#_)
-      - [`[_]`](#_-1)
-      - [`[[_.licenses]]`](#_licenses)
-      - [`[_.metadata]`](#_metadata)
-    - [Non-`[_]` Tables](#non-_-tables)
-    - [`[io.buildpacks]`](#iobuildpacks)
-      - [`[io.buildpacks.build.include]` and `[io.buildpacks.build.exclude]`](#iobuildpacksbuildinclude-and-iobuildpacksbuildexclude)
+  - [API Version](#api-version)
+  - [Special Value Types](#special-value-types)
+  - [Top Level Tables](#top-level-tables)
+    - [`_`](#_)
+      - [`_.licenses`](#_licenses)
+      - [`_.metadata`](#_metadata)
+    - [Non-`_` Tables](#non-_-tables)
+    - [`io.buildpacks`](#iobuildpacks)
+      - [`io.buildpacks.build.include` and `io.buildpacks.build.exclude`](#iobuildpacksbuildinclude-and-iobuildpacksbuildexclude)
     - [`[build.include]` and `[build.exclude]`](#buildinclude-and-buildexclude)
-      - [`[[io.buildpacks.build.buildpacks]]`](#iobuildpacksbuildbuildpacks)
-      - [`[[io.buildpacks.build.env]]`](#iobuildpacksbuildenv)
+      - [`io.buildpacks.build.buildpacks`](#iobuildpacksbuildbuildpacks)
+      - [`io.buildpacks.build.env`](#iobuildpacksbuildenv)
   - [Example](#example)
 
-## Schema
+## API Version
 
-### `[_]`
+This document specifies Project Descriptor API Version `0.2`.
 
-API Version: `0.2`
+The API version format follows the form of [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
+
+## Special Value Types
+
+* `api` - A string that follows the formot of [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
+* `uri` - A string that follows the format of [RFC3986](https://tools.ietf.org/html/rfc3986).
+
+## Top Level Tables
+
+### `_`
 
 The TOML schema of the project section of the project descriptor:
 
 ```toml
 [_]
-api = "<string>"
+api = "<api>"
 id = "<string>" # machine readable
 name = "<string>" # human readable
 version = "<string>"
 authors = ["<string>"]
-documentation-url = "<url>"
-source-url = "<url>"
+documentation-url = "<uri>"
+source-url = "<uri>"
 
 [[_.licenses]]
 type = "<string>"
@@ -46,10 +56,6 @@ uri = "<uri>"
 # additional arbitrary keys allowed
 ```
 
-The following sections describe each part of the schema in detail.
-
-#### `[_]`
-
 The top-level `_` table MAY contain configuration about the repository, including `id` and `version`. It MAY also include metadata about how it is authored, documented, and version controlled. It MUST contain `api`  to denote which version of this API the descriptor is using.
 
 ```toml
@@ -59,8 +65,8 @@ id = "<string>"
 name = "<string>"
 version = "<string>"
 authors = ["<string>"]
-documentation-url = "<url>"
-source-url = "<url>"
+documentation-url = "<uri>"
+source-url = "<uri>"
 ```
 
 * `api` - version identifier for the schema of the `_` table and structure of the project descriptor file. This version format follows the rules of the [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
@@ -68,38 +74,42 @@ source-url = "<url>"
 * `name` - (optional) the human readable name of the project (ex. "My Example Service")
 * `version` - (optional) and arbitrary string representing the version of the project
 * `authors` - (optional) the names and/or email addresses of the project's authors
-* `documentation-url` - (optional) a URL to the documentation for the project
+* `documentation-url` - (optional) a URL to the documentation for the project.
 * `source-url` - (optional) a URL to the source code for the project
 
-#### `[[_.licenses]]`
+#### `_.licenses`
 
 An optional list of project licenses.
 
+```toml
+[[_.licenses]]
+type = "<string>"
+uri = "<uri>"
+```
+
 * `type` - This MAY use the [SPDX 2.1 license expression](https://spdx.org/spdx-specification-21-web-version), but is not limited to identifiers in the [SPDX Licenses List](https://spdx.org/licenses/).
 * `uri` - If this project is using a nonstandard license, then this key MAY be specified in lieu of or in addition to `type` to point to the license.
 
 
-#### `[_.metadata]`
+#### `_.metadata`
 
-Keys in this table are not validated and can be used by users.
+This is an optional free form table for users to use as they see fit. The Keys in this table are not validated.
 
 ```toml
 [_.metadata.foo]
 checksum = "a28a0d7772df1f918da2b1102da4ff35"
 ```
 
-### Non-`[_]` Tables
-All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `api` field.
+### Non-`_` Tables
 
-### `[io.buildpacks]`
+All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `api` field. All these tables are optional.
 
-API Version: `0.1`
+### `io.buildpacks`
 
 This is the Cloud Native Buildpacks' section of the project descriptor. It contains a different API version from [`_`](#_). The TOML schema is the following:
 
 ```
 [io.buildpacks]
-api = "<string>"
 
 [io.buildpacks.build]
 include = ["<string>"]
@@ -117,7 +127,7 @@ value = "<string>"
 
 * `api` - version identifier for the schema of the `io.buildpacks` table.
 
-#### `[io.buildpacks.build.include]` and `[io.buildpacks.build.exclude]`
+#### `io.buildpacks.build.include` and `io.buildpacks.build.exclude`
 
 The top-level `[build]` table MAY contain configuration about how to build the project. It MAY include the following keys and others defined below in their individual sub-sections - 
 
@@ -152,9 +162,9 @@ Any files that are excluded (either via `include` or `exclude`) MUST BE excluded
 
 If both `exclude` and `include` are defined, the build process MUST result in an error.
 
-#### `[[io.buildpacks.build.buildpacks]]`
+#### `io.buildpacks.build.buildpacks`
 
-The build table MAY contain an array of buildpacks. The schema for this table is:
+An optional build table containining an array of buildpacks. The schema for this table is:
 
 ```toml
 [[io.buildpacks.build.buildpacks]]
@@ -167,9 +177,9 @@ This defines the buildpacks that a platform should use on the repo.
 
 Either an `id` or a `uri` MUST be included, but MUST NOT include both. If `uri` is provided, `version` MUST NOT be allowed.
 
-#### `[[io.buildpacks.build.env]]`
+#### `io.buildpacks.build.env`
 
-Used to set environment variables at build time, for example:
+An optional table used to set environment variables at build time, for example:
 
 ```toml
 [[io.buildpacks.build.env]]
@@ -184,7 +194,13 @@ value = "-Xmx1g"
 id = "io.buildpacks.my-app"
 version = "0.1"
 
-[build]
+[_.metadata]
+foo = "bar"
+
+[_.metadata.fizz]
+buzz = ["a", "b", "c"]
+
+[io.buildpacks.build]
 builder = "cnbs/sample-builder:bionic"
 include = [
     "cmd/",
@@ -193,12 +209,6 @@ include = [
     "*.go"
 ]
 
-[_.metadata]
-foo = "bar"
-
-[_.metadata.fizz]
-buzz = ["a", "b", "c"]
-
 [[io.buildpacks.build.buildpacks]]
 id = "io.buildpacks/java"
 version = "1.0"

From ad3d13f3848850bef448a12ede636a756cf81b81 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 5 May 2021 12:25:16 -0500
Subject: [PATCH 04/53] make optional more clear

Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 54 ++++++++++++++++----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 6051a6db..29accb96 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -10,15 +10,15 @@ A project descriptor is a file that MAY contain configuration for apps, services
   - [API Version](#api-version)
   - [Special Value Types](#special-value-types)
   - [Top Level Tables](#top-level-tables)
-    - [`_`](#_)
-      - [`_.licenses`](#_licenses)
-      - [`_.metadata`](#_metadata)
     - [Non-`_` Tables](#non-_-tables)
-    - [`io.buildpacks`](#iobuildpacks)
-      - [`io.buildpacks.build.include` and `io.buildpacks.build.exclude`](#iobuildpacksbuildinclude-and-iobuildpacksbuildexclude)
-    - [`[build.include]` and `[build.exclude]`](#buildinclude-and-buildexclude)
-      - [`io.buildpacks.build.buildpacks`](#iobuildpacksbuildbuildpacks)
-      - [`io.buildpacks.build.env`](#iobuildpacksbuildenv)
+    - [`_`](#_)
+      - [`_.licenses` (optional)](#_licenses-optional)
+      - [`_.metadata` (optional)](#_metadata-optional)
+    - [`io.buildpacks` (optional)](#iobuildpacks-optional)
+      - [`io.buildpacks.build.builder` (optional)](#iobuildpacksbuildbuilder-optional)
+      - [`io.buildpacks.build.include` (optional) and `io.buildpacks.build.exclude` (optional)](#iobuildpacksbuildinclude-optional-and-iobuildpacksbuildexclude-optional)
+      - [`io.buildpacks.build.buildpacks` (optional)](#iobuildpacksbuildbuildpacks-optional)
+      - [`io.buildpacks.build.env` (optional)](#iobuildpacksbuildenv-optional)
   - [Example](#example)
 
 ## API Version
@@ -29,11 +29,15 @@ The API version format follows the form of [Buildpack API Version](https://githu
 
 ## Special Value Types
 
-* `api` - A string that follows the formot of [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
+* `api` - A string that follows the format of [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
 * `uri` - A string that follows the format of [RFC3986](https://tools.ietf.org/html/rfc3986).
 
 ## Top Level Tables
 
+### Non-`_` Tables
+
+All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `api` field. All these tables are optional.
+
 ### `_`
 
 The TOML schema of the project section of the project descriptor:
@@ -77,9 +81,9 @@ source-url = "<uri>"
 * `documentation-url` - (optional) a URL to the documentation for the project.
 * `source-url` - (optional) a URL to the source code for the project
 
-#### `_.licenses`
+#### `_.licenses` (optional)
 
-An optional list of project licenses.
+This table MAY contain project licenses.
 
 ```toml
 [[_.licenses]]
@@ -90,21 +94,17 @@ uri = "<uri>"
 * `type` - This MAY use the [SPDX 2.1 license expression](https://spdx.org/spdx-specification-21-web-version), but is not limited to identifiers in the [SPDX Licenses List](https://spdx.org/licenses/).
 * `uri` - If this project is using a nonstandard license, then this key MAY be specified in lieu of or in addition to `type` to point to the license.
 
+#### `_.metadata` (optional)
 
-#### `_.metadata`
-
-This is an optional free form table for users to use as they see fit. The Keys in this table are not validated.
+This is a free form table for users to use as they see fit. The keys in this table are not validated.
 
 ```toml
 [_.metadata.foo]
 checksum = "a28a0d7772df1f918da2b1102da4ff35"
 ```
 
-### Non-`_` Tables
 
-All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `api` field. All these tables are optional.
-
-### `io.buildpacks`
+### `io.buildpacks` (optional)
 
 This is the Cloud Native Buildpacks' section of the project descriptor. It contains a different API version from [`_`](#_). The TOML schema is the following:
 
@@ -112,6 +112,7 @@ This is the Cloud Native Buildpacks' section of the project descriptor. It conta
 [io.buildpacks]
 
 [io.buildpacks.build]
+builder = "<string>"
 include = ["<string>"]
 exclude = ["<string>"]
 
@@ -127,15 +128,14 @@ value = "<string>"
 
 * `api` - version identifier for the schema of the `io.buildpacks` table.
 
-#### `io.buildpacks.build.include` and `io.buildpacks.build.exclude`
-
-The top-level `[build]` table MAY contain configuration about how to build the project. It MAY include the following keys and others defined below in their individual sub-sections - 
+#### `io.buildpacks.build.builder` (optional)
 
-* `builder` - (optional) the builder image to use (ex. "cnbs/sample-builder:bionic")
+This is the builder image to use (ex. "cnbs/sample-builder:bionic").
 
-### `[build.include]` and `[build.exclude]`
+#### `io.buildpacks.build.include` (optional) and `io.buildpacks.build.exclude` (optional)
 
 An optional list of files to include in the build (while excluding everything else):
+This MAY contain a list of files to include in the build (while excluding everything else):
 
 ```toml
 [io.buildpacks.build]
@@ -162,9 +162,9 @@ Any files that are excluded (either via `include` or `exclude`) MUST BE excluded
 
 If both `exclude` and `include` are defined, the build process MUST result in an error.
 
-#### `io.buildpacks.build.buildpacks`
+#### `io.buildpacks.build.buildpacks` (optional)
 
-An optional build table containining an array of buildpacks. The schema for this table is:
+This table MAY contain an array of buildpacks. The schema for this table is:
 
 ```toml
 [[io.buildpacks.build.buildpacks]]
@@ -177,9 +177,9 @@ This defines the buildpacks that a platform should use on the repo.
 
 Either an `id` or a `uri` MUST be included, but MUST NOT include both. If `uri` is provided, `version` MUST NOT be allowed.
 
-#### `io.buildpacks.build.env`
+#### `io.buildpacks.build.env` (optional)
 
-An optional table used to set environment variables at build time, for example:
+This table MAY be used to set environment variables at build time, for example:
 
 ```toml
 [[io.buildpacks.build.env]]

From 9f1e939cfed0c64175bdcf782600201d417d7ac0 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Thu, 6 May 2021 12:44:00 -0500
Subject: [PATCH 05/53] change api -> schema_version

Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 29accb96..660a9654 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -7,7 +7,7 @@ A project descriptor is a file that MAY contain configuration for apps, services
 <!-- Using https://github.com/yzhang-gh/vscode-markdown to manage toc -->
 - [Project Descriptor](#project-descriptor)
   - [Table of Contents](#table-of-contents)
-  - [API Version](#api-version)
+  - [Schema Version API Version](#schema-version-api-version)
   - [Special Value Types](#special-value-types)
   - [Top Level Tables](#top-level-tables)
     - [Non-`_` Tables](#non-_-tables)
@@ -21,9 +21,9 @@ A project descriptor is a file that MAY contain configuration for apps, services
       - [`io.buildpacks.build.env` (optional)](#iobuildpacksbuildenv-optional)
   - [Example](#example)
 
-## API Version
+## Schema Version API Version
 
-This document specifies Project Descriptor API Version `0.2`.
+This document specifies Project Descriptor Schema API Version `0.2`.
 
 The API version format follows the form of [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
 
@@ -36,7 +36,7 @@ The API version format follows the form of [Buildpack API Version](https://githu
 
 ### Non-`_` Tables
 
-All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `api` field. All these tables are optional.
+All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `schema_version` field. All these tables are optional.
 
 ### `_`
 
@@ -44,7 +44,7 @@ The TOML schema of the project section of the project descriptor:
 
 ```toml
 [_]
-api = "<api>"
+schema_version = "<api>"
 id = "<string>" # machine readable
 name = "<string>" # human readable
 version = "<string>"
@@ -60,11 +60,11 @@ uri = "<uri>"
 # additional arbitrary keys allowed
 ```
 
-The top-level `_` table MAY contain configuration about the repository, including `id` and `version`. It MAY also include metadata about how it is authored, documented, and version controlled. It MUST contain `api`  to denote which version of this API the descriptor is using.
+The top-level `_` table MAY contain configuration about the repository, including `id` and `version`. It MAY also include metadata about how it is authored, documented, and version controlled. It MUST contain `schema_version`  to denote which version of this API the descriptor is using.
 
 ```toml
 [_]
-api = "<string>"
+schema_version = "<string>"
 id = "<string>"
 name = "<string>"
 version = "<string>"
@@ -73,7 +73,7 @@ documentation-url = "<uri>"
 source-url = "<uri>"
 ```
 
-* `api` - version identifier for the schema of the `_` table and structure of the project descriptor file. This version format follows the rules of the [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
+* `schema_version` - version identifier for the schema of the `_` table and structure of the project descriptor file.
 * `id` - (optional) the machine readable identifier of the project (ex. "com.example.myservice")
 * `name` - (optional) the human readable name of the project (ex. "My Example Service")
 * `version` - (optional) and arbitrary string representing the version of the project
@@ -106,7 +106,7 @@ checksum = "a28a0d7772df1f918da2b1102da4ff35"
 
 ### `io.buildpacks` (optional)
 
-This is the Cloud Native Buildpacks' section of the project descriptor. It contains a different API version from [`_`](#_). The TOML schema is the following:
+This is the Cloud Native Buildpacks' section of the project descriptor. The TOML schema is the following:
 
 ```
 [io.buildpacks]
@@ -126,8 +126,6 @@ name = "<string>"
 value = "<string>"
 ```
 
-* `api` - version identifier for the schema of the `io.buildpacks` table.
-
 #### `io.buildpacks.build.builder` (optional)
 
 This is the builder image to use (ex. "cnbs/sample-builder:bionic").

From 26f59bb4107234021bb4dcd401e7bef7f738aae9 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Thu, 6 May 2021 17:37:10 -0500
Subject: [PATCH 06/53] for consistency use - over _

Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 660a9654..77d7900c 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -36,7 +36,7 @@ The API version format follows the form of [Buildpack API Version](https://githu
 
 ### Non-`_` Tables
 
-All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `schema_version` field. All these tables are optional.
+All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `schema-version` field. All these tables are optional.
 
 ### `_`
 
@@ -44,7 +44,7 @@ The TOML schema of the project section of the project descriptor:
 
 ```toml
 [_]
-schema_version = "<api>"
+schema-version = "<api>"
 id = "<string>" # machine readable
 name = "<string>" # human readable
 version = "<string>"
@@ -60,11 +60,11 @@ uri = "<uri>"
 # additional arbitrary keys allowed
 ```
 
-The top-level `_` table MAY contain configuration about the repository, including `id` and `version`. It MAY also include metadata about how it is authored, documented, and version controlled. It MUST contain `schema_version`  to denote which version of this API the descriptor is using.
+The top-level `_` table MAY contain configuration about the repository, including `id` and `version`. It MAY also include metadata about how it is authored, documented, and version controlled. It MUST contain `schema-version`  to denote which version of this API the descriptor is using.
 
 ```toml
 [_]
-schema_version = "<string>"
+schema-version = "<string>"
 id = "<string>"
 name = "<string>"
 version = "<string>"
@@ -73,7 +73,7 @@ documentation-url = "<uri>"
 source-url = "<uri>"
 ```
 
-* `schema_version` - version identifier for the schema of the `_` table and structure of the project descriptor file.
+* `schema-version` - version identifier for the schema of the `_` table and structure of the project descriptor file.
 * `id` - (optional) the machine readable identifier of the project (ex. "com.example.myservice")
 * `name` - (optional) the human readable name of the project (ex. "My Example Service")
 * `version` - (optional) and arbitrary string representing the version of the project

From 0231e6e22d896070b68082999f544487d0720520 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 12 May 2021 15:49:42 -0500
Subject: [PATCH 07/53] Update extensions/project-descriptor.md

Co-authored-by: Emily Casey <ecasey@vmware.com>
Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 77d7900c..7783f805 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -29,7 +29,7 @@ The API version format follows the form of [Buildpack API Version](https://githu
 
 ## Special Value Types
 
-* `api` - A string that follows the format of [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
+* `schema-version` - A string that follows the format of [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
 * `uri` - A string that follows the format of [RFC3986](https://tools.ietf.org/html/rfc3986).
 
 ## Top Level Tables
@@ -214,4 +214,4 @@ version = "1.0"
 [[io.buildpacks.build.buildpacks]]
 id = "io.buildpacks/nodejs"
 version = "1.0"
-```
\ No newline at end of file
+```

From 2f6e5bce5e5783d6fecffb12748cc603efd29f1f Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 12 May 2021 15:49:53 -0500
Subject: [PATCH 08/53] Update extensions/project-descriptor.md

Co-authored-by: Emily Casey <ecasey@vmware.com>
Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 7783f805..6a687ad1 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -44,7 +44,7 @@ The TOML schema of the project section of the project descriptor:
 
 ```toml
 [_]
-schema-version = "<api>"
+schema-version = "<schema-version>"
 id = "<string>" # machine readable
 name = "<string>" # human readable
 version = "<string>"

From f238e0f14b05c4898f107f982e485f36b4d2dd2e Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 26 May 2021 12:59:00 -0500
Subject: [PATCH 09/53] drop the `build` key per @jkutner's suggestion

Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 34 +++++++++++++++-----------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 6a687ad1..f98b7f8e 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -15,10 +15,10 @@ A project descriptor is a file that MAY contain configuration for apps, services
       - [`_.licenses` (optional)](#_licenses-optional)
       - [`_.metadata` (optional)](#_metadata-optional)
     - [`io.buildpacks` (optional)](#iobuildpacks-optional)
-      - [`io.buildpacks.build.builder` (optional)](#iobuildpacksbuildbuilder-optional)
-      - [`io.buildpacks.build.include` (optional) and `io.buildpacks.build.exclude` (optional)](#iobuildpacksbuildinclude-optional-and-iobuildpacksbuildexclude-optional)
-      - [`io.buildpacks.build.buildpacks` (optional)](#iobuildpacksbuildbuildpacks-optional)
-      - [`io.buildpacks.build.env` (optional)](#iobuildpacksbuildenv-optional)
+      - [`io.buildpacks.builder` (optional)](#iobuildpacksbuilder-optional)
+      - [`io.buildpacks.include` (optional) and `io.buildpacks.exclude` (optional)](#iobuildpacksinclude-optional-and-iobuildpacksexclude-optional)
+      - [`io.buildpacks.group` (optional)](#iobuildpacksgroup-optional)
+      - [`io.buildpacks.env.build` (optional)](#iobuildpacksenvbuild-optional)
   - [Example](#example)
 
 ## Schema Version API Version
@@ -110,13 +110,11 @@ This is the Cloud Native Buildpacks' section of the project descriptor. The TOML
 
 ```
 [io.buildpacks]
-
-[io.buildpacks.build]
 builder = "<string>"
 include = ["<string>"]
 exclude = ["<string>"]
 
-[[io.buildpacks.build.buildpacks]]
+[[io.buildpacks.group]]
 id = "<string>"
 version = "<string>"
 uri = "<string>"
@@ -126,17 +124,17 @@ name = "<string>"
 value = "<string>"
 ```
 
-#### `io.buildpacks.build.builder` (optional)
+#### `io.buildpacks.builder` (optional)
 
 This is the builder image to use (ex. "cnbs/sample-builder:bionic").
 
-#### `io.buildpacks.build.include` (optional) and `io.buildpacks.build.exclude` (optional)
+#### `io.buildpacks.include` (optional) and `io.buildpacks.exclude` (optional)
 
 An optional list of files to include in the build (while excluding everything else):
 This MAY contain a list of files to include in the build (while excluding everything else):
 
 ```toml
-[io.buildpacks.build]
+[io.buildpacks]
 include = [
     "cmd/",
     "go.mod",
@@ -148,7 +146,7 @@ include = [
 A list of files to exclude from the build (while including everything else):
 
 ```toml
-[io.buildpacks.build]
+[io.buildpacks]
 exclude = [
     "spec/"
 ]
@@ -160,12 +158,12 @@ Any files that are excluded (either via `include` or `exclude`) MUST BE excluded
 
 If both `exclude` and `include` are defined, the build process MUST result in an error.
 
-#### `io.buildpacks.build.buildpacks` (optional)
+#### `io.buildpacks.group` (optional)
 
 This table MAY contain an array of buildpacks. The schema for this table is:
 
 ```toml
-[[io.buildpacks.build.buildpacks]]
+[[io.buildpacks.group]]
 id = "<buildpack ID (optional)>"
 version = "<buildpack version (optional default=latest)>"
 uri = "<url or path to the buildpack (optional default=urn:buildpack:<id>)"
@@ -175,12 +173,12 @@ This defines the buildpacks that a platform should use on the repo.
 
 Either an `id` or a `uri` MUST be included, but MUST NOT include both. If `uri` is provided, `version` MUST NOT be allowed.
 
-#### `io.buildpacks.build.env` (optional)
+#### `io.buildpacks.env.build` (optional)
 
 This table MAY be used to set environment variables at build time, for example:
 
 ```toml
-[[io.buildpacks.build.env]]
+[[io.buildpacks.env.build]]
 name = "JAVA_OPTS"
 value = "-Xmx1g"
 ```
@@ -198,7 +196,7 @@ foo = "bar"
 [_.metadata.fizz]
 buzz = ["a", "b", "c"]
 
-[io.buildpacks.build]
+[io.buildpacks]
 builder = "cnbs/sample-builder:bionic"
 include = [
     "cmd/",
@@ -207,11 +205,11 @@ include = [
     "*.go"
 ]
 
-[[io.buildpacks.build.buildpacks]]
+[[io.buildpacks.group]]
 id = "io.buildpacks/java"
 version = "1.0"
 
-[[io.buildpacks.build.buildpacks]]
+[[io.buildpacks.gruop]]
 id = "io.buildpacks/nodejs"
 version = "1.0"
 ```

From 0f6a82b7393c89e883175e7ccbae08c5c7c675a7 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 26 May 2021 20:05:28 -0500
Subject: [PATCH 10/53] copy the API Version rules per @ekcasey's suggestion.

Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index f98b7f8e..42394fb6 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -25,7 +25,10 @@ A project descriptor is a file that MAY contain configuration for apps, services
 
 This document specifies Project Descriptor Schema API Version `0.2`.
 
-The API version format follows the form of [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version).
+The Schema API version format follows the form of the [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version):
+
+* MUST be in form <major>.<minor> or <major>, where <major> is equivalent to <major>.0
+* When <major> is greater than 0 increments to <minor> SHALL exclusively indicate additive changes
 
 ## Special Value Types
 

From f665688f4226ae11a59dd9086215c6748fc99a56 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 26 May 2021 20:08:17 -0500
Subject: [PATCH 11/53] change Schema Version API to just Schema Versian

Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 42394fb6..822aa4ab 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -7,7 +7,7 @@ A project descriptor is a file that MAY contain configuration for apps, services
 <!-- Using https://github.com/yzhang-gh/vscode-markdown to manage toc -->
 - [Project Descriptor](#project-descriptor)
   - [Table of Contents](#table-of-contents)
-  - [Schema Version API Version](#schema-version-api-version)
+  - [Schema Version](#schema-version)
   - [Special Value Types](#special-value-types)
   - [Top Level Tables](#top-level-tables)
     - [Non-`_` Tables](#non-_-tables)
@@ -21,11 +21,11 @@ A project descriptor is a file that MAY contain configuration for apps, services
       - [`io.buildpacks.env.build` (optional)](#iobuildpacksenvbuild-optional)
   - [Example](#example)
 
-## Schema Version API Version
+## Schema Version
 
-This document specifies Project Descriptor Schema API Version `0.2`.
+This document specifies Project Descriptor Schema Version `0.2`.
 
-The Schema API version format follows the form of the [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version):
+The Schema Version format follows the form of the [Buildpack API Version](https://github.com/buildpacks/spec/blob/main/buildpack.md#buildpack-api-version):
 
 * MUST be in form <major>.<minor> or <major>, where <major> is equivalent to <major>.0
 * When <major> is greater than 0 increments to <minor> SHALL exclusively indicate additive changes
@@ -39,7 +39,7 @@ The Schema API version format follows the form of the [Buildpack API Version](ht
 
 ### Non-`_` Tables
 
-All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version API number using the `schema-version` field. All these tables are optional.
+All other tables besides `_` will use reverse domains, i.e. buildpacks.io will be `[io.buildpacks]`. These tables can be optionally versioned with a schema version number using the `schema-version` field. All these tables are optional.
 
 ### `_`
 
@@ -63,7 +63,7 @@ uri = "<uri>"
 # additional arbitrary keys allowed
 ```
 
-The top-level `_` table MAY contain configuration about the repository, including `id` and `version`. It MAY also include metadata about how it is authored, documented, and version controlled. It MUST contain `schema-version`  to denote which version of this API the descriptor is using.
+The top-level `_` table MAY contain configuration about the repository, including `id` and `version`. It MAY also include metadata about how it is authored, documented, and version controlled. It MUST contain `schema-version`  to denote which schema version the descriptor is using.
 
 ```toml
 [_]

From 3d25ba05805a41e95083874f5fedf2da0bcd2538 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 26 May 2021 20:13:44 -0500
Subject: [PATCH 12/53] use more practical examples for metadata

Signed-off-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 822aa4ab..7afe8fcb 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -194,9 +194,12 @@ id = "io.buildpacks.my-app"
 version = "0.1"
 
 [_.metadata]
-foo = "bar"
+cdn = "https://cdn.example.com"
+
+[[_.metadata.assets]]
+url = "https://cdn.example.com/assets/foo.jar"
+checksum = "3b1b39893d8e34a6d0bd44095afcd5c4"
 
-[_.metadata.fizz]
 buzz = ["a", "b", "c"]
 
 [io.buildpacks]

From 7fa0df91433ad7d95475e7633e43ac1bcff91ad7 Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Fri, 28 May 2021 22:15:32 -0500
Subject: [PATCH 13/53] Added inline buildpack spec to project-descriptor

Signed-off-by: Joe Kutner <jpkutner@gmail.com>
---
 extensions/project-descriptor.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 7afe8fcb..270f13bb 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -122,6 +122,11 @@ id = "<string>"
 version = "<string>"
 uri = "<string>"
 
+  [io.buildpacks.group.script]
+  api = "<buildpack api>"
+  shell = "<string (optional default=/bin/sh)>"
+  inline = "<script contents>"
+
 [[io.buildpacks.build.env]]
 name = "<string>"
 value = "<string>"
@@ -170,11 +175,18 @@ This table MAY contain an array of buildpacks. The schema for this table is:
 id = "<buildpack ID (optional)>"
 version = "<buildpack version (optional default=latest)>"
 uri = "<url or path to the buildpack (optional default=urn:buildpack:<id>)"
+
+  [io.buildpacks.group.script]
+  api = "<buildpack api>"
+  shell = "<string (optional default=/bin/sh)>"
+  inline = "<script contents>"
 ```
 
 This defines the buildpacks that a platform should use on the repo.
 
-Either an `id` or a `uri` MUST be included, but MUST NOT include both. If `uri` is provided, `version` MUST NOT be allowed.
+Either an `version`, `uri`, or `script` table MUST be included, but MUST NOT include any combination of these elements.
+
+The `api` and `inline` key MUST be defined in the `script` table. The value of the `inline` key will be used as the build script for the inline buildpack this entry represents. The value of the `api` key defines its Buildpack API compatibility, and the `shell` key defines the shell used to execute the `inline` script.
 
 #### `io.buildpacks.env.build` (optional)
 
@@ -215,7 +227,7 @@ include = [
 id = "io.buildpacks/java"
 version = "1.0"
 
-[[io.buildpacks.gruop]]
+[[io.buildpacks.group]]
 id = "io.buildpacks/nodejs"
 version = "1.0"
 ```

From a4d4d0dbbfce5199941719fce0a142a1243ed1fe Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Fri, 28 May 2021 22:19:31 -0500
Subject: [PATCH 14/53] Added definition of inline buildpack to project-desc

Signed-off-by: Joe Kutner <jpkutner@gmail.com>
---
 extensions/project-descriptor.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 270f13bb..cb8e30b9 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -186,7 +186,7 @@ This defines the buildpacks that a platform should use on the repo.
 
 Either an `version`, `uri`, or `script` table MUST be included, but MUST NOT include any combination of these elements.
 
-The `api` and `inline` key MUST be defined in the `script` table. The value of the `inline` key will be used as the build script for the inline buildpack this entry represents. The value of the `api` key defines its Buildpack API compatibility, and the `shell` key defines the shell used to execute the `inline` script.
+The `api` and `inline` key MUST be defined in the `script` table. The value of the `inline` key will be used as the build script for the [inline buildpack](#Definitions) this entry represents. The value of the `api` key defines its Buildpack API compatibility, and the `shell` key defines the shell used to execute the `inline` script.
 
 #### `io.buildpacks.env.build` (optional)
 
@@ -198,6 +198,10 @@ name = "JAVA_OPTS"
 value = "-Xmx1g"
 ```
 
+## Definitions
+
+* **Inline Buildpack** - a type of buildpack that can be defined in the same repo as the app it is used with
+
 ## Example
 
 ```toml

From 3b2f73fce33fd4d5f0b3a0ea623cb83cfb1f1b3a Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Mon, 21 Jun 2021 07:45:22 -0500
Subject: [PATCH 15/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>

Co-authored-by: Javier Romero <rjavier@vmware.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index cb8e30b9..f495f579 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -184,7 +184,7 @@ uri = "<url or path to the buildpack (optional default=urn:buildpack:<id>)"
 
 This defines the buildpacks that a platform should use on the repo.
 
-Either an `version`, `uri`, or `script` table MUST be included, but MUST NOT include any combination of these elements.
+Either a `version`, `uri`, or `script` table MUST be included, but MUST NOT include any combination of these elements.
 
 The `api` and `inline` key MUST be defined in the `script` table. The value of the `inline` key will be used as the build script for the [inline buildpack](#Definitions) this entry represents. The value of the `api` key defines its Buildpack API compatibility, and the `shell` key defines the shell used to execute the `inline` script.
 

From ea91afc6abcc0d24e60be2794f5b147ab6003ce6 Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Mon, 21 Jun 2021 07:45:44 -0500
Subject: [PATCH 16/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index f495f579..cf25143c 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -198,7 +198,7 @@ name = "JAVA_OPTS"
 value = "-Xmx1g"
 ```
 
-## Definitions
+## Terminology
 
 * **Inline Buildpack** - a type of buildpack that can be defined in the same repo as the app it is used with
 

From 4a76f1ed7e45d831b1aa216da4708f6bccc0f081 Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Thu, 24 Jun 2021 13:01:23 -0500
Subject: [PATCH 17/53] Add inline buildpack example to project-desc spec

Signed-off-by: Joe Kutner <jpkutner@gmail.com>
---
 extensions/project-descriptor.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index cf25143c..0bee63d7 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -234,4 +234,11 @@ version = "1.0"
 [[io.buildpacks.group]]
 id = "io.buildpacks/nodejs"
 version = "1.0"
+
+[[io.buildpacks.group]]
+id = "example/post-build"
+  
+    [io.buildpacks.group.script]
+    api = "0.5"
+    inline = "./post-build.sh"
 ```

From c6b6731139b97f1efdbc5649663d318b6f6a1b09 Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Fri, 25 Jun 2021 14:28:48 -0500
Subject: [PATCH 18/53] Added spec for RFC-0078: Group additions to Builder
 order

Signed-off-by: Joe Kutner <jpkutner@gmail.com>
---
 extensions/project-descriptor.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index cf25143c..ccf61a35 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -18,6 +18,8 @@ A project descriptor is a file that MAY contain configuration for apps, services
       - [`io.buildpacks.builder` (optional)](#iobuildpacksbuilder-optional)
       - [`io.buildpacks.include` (optional) and `io.buildpacks.exclude` (optional)](#iobuildpacksinclude-optional-and-iobuildpacksexclude-optional)
       - [`io.buildpacks.group` (optional)](#iobuildpacksgroup-optional)
+      - [`io.buildpacks.pre.group` (optional)](#iobuildpackspregroup-optional)
+      - [`io.buildpacks.post.group` (optional)](#iobuildpackspostgroup-optional)
       - [`io.buildpacks.env.build` (optional)](#iobuildpacksenvbuild-optional)
   - [Example](#example)
 
@@ -188,6 +190,19 @@ Either a `version`, `uri`, or `script` table MUST be included, but MUST NOT incl
 
 The `api` and `inline` key MUST be defined in the `script` table. The value of the `inline` key will be used as the build script for the [inline buildpack](#Definitions) this entry represents. The value of the `api` key defines its Buildpack API compatibility, and the `shell` key defines the shell used to execute the `inline` script.
 
+#### `io.buildpacks.pre.group` (optional)
+
+This table MAY contain a list of buildpacks to insert at the beginning of an automatically detected group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each group such that the are run as if they were original included in the group. Each phase of the injected buildpack(s) will execute as normal.
+[[build.post.buildpacks]]
+
+The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)
+
+#### `io.buildpacks.post.group` (optional)
+
+This table MAY contain a list of buildpacks to insert at the end of an automatically detected group. Given an order with multiple groups, the list of `post` buildpacks will be inserted at the end of each group such that the are run as if they were original included in the group. Each phase of the injected buildpack(s) will execute as normal.
+
+The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)
+
 #### `io.buildpacks.env.build` (optional)
 
 This table MAY be used to set environment variables at build time, for example:

From 8781b7f579cb56e2837f0294063ea5ade6e99016 Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Fri, 25 Jun 2021 21:00:39 -0500
Subject: [PATCH 19/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>

Co-authored-by: Javier Romero <rjavier@vmware.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index ccf61a35..66a39453 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -192,7 +192,7 @@ The `api` and `inline` key MUST be defined in the `script` table. The value of t
 
 #### `io.buildpacks.pre.group` (optional)
 
-This table MAY contain a list of buildpacks to insert at the beginning of an automatically detected group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each group such that the are run as if they were original included in the group. Each phase of the injected buildpack(s) will execute as normal.
+This table MAY contain a list of buildpacks to insert at the beginning of an automatically detected group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each group such that they are run as if they were original included in the group. Each phase of the injected buildpack(s) will execute as normal.
 [[build.post.buildpacks]]
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)

From b6bbe6c489f5c2e09aea061aaed150c7607464db Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Fri, 25 Jun 2021 21:00:50 -0500
Subject: [PATCH 20/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>

Co-authored-by: Javier Romero <rjavier@vmware.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 66a39453..69ad7c6a 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -199,7 +199,7 @@ The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksg
 
 #### `io.buildpacks.post.group` (optional)
 
-This table MAY contain a list of buildpacks to insert at the end of an automatically detected group. Given an order with multiple groups, the list of `post` buildpacks will be inserted at the end of each group such that the are run as if they were original included in the group. Each phase of the injected buildpack(s) will execute as normal.
+This table MAY contain a list of buildpacks to insert at the end of an automatically detected group. Given an order with multiple groups, the list of `post` buildpacks will be inserted at the end of each group such that they are run as if they were original included in the group. Each phase of the injected buildpack(s) will execute as normal.
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)
 

From 8691ba31fc6ac7147e352ec40975a0e9a7558ecf Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Fri, 2 Jul 2021 08:52:48 -0500
Subject: [PATCH 21/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>

Co-authored-by: Natalie Arellano <narellano@vmware.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 69ad7c6a..ff94163e 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -199,7 +199,7 @@ The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksg
 
 #### `io.buildpacks.post.group` (optional)
 
-This table MAY contain a list of buildpacks to insert at the end of an automatically detected group. Given an order with multiple groups, the list of `post` buildpacks will be inserted at the end of each group such that they are run as if they were original included in the group. Each phase of the injected buildpack(s) will execute as normal.
+This table MAY contain a list of buildpacks to insert at the end of an automatically detected group. Given an order with multiple groups, the list of `post` buildpacks will be inserted at the end of each group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)
 

From 5ba5b581f153d20d943f477db3453992c0493a46 Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Wed, 28 Jul 2021 13:20:45 -0500
Subject: [PATCH 22/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>

Co-authored-by: Natalie Arellano <narellano@vmware.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index ff94163e..cbddf9a5 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -192,7 +192,7 @@ The `api` and `inline` key MUST be defined in the `script` table. The value of t
 
 #### `io.buildpacks.pre.group` (optional)
 
-This table MAY contain a list of buildpacks to insert at the beginning of an automatically detected group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each group such that they are run as if they were original included in the group. Each phase of the injected buildpack(s) will execute as normal.
+This table MAY contain a list of buildpacks to insert at the beginning of an automatically detected group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
 [[build.post.buildpacks]]
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)

From 6b5f954d85762be70609d9acf8592b2d46ef1007 Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Wed, 28 Jul 2021 13:21:56 -0500
Subject: [PATCH 23/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index cbddf9a5..5752b3b5 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -192,7 +192,7 @@ The `api` and `inline` key MUST be defined in the `script` table. The value of t
 
 #### `io.buildpacks.pre.group` (optional)
 
-This table MAY contain a list of buildpacks to insert at the beginning of an automatically detected group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
+This table MAY contain a list of buildpacks to insert at the beginning of an automatically detected group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each automatically detected group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
 [[build.post.buildpacks]]
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)

From 06e0dca0e4b7868618aa01e42c8e317566b2172c Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Wed, 28 Jul 2021 13:22:02 -0500
Subject: [PATCH 24/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 5752b3b5..b4d11242 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -199,7 +199,7 @@ The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksg
 
 #### `io.buildpacks.post.group` (optional)
 
-This table MAY contain a list of buildpacks to insert at the end of an automatically detected group. Given an order with multiple groups, the list of `post` buildpacks will be inserted at the end of each group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
+This table MAY contain a list of buildpacks to insert at the end of an automatically detected group. Given an order with multiple groups, the list of `post` buildpacks will be inserted at the end of each automatically detected group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)
 

From 1578794653b84b29403cf2ecbcefbcd9d00ee7bc Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Wed, 25 Aug 2021 11:01:00 -0500
Subject: [PATCH 25/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>

Co-authored-by: Javier Romero <rjavier@vmware.com>
---
 extensions/project-descriptor.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index b4d11242..b7cb4acd 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -193,7 +193,6 @@ The `api` and `inline` key MUST be defined in the `script` table. The value of t
 #### `io.buildpacks.pre.group` (optional)
 
 This table MAY contain a list of buildpacks to insert at the beginning of an automatically detected group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each automatically detected group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
-[[build.post.buildpacks]]
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)
 

From d6c3d42361f969d68daeb0c5c139c625395b1960 Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Wed, 25 Aug 2021 11:01:41 -0500
Subject: [PATCH 26/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index b7cb4acd..cccd5c17 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -198,7 +198,7 @@ The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksg
 
 #### `io.buildpacks.post.group` (optional)
 
-This table MAY contain a list of buildpacks to insert at the end of an automatically detected group. Given an order with multiple groups, the list of `post` buildpacks will be inserted at the end of each automatically detected group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
+This table MAY contain a list of buildpacks to insert at the end of every group. Given an order with multiple groups, the list of `post` buildpacks will be inserted at the end of each group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)
 

From 6342b5f1ea5f91ce6da5eb785c4d6a6e763cc085 Mon Sep 17 00:00:00 2001
From: Joe Kutner <jpkutner@gmail.com>
Date: Wed, 25 Aug 2021 11:01:46 -0500
Subject: [PATCH 27/53] Update extensions/project-descriptor.md

Signed-off-by: Joe Kutner <jpkutner@gmail.com>

Co-authored-by: Terence Lee <hone02@gmail.com>
---
 extensions/project-descriptor.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index cccd5c17..bc1e1c6f 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -192,7 +192,7 @@ The `api` and `inline` key MUST be defined in the `script` table. The value of t
 
 #### `io.buildpacks.pre.group` (optional)
 
-This table MAY contain a list of buildpacks to insert at the beginning of an automatically detected group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each automatically detected group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
+This table MAY contain a list of buildpacks to insert at the beginning of every group. Given an order with multiple groups, the list of `pre` buildpacks will be inserted at the beginning of each group such that they are run as if they were originally included in the group. Each phase of the injected buildpack(s) will execute as normal.
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)
 

From 86a8e409d4cb3e1fd57a124960d6df0d77e8601b Mon Sep 17 00:00:00 2001
From: Sambhav Kothari <skothari44@bloomberg.net>
Date: Wed, 25 Aug 2021 23:47:53 +0530
Subject: [PATCH 28/53] Add schema version to the example

Signed-off-by: Sambhav Kothari <skothari44@bloomberg.net>
---
 extensions/project-descriptor.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 9dcc9fac..cbbc2efc 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -222,6 +222,7 @@ value = "-Xmx1g"
 [_]
 id = "io.buildpacks.my-app"
 version = "0.1"
+schema-version = "0.2"
 
 [_.metadata]
 cdn = "https://cdn.example.com"

From 1e6e6d9c391afff8b441983ac0a1330f47902cfa Mon Sep 17 00:00:00 2001
From: Javier Romero <rjavier@vmware.com>
Date: Thu, 18 Nov 2021 14:24:29 -0600
Subject: [PATCH 29/53] Bump platform API version to 0.8

---
 platform.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform.md b/platform.md
index 45ed367e..71594a2b 100644
--- a/platform.md
+++ b/platform.md
@@ -87,7 +87,7 @@ Examples of a platform might include:
 
 ## Platform API Version
 
-This document specifies Platform API version `0.7`.
+This document specifies Platform API version `0.8`.
 
 Platform API versions:
  - MUST be in form `<major>.<minor>` or `<major>`, where `<major>` is equivalent to `<major>.0`

From d0aaf31408e1a3a16e6e3b6620fe7864600ca52c Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 15 Dec 2021 12:07:34 -0500
Subject: [PATCH 30/53] Updates platform spec to improve performance when
 restoring launch sboms from daemon

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/platform.md b/platform.md
index 71594a2b..90970600 100644
--- a/platform.md
+++ b/platform.md
@@ -285,10 +285,12 @@ Usage:
   [-cache-image <cache-image>] \
   [-daemon] \ # sets <daemon>
   [-gid <gid>] \
+  [-launch-cache <launch-cache>] \
   [-layers <layers>] \
   [-log-level <log-level>] \
   [-previous-image <previous-image> ] \
   [-run-image <run-image> ] \
+  [-skip-layers <skip-layers> ] \
   [-stack <stack> ] \
   [-tag <tag>...] \
   [-uid <uid>] \
@@ -304,9 +306,11 @@ Usage:
 | `<gid>`           | `CNB_GROUP_ID`        |                          | Primary GID of the build image `User`
 | `<layers>`        | `CNB_LAYERS_DIR`      | `/layers`                | Path to layers directory
 | `<image>`         |                       |                          | Tag reference to which the app image will be written
+| `<launch-cache>`  | `CNB_LAUNCH_CACHE_DIR`|                          | Path to a cache directory containing launch layers
 | `<log-level>`     | `CNB_LOG_LEVEL`       | `info`                   | Log Level
 | `<previous-image>`| `CNB_PREVIOUS_IMAGE`  | `<image>`                | Image reference to be analyzed (usually the result of the previous build)
 | `<run-image>`     | `CNB_RUN_IMAGE`       | resolved from `<stack>`  | Run image reference
+| `<skip-layers>`   | `CNB_SKIP_LAYERS`     | `false`                  | Do not restore SBOM layer from previous image
 | `<stack>`         | `CNB_STACK_PATH`      | `/cnb/stack.toml`        | Path to stack file (see [`stack.toml`](#stacktoml-toml))
 | `<tag>...`        |                       |                          | Additional tag to apply to exported image
 | `<uid>`           | `CNB_USER_ID`         |                          | UID of the build image `User`
@@ -316,6 +320,7 @@ Usage:
 - **If** `<daemon>` is `false` and the platform provides one or more `<tag>` inputs, each `<tag>` MUST refer to the same registry as `<image>`.
 - **If** `<daemon>` is `false`, `<previous-image>`, if provided,  MUST be a valid image reference.
 - **If** `<daemon>` is `true`, `<previous-image>`, if provided, MUST be either a valid image reference or an imageID.
+- **If** `<skip-layers>` is `true` the lifecycle MUST NOT restore the SBOM layer (if any) from the previous image.
 - **If** `<run-image>` is not provided by the platform the lifecycle MUST [resolve](#run-image-resolution) the run image from the contents of `stack` or fail if `stack` does not contain a valid run image.
 - The lifecycle MUST accept valid references to non-existent `<previous-image>`, `<cache-image>`, and `<image>` without error.
 - The lifecycle MUST ensure registry write access to `<image>`, `<cache-image>` and any provided `<tag>`s.

From 0034fb475c4bec5f48e19cd612b15464a7cab5be Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 15 Dec 2021 12:18:27 -0500
Subject: [PATCH 31/53] Clarify the definition of -skip-restore

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platform.md b/platform.md
index 71594a2b..ed341f0d 100644
--- a/platform.md
+++ b/platform.md
@@ -645,10 +645,10 @@ Running `creator` SHALL be equivalent to running `detector`, `analyzer`, `restor
 | Input             | Environment Variable| Default Value| Description
 |-------------------|---------------------|--------------|----------------------
 | `<previous-image>`| `CNB_PREVIOUS_IMAGE`| `<image>`    | Image reference to be analyzed (usually the result of the previous build)
-| `<skip-restore>`  | `CNB_SKIP_RESTORE`  | `false`      | Do not write layer metadata or restore cached layers
+| `<skip-restore>`  | `CNB_SKIP_RESTORE`  | `false`      | Do not write layer metadata, restore sbom layers, or restore cached layers
 | `<tag>...`        |                     |              | Additional tag to apply to exported image
 
-- **If** `<skip-restore>` is `true` the `creator` SHALL skip layer analysis and skip the entire Restore phase.
+- **If** `<skip-restore>` is `true` the `creator` SHALL skip sbom layer restoration and skip the entire Restore phase.
 - **If** the platform provides one or more `<tag>` inputs they SHALL be treated as additional `<image>` inputs to the `exporter`
 
 ##### Outputs

From 9db2976bb01e823f85b756dd8a34877587cbf079 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Thu, 13 Jan 2022 11:17:50 -0500
Subject: [PATCH 32/53] Makes the platform api less aware of the buildpack api,
 thus decoupling the two.

The platform api doesn't need to care in which buildpack api legacy boms are supported, only that they might be.

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform.md b/platform.md
index 71594a2b..6c12b39d 100644
--- a/platform.md
+++ b/platform.md
@@ -937,7 +937,7 @@ Where:
 - `id`, `version`, and `api` MUST be present for each buildpack
 - `processes` contains the complete set of processes contributed by all buildpacks
 - `slices` contains the complete set of slices defined by all buildpacks
-- `bom` contains the Bill of Materials contributed by buildpacks implementing Buildpack API < 0.7
+- `bom` contains the legacy Bill of Materials contributed by buildpacks (where [supported]((buildpack.md)))
 
 #### `order.toml` (TOML)
 
@@ -1020,7 +1020,7 @@ Where:
 - **If** the app image was exported to a docker daemon
   - `imageID` MUST contain the imageID
 - **If** the app image was the result of a build operation
-  - `build.bom` MUST contain any build Bill of Materials entries returned by buildpacks implementing Buildpack API < 0.7
+  - `build.bom` MUST contain any legacy build Bill of Materials entries returned by buildpacks (where [supported]((buildpack.md)))
 
 #### `stack.toml` (TOML)
 
@@ -1087,7 +1087,7 @@ Where:
 Where:
 - `processes` MUST contain all buildpack contributed processes
 - `buildpacks` MUST contain the detected group
-- `bom` MUST contain the Bill of Materials contributed by buildpacks implementing Buildpack API < 0.7
+- `bom` MUST contain the legacy Bill of Materials contributed by buildpacks (where [supported]((buildpack.md)))
 - `launcher.version` SHOULD contain the version of the `launcher` binary included in the app
 - `launcher.source.git.repository` SHOULD contain the git repository containing the `launcher` source code
 - `launcher.source.git.commit` SHOULD contain the git commit from which the given `launcher` was built

From 23d9b6fe891efb037d6483562eac579439f439ac Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Thu, 13 Jan 2022 14:53:41 -0500
Subject: [PATCH 33/53] Update platform.md

Signed-off-by: Natalie Arellano <narellano@vmware.com>

Co-authored-by: Emily Casey <ecasey@vmware.com>
---
 platform.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform.md b/platform.md
index ed341f0d..c39655c2 100644
--- a/platform.md
+++ b/platform.md
@@ -645,7 +645,7 @@ Running `creator` SHALL be equivalent to running `detector`, `analyzer`, `restor
 | Input             | Environment Variable| Default Value| Description
 |-------------------|---------------------|--------------|----------------------
 | `<previous-image>`| `CNB_PREVIOUS_IMAGE`| `<image>`    | Image reference to be analyzed (usually the result of the previous build)
-| `<skip-restore>`  | `CNB_SKIP_RESTORE`  | `false`      | Do not write layer metadata, restore sbom layers, or restore cached layers
+| `<skip-restore>`  | `CNB_SKIP_RESTORE`  | `false`      | Prevent buildpacks from reusing layers from previous builds, by skipping the restoration of any data to each buildpack's layers directory, with the exception of `store.toml`.
 | `<tag>...`        |                     |              | Additional tag to apply to exported image
 
 - **If** `<skip-restore>` is `true` the `creator` SHALL skip sbom layer restoration and skip the entire Restore phase.

From 2685b3ffd08e93551dee1fea0321ff5855ada2bb Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Fri, 14 Jan 2022 15:23:25 -0500
Subject: [PATCH 34/53] Update platform.md

Signed-off-by: Natalie Arellano <narellano@vmware.com>

Co-authored-by: Anthony Emengo <anthonyemengojr@gmail.com>
---
 platform.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform.md b/platform.md
index 6c12b39d..9b9f16e3 100644
--- a/platform.md
+++ b/platform.md
@@ -1087,7 +1087,7 @@ Where:
 Where:
 - `processes` MUST contain all buildpack contributed processes
 - `buildpacks` MUST contain the detected group
-- `bom` MUST contain the legacy Bill of Materials contributed by buildpacks (where [supported]((buildpack.md)))
+- `bom` MUST contain the legacy Bill of Materials contributed by buildpacks (where [supported](buildpack.md))
 - `launcher.version` SHOULD contain the version of the `launcher` binary included in the app
 - `launcher.source.git.repository` SHOULD contain the git repository containing the `launcher` source code
 - `launcher.source.git.commit` SHOULD contain the git commit from which the given `launcher` was built

From 39cff8268a5c3fe1ade52f4274a3dd807075d326 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Fri, 14 Jan 2022 15:23:31 -0500
Subject: [PATCH 35/53] Update platform.md

Signed-off-by: Natalie Arellano <narellano@vmware.com>

Co-authored-by: Anthony Emengo <anthonyemengojr@gmail.com>
---
 platform.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform.md b/platform.md
index 9b9f16e3..9807e54e 100644
--- a/platform.md
+++ b/platform.md
@@ -937,7 +937,7 @@ Where:
 - `id`, `version`, and `api` MUST be present for each buildpack
 - `processes` contains the complete set of processes contributed by all buildpacks
 - `slices` contains the complete set of slices defined by all buildpacks
-- `bom` contains the legacy Bill of Materials contributed by buildpacks (where [supported]((buildpack.md)))
+- `bom` contains the legacy Bill of Materials contributed by buildpacks (where [supported](buildpack.md))
 
 #### `order.toml` (TOML)
 

From afb61bb4711176c8ead5af0322e845c2d3f842a2 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Fri, 14 Jan 2022 15:23:38 -0500
Subject: [PATCH 36/53] Update platform.md

Signed-off-by: Natalie Arellano <narellano@vmware.com>

Co-authored-by: Anthony Emengo <anthonyemengojr@gmail.com>
---
 platform.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform.md b/platform.md
index 9807e54e..69fa8868 100644
--- a/platform.md
+++ b/platform.md
@@ -1020,7 +1020,7 @@ Where:
 - **If** the app image was exported to a docker daemon
   - `imageID` MUST contain the imageID
 - **If** the app image was the result of a build operation
-  - `build.bom` MUST contain any legacy build Bill of Materials entries returned by buildpacks (where [supported]((buildpack.md)))
+  - `build.bom` MUST contain any legacy build Bill of Materials entries returned by buildpacks (where [supported](buildpack.md))
 
 #### `stack.toml` (TOML)
 

From a2358f32fa548a73a37f33de4077675633b6c445 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Thu, 27 Jan 2022 11:51:37 -0500
Subject: [PATCH 37/53] Process specific working directory

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/platform.md b/platform.md
index ebbb5434..563dec55 100644
--- a/platform.md
+++ b/platform.md
@@ -746,27 +746,31 @@ Usage:
 | `<direct>`          |                       |                | Process execution strategy
 | `<cmd>`             |                       |                | Command to execute
 | `<args>`            |                       |                | Arguments to command
+| `<working-directory>`              |        |                | Process working directory
 | `<layers>/config/metadata.toml`    |        |                | Build metadata (see [`metadata.toml`](#metadatatoml-toml)
 | `<layers>/<buildpack-id>/<layer>/` |        |                | Launch Layers
 
-A command (`<cmd>`), arguments to that command (`<args>`), and an execution strategy (`<direct>`) comprise a process definition. Processes MAY be buildpack-defined or user-defined.
+A command (`<cmd>`), arguments to that command (`<args>`), a working directory (`<working-directory>`), and an execution strategy (`<direct>`) comprise a process definition. Processes MAY be buildpack-defined or user-defined.
 
 The launcher:
-- MUST derive the values of `<cmd>`, `<args>`, and `<direct>` as follows:
+- MUST derive the values of `<cmd>`, `<args>`, `<working-directory>`, and `<direct>` as follows:
 - **If** the final path element in `$0`, matches the type of any buildpack-provided process type
     - `<process-type>` SHALL be the final path element in `$0`
     - The lifecycle:
         - MUST select the process with type equal to `<process-type>` from `<layers>/config/metadata.toml`
         - MUST append any user-provided `<args>` to process arguments
+        - MUST set `<working-directory>` to `<app>` if not defined
 - **Else**
     - **If** `$1` is `--`
         - `<direct>` SHALL be `true`
         - `<cmd>` SHALL be `$2`
         - `<args>` SHALL be `${@3:}`
+        - `<working-directory>` SHALL be `<app>`
     - **Else**
         - `<direct>` SHALL be `false`
         - `<cmd>` SHALL be `$1`
         - `<args>` SHALL be `${@2:}`
+        - `<working-directory` SHALL be `<app>`
 
 ##### Outputs
 If the launcher errors before executing the process it will have one of the following error codes:
@@ -931,6 +935,7 @@ type = "<process type>"
 command = "<command>"
 args = ["<arguments>"]
 direct = false
+working-directory = "<working directory>"
 
 [[slices]]
 paths = ["<app sub-path glob>"]
@@ -1056,7 +1061,8 @@ Where:
       "args": [
         "<args>"
       ],
-      "direct": false
+      "direct": false,
+      "working-directory": "<working-directory>",
     }
   ],
   "buildpacks": [

From f56cf851b6f2ce7d6758db940b417f5974095a2a Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 9 Feb 2022 14:07:33 -0500
Subject: [PATCH 38/53] Update platform.md

Signed-off-by: Natalie Arellano <narellano@vmware.com>

Co-authored-by: Emily Casey <ecasey@vmware.com>
---
 platform.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platform.md b/platform.md
index 563dec55..d99c6b33 100644
--- a/platform.md
+++ b/platform.md
@@ -746,7 +746,6 @@ Usage:
 | `<direct>`          |                       |                | Process execution strategy
 | `<cmd>`             |                       |                | Command to execute
 | `<args>`            |                       |                | Arguments to command
-| `<working-directory>`              |        |                | Process working directory
 | `<layers>/config/metadata.toml`    |        |                | Build metadata (see [`metadata.toml`](#metadatatoml-toml)
 | `<layers>/<buildpack-id>/<layer>/` |        |                | Launch Layers
 

From 61351819c1c100b499cc4802964d80b32c0e2e16 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Fri, 11 Feb 2022 09:58:52 -0500
Subject: [PATCH 39/53] Add mechanism for platform to provide image creation
 time.

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/platform.md b/platform.md
index ebbb5434..159706db 100644
--- a/platform.md
+++ b/platform.md
@@ -872,6 +872,9 @@ To achieve reproducibility the lifecycle SHOULD set the following to a constant,
 - file modification times in generated layers
 - image creation time
 
+The platform MAY set `SOURCE_DATE_EPOCH`  in the lifecycle execution environment, where the value of `SOURCE_DATE_EPOCH` MUST be a [UNIX timestamp](https://reproducible-builds.org/specs/source-date-epoch/).
+If `SOURCE_DATE_EPOCH` is set, the lifecycle SHOULD set the image creation time to its value.
+
 Because compressions algorithms and manifest whitespace affect the image digest, an app image exported to the docker daemon and subsequently pushed to a registry MAY have a different digest than an app image exported directly to a registry by the lifecycle, even when all other inputs are held constant.
 
 If buildpacks do not generate layer contents or layer metadata reproducibly, builds MAY NOT be reproducibile even when identical source code and buildpacks are provided to the lifecycle.

From 57ea1c94646045161897b64384b2100416cafeb4 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 16 Feb 2022 10:57:46 -0500
Subject: [PATCH 40/53] Further clarification

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/platform.md b/platform.md
index d99c6b33..b0a1b4c2 100644
--- a/platform.md
+++ b/platform.md
@@ -738,16 +738,16 @@ Usage:
 /cnb/lifecycle/launcher [--] [<cmd> <arg>...]
 ```
 ##### Inputs
-| Input               | Environment Variable  | Default Value  | Description
-|---------------------|-----------------------|----------------|---------------------------------------
-| `<app>`             | `CNB_APP_DIR`         | `/workspace`   | Path to application directory
-| `<layers>`          | `CNB_LAYERS_DIR`      | `/layers`      | Path to layer directory
-| `<process-type>`    |                       |                | `type` of process to launch
-| `<direct>`          |                       |                | Process execution strategy
-| `<cmd>`             |                       |                | Command to execute
-| `<args>`            |                       |                | Arguments to command
-| `<layers>/config/metadata.toml`    |        |                | Build metadata (see [`metadata.toml`](#metadatatoml-toml)
-| `<layers>/<buildpack-id>/<layer>/` |        |                | Launch Layers
+| Input                              | Environment Variable | Default Value | Description                                               |
+|------------------------------------|----------------------|---------------|-----------------------------------------------------------|
+| `<app>`                            | `CNB_APP_DIR`        | `/workspace`  | Path to application directory                             |
+| `<layers>`                         | `CNB_LAYERS_DIR`     | `/layers`     | Path to layer directory                                   |
+| `<process-type>`                   |                      |               | `type` of process to launch                               |
+| `<direct>`                         |                      |               | Process execution strategy                                |
+| `<cmd>`                            |                      |               | Command to execute                                        |
+| `<args>`                           |                      |               | Arguments to command                                      |
+| `<layers>/config/metadata.toml`    |                      |               | Build metadata (see [`metadata.toml`](#metadatatoml-toml) |
+| `<layers>/<buildpack-id>/<layer>/` |                      |               | Launch Layers                                             |
 
 A command (`<cmd>`), arguments to that command (`<args>`), a working directory (`<working-directory>`), and an execution strategy (`<direct>`) comprise a process definition. Processes MAY be buildpack-defined or user-defined.
 
@@ -757,8 +757,8 @@ The launcher:
     - `<process-type>` SHALL be the final path element in `$0`
     - The lifecycle:
         - MUST select the process with type equal to `<process-type>` from `<layers>/config/metadata.toml`
+        - MUST set `<working-directory>` to the value defined for the process in `<layers>/config/metadata.toml`, or to `<app>` if not defined
         - MUST append any user-provided `<args>` to process arguments
-        - MUST set `<working-directory>` to `<app>` if not defined
 - **Else**
     - **If** `$1` is `--`
         - `<direct>` SHALL be `true`
@@ -774,11 +774,11 @@ The launcher:
 ##### Outputs
 If the launcher errors before executing the process it will have one of the following error codes:
 
-| Exit Code | Result|
-|-----------|-------|
-| `11`      | Platform API incompatibility error
-| `12`      | Buildpack API incompatibility error
-| `80-89`|  Launch-specific lifecycle errors
+| Exit Code | Result                              |
+|-----------|-------------------------------------|
+| `11`      | Platform API incompatibility error  |
+| `12`      | Buildpack API incompatibility error |
+| `80-89`   | Launch-specific lifecycle errors    |
 
 Otherwise, the exit code shall be the exit code of the launched process.
 

From d6060b7c0b3a86b7cec27d901b66d84a7f925be2 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 16 Feb 2022 13:56:02 -0500
Subject: [PATCH 41/53] Add details for exporter

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform.md b/platform.md
index 159706db..ea8f592f 100644
--- a/platform.md
+++ b/platform.md
@@ -546,6 +546,7 @@ Usage:
 | `<stack>`           | `CNB_STACK_PATH`           | `/cnb/stack.toml`   | Path to stack file (see [`stack.toml`](#stacktoml-toml)
 | `<uid>`             | `CNB_USER_ID`              |                     | UID of the build image `User`
 | `<layers>/config/metadata.toml` | | | Build metadata (see [`metadata.toml`](#metadatatoml-toml)
+|                     | `SOURCE_DATE_EPOCH`        |                     | Timestamp for `created` time in app image config                                           |
 
 - At least one `<image>` must be provided
 - Each `<image>` MUST be a valid tag reference
@@ -601,7 +602,7 @@ Usage:
         - `io.buildpacks.build.metadata`: see [build metadata](#iobuildpacksbuildmetadata-json)
 - To ensure [build reproducibility](#build-reproducibility), the lifecycle:
     - SHOULD set the modification time of all files in newly created layers to a constant value
-    - SHOULD set the `created` time in image config to a constant value
+    - SHOULD set the `created` time in image config to `SOURCE_DATE_EPOCH`, or to a constant value if not defined
 
 - The lifecycle SHALL write a [report](#reporttoml-toml) to `<report>` describing the exported app image
 

From 843dfdec90c07469f0b579d411000847242ad459 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Thu, 17 Feb 2022 11:10:17 -0500
Subject: [PATCH 42/53] Fix incorrect layer sbom paths in platform spec

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform.md b/platform.md
index ebbb5434..41ba9a7f 100644
--- a/platform.md
+++ b/platform.md
@@ -575,8 +575,8 @@ Usage:
       - All run-image config values SHALL be preserved unless this conflicts with another requirement
     - MUST contain all buildpack-provided launch layers as determined by the [Buildpack Interface Specfication](buildpack.md)
     - MUST contain a layer containing all buildpack-provided Software Bill of Materials (SBOM) files for `launch` as determined by the [Buildpack Interface Specfication](buildpack.md) if they are present
-      - `<layers>/sbom/<buildpack-id>/launch.sbom.<ext>` MUST contain the buildpack-provided `launch` SBOM
-      - `<layers>/sbom/<buildpack-id>/<layer-id>/launch.sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is a `launch` layer
+      - `<layers>/sbom/launch/<buildpack-id>/sbom.<ext>` MUST contain the buildpack-provided `launch` SBOM
+      - `<layers>/sbom/launch/<buildpack-id>/<layer-id>/sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is a `launch` layer
     - MUST contain one or more app layers as determined by the [Buildpack Interface Specfication](buildpack.md)
     - MUST contain one or more launcher layers that include:
         - A file with the contents of the `<launcher>` file at path `/cnb/lifecycle/launcher`
@@ -607,8 +607,8 @@ Usage:
 
 - The `<layers>` directory:
   - MUST include all buildpack-provided Software Bill of Materials (SBOM) files for `build` as determined by the [Buildpack Interface Specfication](buildpack.md) if they are present
-    - `<layers>/sbom/<buildpack-id>/build.sbom.<ext>` MUST contain the buildpack-provided `build` SBOM
-    - `<layers>/sbom/<buildpack-id>/<layer-id>/build.sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is not a `launch` layer
+    - `<layers>/sbom/build/<buildpack-id>/sbom.<ext>` MUST contain the buildpack-provided `build` SBOM
+    - `<layers>/sbom/build/<buildpack-id>/<layer-id>/sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is not a `launch` layer
 
 - *If* a cache is provided the lifecycle:
    - SHALL write the contents of all cached layers and any provided layer-associated SBOM files to the cache

From d9d85ecb9a440c2a1f70aea42fd6d2887b98ca52 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 23 Feb 2022 10:58:35 -0600
Subject: [PATCH 43/53] io.buildpacks.env.build -> io.buildpacks.build.env

standardize the key usage, see https://github.com/buildpacks/spec/pull/222#discussion_r640224112
---
 extensions/project-descriptor.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index cbbc2efc..33bc3bc2 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -20,7 +20,7 @@ A project descriptor is a file that MAY contain configuration for apps, services
       - [`io.buildpacks.group` (optional)](#iobuildpacksgroup-optional)
       - [`io.buildpacks.pre.group` (optional)](#iobuildpackspregroup-optional)
       - [`io.buildpacks.post.group` (optional)](#iobuildpackspostgroup-optional)
-      - [`io.buildpacks.env.build` (optional)](#iobuildpacksenvbuild-optional)
+      - [`io.buildpacks.build.env` (optional)](#iobuildpacksbuildenv-optional)
   - [Example](#example)
 
 ## Schema Version
@@ -202,12 +202,12 @@ This table MAY contain a list of buildpacks to insert at the end of every group.
 
 The schema for this table is identical to [`io.buildpacks.group`](#iobuildpacksgroup-optional)
 
-#### `io.buildpacks.env.build` (optional)
+#### `io.buildpacks.build.env` (optional)
 
 This table MAY be used to set environment variables at build time, for example:
 
 ```toml
-[[io.buildpacks.env.build]]
+[[io.buildpacks.build.env]]
 name = "JAVA_OPTS"
 value = "-Xmx1g"
 ```

From 4abc9521ed279e25db5291f6110a28e662b5e8e6 Mon Sep 17 00:00:00 2001
From: Terence Lee <hone02@gmail.com>
Date: Wed, 23 Feb 2022 11:08:48 -0600
Subject: [PATCH 44/53] add io.buildpacks.pre.group and
 io.buildpacks.post.group to the schema

---
 extensions/project-descriptor.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/extensions/project-descriptor.md b/extensions/project-descriptor.md
index 33bc3bc2..646a594e 100644
--- a/extensions/project-descriptor.md
+++ b/extensions/project-descriptor.md
@@ -129,6 +129,16 @@ uri = "<string>"
   shell = "<string (optional default=/bin/sh)>"
   inline = "<script contents>"
 
+[[io.buildpacks.pre.group]]
+id = "<string>"
+version = "<string>"
+uri = "<string>"
+
+[[io.buildpacks.post.group]]
+id = "<string>"
+version = "<string>"
+uri = "<string>"
+
 [[io.buildpacks.build.env]]
 name = "<string>"
 value = "<string>"

From 7261f55aad4bdcb10a5ebb6d73b580de16c3573b Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 2 Mar 2022 17:59:32 -0500
Subject: [PATCH 45/53] Update platform.md

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform.md b/platform.md
index b0a1b4c2..053f4587 100644
--- a/platform.md
+++ b/platform.md
@@ -934,7 +934,7 @@ type = "<process type>"
 command = "<command>"
 args = ["<arguments>"]
 direct = false
-working-directory = "<working directory>"
+working-dir = "<working directory>"
 
 [[slices]]
 paths = ["<app sub-path glob>"]

From 968f7c4a589186ea46bb1165492d4360d6f617d3 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 2 Mar 2022 18:01:59 -0500
Subject: [PATCH 46/53] Change working-directory to working-dir

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform.md b/platform.md
index 053f4587..ab752139 100644
--- a/platform.md
+++ b/platform.md
@@ -749,27 +749,27 @@ Usage:
 | `<layers>/config/metadata.toml`    |                      |               | Build metadata (see [`metadata.toml`](#metadatatoml-toml) |
 | `<layers>/<buildpack-id>/<layer>/` |                      |               | Launch Layers                                             |
 
-A command (`<cmd>`), arguments to that command (`<args>`), a working directory (`<working-directory>`), and an execution strategy (`<direct>`) comprise a process definition. Processes MAY be buildpack-defined or user-defined.
+A command (`<cmd>`), arguments to that command (`<args>`), a working directory (`<working-dir>`), and an execution strategy (`<direct>`) comprise a process definition. Processes MAY be buildpack-defined or user-defined.
 
 The launcher:
-- MUST derive the values of `<cmd>`, `<args>`, `<working-directory>`, and `<direct>` as follows:
+- MUST derive the values of `<cmd>`, `<args>`, `<working-dir>`, and `<direct>` as follows:
 - **If** the final path element in `$0`, matches the type of any buildpack-provided process type
     - `<process-type>` SHALL be the final path element in `$0`
     - The lifecycle:
         - MUST select the process with type equal to `<process-type>` from `<layers>/config/metadata.toml`
-        - MUST set `<working-directory>` to the value defined for the process in `<layers>/config/metadata.toml`, or to `<app>` if not defined
+        - MUST set `<working-dir>` to the value defined for the process in `<layers>/config/metadata.toml`, or to `<app>` if not defined
         - MUST append any user-provided `<args>` to process arguments
 - **Else**
     - **If** `$1` is `--`
         - `<direct>` SHALL be `true`
         - `<cmd>` SHALL be `$2`
         - `<args>` SHALL be `${@3:}`
-        - `<working-directory>` SHALL be `<app>`
+        - `<working-dir>` SHALL be `<app>`
     - **Else**
         - `<direct>` SHALL be `false`
         - `<cmd>` SHALL be `$1`
         - `<args>` SHALL be `${@2:}`
-        - `<working-directory` SHALL be `<app>`
+        - `<working-dir` SHALL be `<app>`
 
 ##### Outputs
 If the launcher errors before executing the process it will have one of the following error codes:
@@ -1061,7 +1061,7 @@ Where:
         "<args>"
       ],
       "direct": false,
-      "working-directory": "<working-directory>",
+      "working-dir": "<working-dir>",
     }
   ],
   "buildpacks": [

From 6f6491046af56e9ca6342e0cf4c6920a8fa36449 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Thu, 27 Jan 2022 11:16:09 -0500
Subject: [PATCH 47/53] Remove legacy bom for platform/0.9

Legacy boms output by older buildpacks will be ignored by the platform.

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/platform.md b/platform.md
index 41ba9a7f..74c18306 100644
--- a/platform.md
+++ b/platform.md
@@ -498,7 +498,7 @@ Usage:
 
 - The lifecycle SHALL execute all buildpacks in the order defined in `<group>` according to the process outlined in the [Buildpack Interface Specification](buildpack.md).
 - The lifecycle SHALL add all invoked buildpacks to`<layers>/config/metadata.toml`.
-- The lifecycle SHALL aggregate all `processes`, `slices` and `bom` entries returned by buildpacks in `<layers>/config/metadata.toml`.
+- The lifecycle SHALL aggregate all `processes` and `slices` returned by buildpacks in `<layers>/config/metadata.toml`.
 - The lifecycle SHALL record the buildpack-provided default process type in `<layers>/config/metadata.toml`.
     - The lifecycle SHALL treat `web` processes defined by buildpacks implementing Buildpack API < 0.6 as `default = true`.
 
@@ -934,15 +934,12 @@ direct = false
 
 [[slices]]
 paths = ["<app sub-path glob>"]
-
-[bom]
 ```
 
 Where:
 - `id`, `version`, and `api` MUST be present for each buildpack
 - `processes` contains the complete set of processes contributed by all buildpacks
 - `slices` contains the complete set of slices defined by all buildpacks
-- `bom` contains the legacy Bill of Materials contributed by buildpacks (where [supported](buildpack.md))
 
 #### `order.toml` (TOML)
 
@@ -1005,17 +1002,6 @@ tags = ["<tag reference>"]
 digest = "<image digest>"
 image-id = "<imageID>"
 manifest-size = "<manifest size in bytes>"
-
-[build]
-[[build.bom]]
-name = "<dependency name>"
-
-[build.bom.metadata]
-version = "<dependency version>"
-
-[build.bom.buildpack]
-id = "<buildpack ID>"
-version = "<buildpack version>"
 ```
 Where:
 - `tags` MUST contain all tag references to the exported app image
@@ -1024,8 +1010,6 @@ Where:
   - `manifest-size` MUST contain the manifest size in bytes
 - **If** the app image was exported to a docker daemon
   - `imageID` MUST contain the imageID
-- **If** the app image was the result of a build operation
-  - `build.bom` MUST contain any legacy build Bill of Materials entries returned by buildpacks (where [supported](buildpack.md))
 
 #### `stack.toml` (TOML)
 
@@ -1066,18 +1050,6 @@ Where:
       "homepage": "<buildpack homepage>"
     }
   ],
-  "bom": [
-    {
-      "name": "<bom-entry-name>",
-      "metadata": {
-        // arbitrary buildpack provided metadata
-      },
-      "buildpack": {
-        "id": "<buildpack ID>",
-        "version": "<buildpack version>"
-      }
-    },
-  ],
  "launcher": {
     "version": "<launcher-version>",
     "source": {
@@ -1092,7 +1064,6 @@ Where:
 Where:
 - `processes` MUST contain all buildpack contributed processes
 - `buildpacks` MUST contain the detected group
-- `bom` MUST contain the legacy Bill of Materials contributed by buildpacks (where [supported](buildpack.md))
 - `launcher.version` SHOULD contain the version of the `launcher` binary included in the app
 - `launcher.source.git.repository` SHOULD contain the git repository containing the `launcher` source code
 - `launcher.source.git.commit` SHOULD contain the git commit from which the given `launcher` was built

From 69ca1c31b54df915e1a5632adfc4e7639361f329 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Tue, 8 Mar 2022 14:11:41 -0500
Subject: [PATCH 48/53] Specify where legacy boms can be found by the platform

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform.md b/platform.md
index 74c18306..3ada0c59 100644
--- a/platform.md
+++ b/platform.md
@@ -577,6 +577,7 @@ Usage:
     - MUST contain a layer containing all buildpack-provided Software Bill of Materials (SBOM) files for `launch` as determined by the [Buildpack Interface Specfication](buildpack.md) if they are present
       - `<layers>/sbom/launch/<buildpack-id>/sbom.<ext>` MUST contain the buildpack-provided `launch` SBOM
       - `<layers>/sbom/launch/<buildpack-id>/<layer-id>/sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is a `launch` layer
+      - `<layers>/sbom/launch/<buildpack-id>/sbom.legacy.json` MAY contain the legacy non-standard Bill of Materials for `launch` (where [supported](buildpack.md))
     - MUST contain one or more app layers as determined by the [Buildpack Interface Specfication](buildpack.md)
     - MUST contain one or more launcher layers that include:
         - A file with the contents of the `<launcher>` file at path `/cnb/lifecycle/launcher`
@@ -608,8 +609,8 @@ Usage:
 - The `<layers>` directory:
   - MUST include all buildpack-provided Software Bill of Materials (SBOM) files for `build` as determined by the [Buildpack Interface Specfication](buildpack.md) if they are present
     - `<layers>/sbom/build/<buildpack-id>/sbom.<ext>` MUST contain the buildpack-provided `build` SBOM
-    - `<layers>/sbom/build/<buildpack-id>/<layer-id>/sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is not a `launch` layer
-
+    - `<layers>/sbom/build/<buildpack-id>/<layer-id>/sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is not a `launch` layer    - `<layers>/sbom/build/<buildpack-id>/sbom.legacy.json` MAY contain the legacy non-standard Bill of Materials for `build` (where [supported](buildpack.md))
+    - `<layers>/sbom/build/<buildpack-id>/sbom.legacy.json` MAY contain the legacy non-standard Bill of Materials for `build` (where [supported](buildpack.md))
 - *If* a cache is provided the lifecycle:
    - SHALL write the contents of all cached layers and any provided layer-associated SBOM files to the cache
    - SHALL record the diffID and layer content metadata of all cached layers in the cache

From 4ecdae57a9ab88caae93036f2862fdff7c6d3ea8 Mon Sep 17 00:00:00 2001
From: Sambhav Kothari <skothari44@bloomberg.net>
Date: Wed, 9 Mar 2022 23:19:05 +0000
Subject: [PATCH 49/53] Change legacy sbom location to a top level combined one

Signed-off-by: Sambhav Kothari <skothari44@bloomberg.net>
---
 platform.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platform.md b/platform.md
index 3eb707c6..ee821eb7 100644
--- a/platform.md
+++ b/platform.md
@@ -577,7 +577,7 @@ Usage:
     - MUST contain a layer containing all buildpack-provided Software Bill of Materials (SBOM) files for `launch` as determined by the [Buildpack Interface Specfication](buildpack.md) if they are present
       - `<layers>/sbom/launch/<buildpack-id>/sbom.<ext>` MUST contain the buildpack-provided `launch` SBOM
       - `<layers>/sbom/launch/<buildpack-id>/<layer-id>/sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is a `launch` layer
-      - `<layers>/sbom/launch/<buildpack-id>/sbom.legacy.json` MAY contain the legacy non-standard Bill of Materials for `launch` (where [supported](buildpack.md))
+      - `<layers>/sbom/launch/sbom.legacy.json` MAY contain the legacy non-standard Bill of Materials for `launch` (where [supported](buildpack.md))
     - MUST contain one or more app layers as determined by the [Buildpack Interface Specfication](buildpack.md)
     - MUST contain one or more launcher layers that include:
         - A file with the contents of the `<launcher>` file at path `/cnb/lifecycle/launcher`
@@ -609,8 +609,8 @@ Usage:
 - The `<layers>` directory:
   - MUST include all buildpack-provided Software Bill of Materials (SBOM) files for `build` as determined by the [Buildpack Interface Specfication](buildpack.md) if they are present
     - `<layers>/sbom/build/<buildpack-id>/sbom.<ext>` MUST contain the buildpack-provided `build` SBOM
-    - `<layers>/sbom/build/<buildpack-id>/<layer-id>/sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is not a `launch` layer    - `<layers>/sbom/build/<buildpack-id>/sbom.legacy.json` MAY contain the legacy non-standard Bill of Materials for `build` (where [supported](buildpack.md))
-    - `<layers>/sbom/build/<buildpack-id>/sbom.legacy.json` MAY contain the legacy non-standard Bill of Materials for `build` (where [supported](buildpack.md))
+    - `<layers>/sbom/build/<buildpack-id>/<layer-id>/sbom.<ext>` MUST contain the buildpack-provided layer SBOM if `<layer-id>` is not a `launch` layer.
+    - `<layers>/sbom/build/sbom.legacy.json` MAY contain the legacy non-standard Bill of Materials for `build` (where [supported](buildpack.md))
 - *If* a cache is provided the lifecycle:
    - SHALL write the contents of all cached layers and any provided layer-associated SBOM files to the cache
    - SHALL record the diffID and layer content metadata of all cached layers in the cache

From a3ff2cbe3897309f2ce0dccd74828372276b5c6f Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 16 Mar 2022 10:09:25 -0400
Subject: [PATCH 50/53] Remove superfluous wording in reproducibility

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/platform.md b/platform.md
index ea8f592f..1384d15a 100644
--- a/platform.md
+++ b/platform.md
@@ -873,9 +873,6 @@ To achieve reproducibility the lifecycle SHOULD set the following to a constant,
 - file modification times in generated layers
 - image creation time
 
-The platform MAY set `SOURCE_DATE_EPOCH`  in the lifecycle execution environment, where the value of `SOURCE_DATE_EPOCH` MUST be a [UNIX timestamp](https://reproducible-builds.org/specs/source-date-epoch/).
-If `SOURCE_DATE_EPOCH` is set, the lifecycle SHOULD set the image creation time to its value.
-
 Because compressions algorithms and manifest whitespace affect the image digest, an app image exported to the docker daemon and subsequently pushed to a registry MAY have a different digest than an app image exported directly to a registry by the lifecycle, even when all other inputs are held constant.
 
 If buildpacks do not generate layer contents or layer metadata reproducibly, builds MAY NOT be reproducibile even when identical source code and buildpacks are provided to the lifecycle.

From e5db594303c96ff53e671ec4aa098e4d869d1e55 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 30 Mar 2022 15:05:18 -0400
Subject: [PATCH 51/53] Bump platform version

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 platform.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform.md b/platform.md
index 6dcfe62c..4cbf40cf 100644
--- a/platform.md
+++ b/platform.md
@@ -87,7 +87,7 @@ Examples of a platform might include:
 
 ## Platform API Version
 
-This document specifies Platform API version `0.8`.
+This document specifies Platform API version `0.9`.
 
 Platform API versions:
  - MUST be in form `<major>.<minor>` or `<major>`, where `<major>` is equivalent to `<major>.0`

From 58cd5509d555c7335ed94e7d0b1b3f03550bdac2 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 30 Mar 2022 15:55:03 -0400
Subject: [PATCH 52/53] Bump versions in README

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8ba3162e..025ab99e 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,6 @@ When the specification refers to a path in the context of an OCI layer tar (e.g.
 
 These documents currently specify:
 
-- Buildpack API: `0.6`
+- Buildpack API: `0.8`
 - Distribution API: `0.3`
-- Platform API: `0.7`
+- Platform API: `0.9`

From 31b1cf7707ae2f061d2066f8d55271958b75e365 Mon Sep 17 00:00:00 2001
From: Natalie Arellano <narellano@vmware.com>
Date: Wed, 6 Apr 2022 13:46:07 -0400
Subject: [PATCH 53/53] Move buildpack api version bump to other PR

Signed-off-by: Natalie Arellano <narellano@vmware.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 025ab99e..5cab2152 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,6 @@ When the specification refers to a path in the context of an OCI layer tar (e.g.
 
 These documents currently specify:
 
-- Buildpack API: `0.8`
+- Buildpack API: `0.6`
 - Distribution API: `0.3`
 - Platform API: `0.9`