[PODAAC-5876] Update to use CMA 2.0.0, allowing CMA Layer 2.0.3 to be…

… used (#67) * update POM.xml CMA to use 2.0.0; update build to work with Java 17 * using Java 11 for build * update github actions java version * update changelog.md
podaac · Oct 13, 2023 · d696ee6 · d696ee6
1 parent 97c0fb0
commit d696ee6
Show file tree

Hide file tree

Showing 29 changed files with 69 additions and 53 deletions.
diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '8.0.232'
+          java-version: '11.0.6'
       - uses: gradle/gradle-build-action@v1
         with:
           gradle-version: 8.0.1

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+### Added
+- **PODAAC-5876**
+  - Update to use CMA 2.0.0, thus allowing 2.0.3 layer for lambda
+  - Update build to use java 11
+### Deprecated
+### Removed
+### Fixed
+### Security
+
 ## [8.5.0]
 ### Added
 - **PODAAC-5594**

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'java'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 11
+targetCompatibility = 11
 
 dependencies {
     implementation fileTree(dir: 'target/dependency/', include: '*.jar')

diff --git a/pom.xml b/pom.xml
@@ -22,8 +22,8 @@
   <url>TODO</url>
 
   <properties>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
   </properties>
@@ -39,7 +39,7 @@
     <dependency>
       <groupId>gov.nasa.earthdata</groupId>
       <artifactId>cumulus-message-adapter</artifactId>
-      <version>1.3.9</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
@@ -133,6 +133,12 @@
       <version>4.5.1</version>
       <scope>test</scope>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.3.1</version>
+    </dependency>
   </dependencies>
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
@@ -172,7 +178,7 @@
       <plugin>
         <groupId>org.jsonschema2pojo</groupId>
         <artifactId>jsonschema2pojo-maven-plugin</artifactId>
-        <version>1.0.2</version>
+        <version>1.2.1</version>
         <configuration>
           <sourceDirectory>${basedir}/src/main/resources/jsonschema</sourceDirectory>
           <outputDirectory>src/main/java</outputDirectory>

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/AdditionalAttributeType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/AdditionalAttributeType.java
@@ -3,7 +3,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/BoundaryType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/BoundaryType.java
@@ -3,7 +3,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/BoundingRectangleType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/BoundingRectangleType.java
@@ -1,7 +1,7 @@
 
 package gov.nasa.cumulus.metadata.umm.generated;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/ExclusiveZoneType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/ExclusiveZoneType.java
@@ -3,7 +3,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/GPolygonType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/GPolygonType.java
@@ -1,7 +1,7 @@
 
 package gov.nasa.cumulus.metadata.umm.generated;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/GeometryType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/GeometryType.java
@@ -3,7 +3,7 @@
 
 import java.util.LinkedHashSet;
 import java.util.Set;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/HorizontalSpatialDomainType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/HorizontalSpatialDomainType.java
@@ -1,7 +1,7 @@
 
 package gov.nasa.cumulus.metadata.umm.generated;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/LineType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/LineType.java
@@ -3,7 +3,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/OrbitType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/OrbitType.java
@@ -3,7 +3,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/PointType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/PointType.java
@@ -1,7 +1,7 @@
 
 package gov.nasa.cumulus.metadata.umm.generated;
 
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/RelatedUrlType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/RelatedUrlType.java
@@ -3,7 +3,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/SpatialExtentType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/SpatialExtentType.java
@@ -3,7 +3,7 @@
 
 import java.util.LinkedHashSet;
 import java.util.Set;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/TrackPassTileType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/TrackPassTileType.java
@@ -3,7 +3,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/TrackType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/TrackType.java
@@ -3,7 +3,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/cumulus/metadata/umm/generated/VerticalSpatialDomainType.java b/src/main/java/gov/nasa/cumulus/metadata/umm/generated/VerticalSpatialDomainType.java
@@ -3,7 +3,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 

diff --git a/src/main/java/gov/nasa/podaac/inventory/model/DatasetCitation.java b/src/main/java/gov/nasa/podaac/inventory/model/DatasetCitation.java
@@ -95,7 +95,7 @@ public Date getReleaseDate() {
 	 */
 	public void setReleaseDate(Date releaseDate) {
 		this.releaseDate = releaseDate;
-		this.releaseDateLong = new Long(releaseDate.getTime());
+		this.releaseDateLong = releaseDate.getTime();
 	}
 
 	public Long getReleaseDateLong() {

diff --git a/src/main/java/gov/nasa/podaac/inventory/model/DatasetCoverage.java b/src/main/java/gov/nasa/podaac/inventory/model/DatasetCoverage.java
@@ -147,7 +147,7 @@ public Date getStartTime() {
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
-		this.startTimeLong = new Long(startTime.getTime());
+		this.startTimeLong = startTime.getTime();
 	}
 	/**
 	 * @return the stopTime
@@ -160,7 +160,7 @@ public Date getStopTime() {
 	 */
 	public void setStopTime(Date stopTime) {
 		this.stopTime = stopTime;
-		this.stopTimeLong = new Long(stopTime.getTime());
+		this.stopTimeLong = stopTime.getTime();
 	}
 
 	public Long getStartTimeLong() {

diff --git a/src/main/java/gov/nasa/podaac/inventory/model/DatasetDateTime.java b/src/main/java/gov/nasa/podaac/inventory/model/DatasetDateTime.java
@@ -34,7 +34,7 @@ public DatasetDateTime() {
 	public DatasetDateTime(DatasetElement element, Date keyValue) {
 		this.datasetElement = element;
 		this.value = keyValue;
-		this.valueLong = new Long(value.getTime());
+		this.valueLong = keyValue.getTime();
 	}
 
 	public DatasetDateTime(DatasetElement element, Long keyValue) {
@@ -74,7 +74,7 @@ public Long getValueLong() {
 
 	public void setValue(Date value) {
 		this.value = value;
-		this.valueLong = new Long(value.getTime());
+		this.valueLong = value.getTime();
 	}
 
 

diff --git a/src/main/java/gov/nasa/podaac/inventory/model/DatasetMetaHistory.java b/src/main/java/gov/nasa/podaac/inventory/model/DatasetMetaHistory.java
@@ -78,7 +78,7 @@ public Date getEchoSubmitDate() {
 	}
 	public void setEchoSubmitDate(Date echoSubmitDate) {
 		this.echoSubmitDate = echoSubmitDate;
-		this.echoSubmitDateLong = new Long(echoSubmitDate.getTime());
+		this.echoSubmitDateLong = echoSubmitDate.getTime();
 	}
 
 	public Long getEchoSubmitDateLong() {
@@ -103,14 +103,14 @@ public Date getCreationDate() {
 	}
 	public void setCreationDate(Date creationDate) {
 		this.creationDate = creationDate;
-		this.creationDateLong = new Long(creationDate.getTime());
+		this.creationDateLong = creationDate.getTime();
 	}
 	public Date getLastRevisionDate() {
 		return lastRevisionDate;
 	}
 	public void setLastRevisionDate(Date lastRevisionDate) {
 		this.lastRevisionDate = lastRevisionDate;
-		this.lastRevisionDateLong = new Long(lastRevisionDate.getTime());
+		this.lastRevisionDateLong = lastRevisionDate.getTime();
 	}
 
 

diff --git a/src/main/java/gov/nasa/podaac/inventory/model/DatasetSoftware.java b/src/main/java/gov/nasa/podaac/inventory/model/DatasetSoftware.java
@@ -54,7 +54,7 @@ public Date getSoftwareDate() {
 	}
 	public void setSoftwareDate(Date softwareDate) {
 		this.softwareDate = softwareDate;
-		this.softwareDateLong = new Long(softwareDate.getTime());
+		this.softwareDateLong = softwareDate.getTime();
 	}
 
 	public Long getSoftwareDateLong() {

diff --git a/src/main/java/gov/nasa/podaac/inventory/model/DatasetVersion.java b/src/main/java/gov/nasa/podaac/inventory/model/DatasetVersion.java
@@ -79,7 +79,7 @@ public Date getVersionDate() {
 	}
 	public void setVersionDate(Date versionDate) {
 		this.versionDate = versionDate;
-		this.versionDateLong = new Long(versionDate.getTime());
+		this.versionDateLong = versionDate.getTime();
 	}
 
 	public Long getVersionDateLong() {