Merge pull request #236 from cumulus-nasa/v1.1.1

V1.1.1
nasa · Mar 8, 2018 · 581e71b · 581e71b
2 parents a719897 + 8452bac
commit 581e71b
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v1.1.1] - 2018-03-08
+
 ### Removed
 - Unused queue lambda in api/lambdas [CUMULUS-359]
 
@@ -46,7 +48,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [v1.0.0] - 2018-02-23
 
-[Unreleased]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/cumulus-nasa/cumulus/compare/v1.1.1...HEAD
+[v1.1.1]: https://github.com/cumulus-nasa/cumulus/compare/v1.0.1...v1.1.1
 [v1.1.0]: https://github.com/cumulus-nasa/cumulus/compare/v1.0.1...v1.1.0
 [v1.0.1]: https://github.com/cumulus-nasa/cumulus/compare/v1.0.0...v1.0.1
 [v1.0.0]: https://github.com/cumulus-nasa/cumulus/compare/pre-v1-release...v1.0.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -41,4 +41,8 @@ Improve contributing guidelines. Fixes #10
 Improve contributing docs and consolidate them in the standard location https://help.github.com/articles/setting-guidelines-for-repository-contributors/
 ```
 
+### Changelog
+
+Changes should be documented in CHANGELOG.md. Update the changelog with a description of the changes, including the JIRA issue number. The format should follow [this standard](http://keepachangelog.com/en/1.0.0/).
+
 ### For more information on Cumulus governance, see the [Cumulus Code Contribution Guidelines](https://docs.google.com/document/d/14J_DS6nyQ32BpeVjdR-YKfzHAzFB299tKghPGshXUTU/edit) and [the Cumulus Wiki](https://wiki.earthdata.nasa.gov/display/CUMULUS/Cumulus).
diff --git a/README.md b/README.md
@@ -89,19 +89,19 @@ Read more about the semantic versioning [here](https://docs.npmjs.com/getting-st
 
 ### Update the Cumulus Version number
 
-Every Pull Request that makes a change to the cumulus code base must update the Cumulus version number using semantic versioning.
+When changes are ready to be released, the Cumulus version number must be updated using semantic versioning.
 
 Lerna handles the process of deciding which version number should be used as long as the developer decides whether the change is a patch or a minor/major change.
 
 To update cumulus' version number run:
 
      $ npm run update
 
-You will be prompted to select the type of change (patch/minor/major). Until the final version 1.0.0 of cumulus is released, you MUST select `prerelease` from the list.
+You will be prompted to select the type of change (patch/minor/major). 
 
-Lerna will update the version of all packages after the selection. You then have to commit the changes that are made by Lerna.
+Lerna will update the version of all packages after the selection. You then have to commit the changes that are made by Lerna. Update the CHANGELOG.md. Put a header under the 'Unreleased' section with the a version number and the date. Commit these changes as well.
 
-This must be the final step of your PR submission. Any PR submission that does not include a version update will be rejected.
+The version number updates should be put in a PR and committed to master along with the changelog updates. After merging to master, tag the master branch with a release using the new version number.
 
 ### Publishing to NPM
 

diff --git a/cumulus/tasks/discover-granules/package.json b/cumulus/tasks/discover-granules/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/discover-granules",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Discover Granules in FTP/HTTP/SFTP endpoints",
   "main": "index.js",
   "directories": {
@@ -39,7 +39,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.0",
     "@cumulus/cumulus-message-adapter-js": "0.0.1-beta.3",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

diff --git a/cumulus/tasks/discover-pdr/package.json b/cumulus/tasks/discover-pdr/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/discover-pdr",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "SIPS handler PDR discovery task",
   "main": "index.js",
   "keywords": [
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "ftp": "^0.3.10",
     "node-fetch": "^1.6.1",
     "parse-duration": "^0.1.1",

diff --git a/cumulus/tasks/discover-pdrs/package.json b/cumulus/tasks/discover-pdrs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/discover-pdrs",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Discover PDRs in FTP and HTTP endpoints",
   "main": "index.js",
   "directories": {
@@ -38,7 +38,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.0",
     "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

diff --git a/cumulus/tasks/discover-s3-granules/package.json b/cumulus/tasks/discover-s3-granules/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/discover-s3-granules",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Discover granules from an S3 bucket",
   "main": "index.js",
   "directories": {
@@ -37,7 +37,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.0",
     "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

diff --git a/cumulus/tasks/generate-pdr-file-list/package.json b/cumulus/tasks/generate-pdr-file-list/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/generate-pdr-file-list",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "SIPS handler PDR processing task",
   "main": "index.js",
   "keywords": [
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/pvl": "^1.0.0",
     "ftp": "^0.3.10",
     "node-fetch": "^1.6.1",

diff --git a/cumulus/tasks/parse-pdr/package.json b/cumulus/tasks/parse-pdr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/parse-pdr",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Download and Parse a given PDR",
   "main": "index.js",
   "directories": {
@@ -41,7 +41,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.0",
     "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

diff --git a/cumulus/tasks/pdr-status-check/package.json b/cumulus/tasks/pdr-status-check/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/pdr-status-check",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Checks execution status of granules in a PDR",
   "main": "index.js",
   "directories": {
@@ -42,7 +42,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.0",
     "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

diff --git a/cumulus/tasks/post-to-cmr/package.json b/cumulus/tasks/post-to-cmr/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/post-to-cmr",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Post a given granule to CMR",
   "main": "index.js",
   "directories": {
@@ -44,7 +44,7 @@
     "@cumulus/cmrjs": "^1.1.0",
     "@cumulus/common": "^1.1.0",
     "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

diff --git a/cumulus/tasks/queue-granules/package.json b/cumulus/tasks/queue-granules/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/queue-granules",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Add discovered granules to the queue",
   "main": "index.js",
   "directories": {
@@ -40,7 +40,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.0",
     "@cumulus/cumulus-message-adapter-js": "0.0.1-beta.3",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-async-to-generator": "^6.24.1",

diff --git a/cumulus/tasks/queue-pdrs/package.json b/cumulus/tasks/queue-pdrs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/queue-pdrs",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Add discovered PDRs to a queue",
   "main": "index.js",
   "directories": {
@@ -39,7 +39,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.0",
     "@cumulus/cumulus-message-adapter-js": "0.0.1-beta.3",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",
     "babel-plugin-transform-async-to-generator": "^6.24.1",

diff --git a/cumulus/tasks/sync-granule/package.json b/cumulus/tasks/sync-granule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/sync-granule",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Download a given granule",
   "main": "index.js",
   "directories": {
@@ -43,7 +43,7 @@
   "dependencies": {
     "@cumulus/common": "^1.1.0",
     "@cumulus/cumulus-message-adapter-js": "~0.0.1-beta.3",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/test-data": "^1.1.0",
     "babel-core": "^6.25.0",
     "babel-loader": "^6.2.4",

diff --git a/cumulus/tasks/validate-pdr/package.json b/cumulus/tasks/validate-pdr/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cumulus/validate-pdr",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "SIPS handler PDR processing task",
   "main": "index.js",
   "keywords": [
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@cumulus/common": "^1.1.0",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/pvl": "^1.0.0",
     "ftp": "^0.3.10",
     "node-fetch": "^1.6.1",

diff --git a/lerna.json b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "2.9.0",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "packages": [
     "packages/*",
     "cumulus/tasks/*",

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/api",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Lambda functions for handling all daac's API operations",
   "main": "index.js",
   "scripts": {
@@ -34,7 +34,7 @@
   "dependencies": {
     "@cumulus/cmrjs": "^1.1.0",
     "@cumulus/common": "^1.1.0",
-    "@cumulus/ingest": "^1.1.0",
+    "@cumulus/ingest": "^1.1.1",
     "@cumulus/pvl": "^1.0.0",
     "ajv": "^5.2.2",
     "aws-sdk": "^2.95.0",

diff --git a/packages/ingest/package.json b/packages/ingest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cumulus/ingest",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Ingest utilities",
   "scripts": {
     "test": "env TEST=true ava"