radiantearth · philvarner · Jun 21, 2021 · Jul 20, 2021 · Jul 30, 2021 · Jul 30, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   test_examples_node:
     working_directory: ~/stac
     docker:
-      - image: circleci/node:12
+      - image: cimg/node:18.18.0
     steps:
       - checkout
       - run:
@@ -27,7 +27,7 @@ jobs:
   test_docs:
     working_directory: ~/stac
     docker:
-      - image: circleci/node:12
+      - image: cimg/node:18.18.0
     steps:
       - checkout
       - run:
@@ -39,7 +39,7 @@ jobs:
   publish_schemas:
     working_directory: ~/stac
     docker:
-      - image: circleci/node:12
+      - image: cimg/node:18.18.0
     steps:
       - checkout
       - run:
@@ -63,4 +63,4 @@ workflows:
             tags:
               only: /^v.*/
             branches:
-              ignore: /^((?!dev).)*$/
+              only: main
diff --git a/.circleci/rc.yaml b/.circleci/rc.yaml
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,5 +1,5 @@
-**Related Issue(s):** #
-
+**Related Issue(s):**
+- #
 
 **Proposed Changes:**
 
@@ -8,7 +8,7 @@
 
 **PR Checklist:**
 
-- [ ] This PR is made against the dev branch (all proposed changes except releases should be against dev, not master).
+- [ ] This PR is made against the `main` branch
 - [ ] This PR has **no** breaking changes.
 - [ ] I have added my changes to the [CHANGELOG](https://github.com/radiantearth/stac-spec/blob/dev/CHANGELOG.md)
       **or** a CHANGELOG entry is not required.

diff --git a/.remarkignore b/.remarkignore
@@ -0,0 +1,3 @@
+/CODE_OF_CONDUCT.md
+/CHANGELOG.md
+.github/pull_request_template.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Added
+
+- The `keywords` field known from Collections is available in common metadata. ([#1187](https://github.com/radiantearth/stac-spec/issues/1187))
+
+### Changed
+
+- Validate common metadata also in Catalogs, Collections and Links.
+- Common metadata: If a description is given, require that it is not empty
+- Clarified that trailing slashes in URIs are significant. ([#1212](https://github.com/radiantearth/stac-spec/discussions/1212))
+
+### Removed
+
+- "Strongly recommended" language around `self` links in the item spec. ([#1173](https://github.com/radiantearth/stac-spec/pull/1173))
+
+### Fixed
+
+- Several typos and minor language changes
+
+### Fixed
+
+- Clarified that collection IDs should be unique across all collections in the corresponding root catalog.
+
 ## [v1.0.0] - 2021-05-25
 
 ### Added
@@ -452,7 +474,7 @@ See the [milestone 0.4.0 in the issue tracker](https://github.com/radiantearth/s
 
 Thanks @hgs-msmith, @matthewhanson, @hgs-trutherford, @rouault, @joshfix, @alkamin, @hemphillda, @jeffnaus  and @fredliporace for contributing to the spec directly, and to [everyone](https://github.com/opengeospatial/wfs3hackathon/blob/master/notes/introductions.md#participants) who participated in the [Ft Collins sprint](https://github.com/radiantearth/community-sprints/tree/master/03072018-ft-collins-co) and brought great ideas.
 
-[Unreleased]: <https://github.com/radiantearth/stac-spec/compare/master...dev>
+[Unreleased]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0...main>
 [v1.0.0]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-rc.4..v1.0.0>
 [v1.0.0-rc.4]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-rc.3..v1.0.0-rc.4>
 [v1.0.0-rc.3]: <https://github.com/radiantearth/stac-spec/compare/v1.0.0-rc.2..v1.0.0-rc.3>

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -2,75 +2,131 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-- Using welcoming and inclusive language
-- Being respectful of differing viewpoints and experiences
-- Gracefully accepting constructive criticism
-- Focusing on what is best for the community
-- Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-- The use of sexualized language or imagery and unwelcome sexual attention or
- advances
-- Trolling, insulting/derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or electronic
- address, without explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
- professional setting
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [[email protected]](mailto:[email protected]). All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
+reported to the community leaders responsible for enforcement at
+[[email protected]](mailto:[email protected]).
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
 
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
-[homepage]: <https://www.contributor-covenant.org>
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
 
-For answers to common questions about this code of conduct, see
-<https://www.contributor-covenant.org/faq>
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -18,15 +18,16 @@ this broader ecosystem, while keeping the core spec as stable as we can.
 ### Submitting Pull Requests
 
 Any proposed changes to the specification should be done as pull requests. Please make these
-requests against the [dev](https://github.com/radiantearth/stac-spec/tree/dev) branch (this will
-require you to switch from the default of 'master', which we keep so it displays first). 
+requests against the [main](https://github.com/radiantearth/stac-spec/tree/main) branch (this will
+require you to switch from the default of the most current version branch, which we keep so it
+displays first).
 
 Creating a Pull Request will show our PR template, which includes checkbox reminders for a number
 of things.
 
 - Adding an entry the [CHANGELOG](CHANGELOG.md). If the change is more editorial and minor then this 
 is not required, but any change to the actual specification should definitely have one.
-- Base the PR against dev, as mentioned above - even if the branch was made off of dev this reminds
+- Base the PR against main, as mentioned above - even if the branch was made off of main this reminds
 you to change the base in GitHub's PR creation page.
 - Make a ticket in the STAC API repo if anything here affects there.
 - Highlight if the PR makes breaking changes to the specification (in beta there can still be

diff --git a/README.md b/README.md
@@ -52,10 +52,11 @@ version of the spec. It is currently version **1.0.0** of the specification. The
 follows [Semantic Versioning](https://semver.org/), so any breaking change will require the spec to 
 go to 2.0.0. 
 
-The [dev](https://github.com/radiantearth/stac-spec/tree/dev) branch is where active development 
-takes place, and may have inconsistent examples. Whenever dev stabilizes, a release is cut and we 
-merge `dev` in to `master`. So `master` should be stable at any given time. 
-More information on how the STAC development process works can be found in 
+The [main](https://github.com/radiantearth/stac-spec/tree/main) branch is where active development 
+takes place, and may have inconsistent examples. Whenever `main` stabilizes, a release is cut and
+we tag `main` and create a new branch with the same name as the tag, e.g., `v1.0.0`, and set that branch as the
+default to represent the most stable release.
+More information on how the STAC development process works can be found in
 [process.md](process.md).
 
 ## Communication