From 2a4abfb5dc39abe0871a33338b4d53b089f6ff85 Mon Sep 17 00:00:00 2001 From: podaac-cloud-IandA Date: Tue, 2 Jan 2024 17:08:42 +0000 Subject: [PATCH 1/5] /version 1.8.0-alpha.0-SNAPSHOT [skip actions] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4992543..1642190 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ gov.nasa.cumulus cnm-to-granule - 1.8.0 + 1.8.0-alpha.0-SNAPSHOT jar cnm-to-granule From ad765bf852fcec73148a6bf298f89dd01ad41bca Mon Sep 17 00:00:00 2001 From: hailiangzhang Date: Wed, 6 Mar 2024 16:31:51 -0500 Subject: [PATCH 2/5] Add the "fileName" and "key" properties as listed in the later version of the cumulus granule file schema (#216) * add fileName property in buildS3GranuleFile function * add key property in buildS3GranuleFile function * fix key property in buildS3GranuleFile function * script comments added * add changes to CHANGELOG.md * adapt changes to CHANGELOG.md --------- Co-authored-by: Hailiang Zhang --- CHANGELOG.md | 4 +++- src/main/java/gov/nasa/cumulus/CnmToGranuleHandler.java | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be0398d..749a2a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [1.8.0] ### Added +- **User contribution** + - Add the "fileName" and "key" properties to the granuleFile object from buildS3GranuleFile function ### Changed - **PODAAC-5877** - Support java 11 @@ -168,4 +170,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed -### Security \ No newline at end of file +### Security diff --git a/src/main/java/gov/nasa/cumulus/CnmToGranuleHandler.java b/src/main/java/gov/nasa/cumulus/CnmToGranuleHandler.java index f2adac5..ea737c7 100644 --- a/src/main/java/gov/nasa/cumulus/CnmToGranuleHandler.java +++ b/src/main/java/gov/nasa/cumulus/CnmToGranuleHandler.java @@ -208,6 +208,10 @@ public JsonObject buildS3GranuleFile(JsonObject cnmFile) { granuleFile.addProperty("checksum", cnmFile.get("checksum").getAsString()); } granuleFile.addProperty("type", cnmFile.get("type").getAsString()); + + // Add the "fileName" and "key" properties as listed in the later version of the cumulus granule file schema + granuleFile.addProperty("fileName", cnmFile.get("name").getAsString()); + granuleFile.addProperty("key", url_path + '/' + cnmFile.get("name").getAsString()); return granuleFile; } From 22cac97926c254099739c5832fd23fe61fbaeda3 Mon Sep 17 00:00:00 2001 From: podaac-cloud-IandA Date: Wed, 6 Mar 2024 21:33:23 +0000 Subject: [PATCH 3/5] /version 1.8.0-alpha.1-SNAPSHOT [skip actions] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1642190..1ae205d 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ gov.nasa.cumulus cnm-to-granule - 1.8.0-alpha.0-SNAPSHOT + 1.8.0-alpha.1-SNAPSHOT jar cnm-to-granule From fa4e9826d14157ee5d7bbff522072301bdce7ee8 Mon Sep 17 00:00:00 2001 From: Frank Greguska <89428916+frankinspace@users.noreply.github.com> Date: Wed, 6 Mar 2024 13:38:50 -0800 Subject: [PATCH 4/5] [Snyk] Security upgrade com.amazonaws:aws-java-sdk-s3 from 1.12.565 to 1.12.661 (#215) * fix: pom.xml to reduce vulnerabilities The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-JAVA-SOFTWAREAMAZONION-6153869 * update changelog with snyk entry --------- Co-authored-by: snyk-bot Co-authored-by: Stepheny Perez Co-authored-by: skorper --- CHANGELOG.md | 1 + pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) mode change 100755 => 100644 pom.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 749a2a0..3c7d9a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed ### Fixed ### Security +- Snyk: Upgrade com.amazonaws:aws-java-sdk-s3: 1.12.565 -> 1.12.661 ## [v1.7.0] - 2022-12-12 ### Added diff --git a/pom.xml b/pom.xml old mode 100755 new mode 100644 index 1ae205d..900d516 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,7 @@ com.amazonaws aws-java-sdk-s3 - 1.12.565 + 1.12.661 com.fasterxml.jackson.core From 57f6d59a70fa6abae7ee71a79c6350dd912d10ca Mon Sep 17 00:00:00 2001 From: podaac-cloud-IandA Date: Wed, 6 Mar 2024 21:40:16 +0000 Subject: [PATCH 5/5] /version 1.8.0-alpha.2-SNAPSHOT [skip actions] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 pom.xml diff --git a/pom.xml b/pom.xml old mode 100644 new mode 100755 index 900d516..aab64fd --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ gov.nasa.cumulus cnm-to-granule - 1.8.0-alpha.1-SNAPSHOT + 1.8.0-alpha.2-SNAPSHOT jar cnm-to-granule