update POM.xml CMA to use 2.0.0; update build to work with Java 17

podaac · Oct 11, 2023 · 6a688e8 · 6a688e8
1 parent 97c0fb0
commit 6a688e8
Show file tree

Hide file tree

Showing 27 changed files with 54 additions and 48 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'java'
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 17
+targetCompatibility = 17
 
 dependencies {
     implementation fileTree(dir: 'target/dependency/', include: '*.jar')

diff --git a/pom.xml b/pom.xml
@@ -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>

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() {

diff --git a/src/main/java/gov/nasa/podaac/inventory/model/Granule.java b/src/main/java/gov/nasa/podaac/inventory/model/Granule.java
@@ -78,39 +78,39 @@ public Granule(String name, Date startTime, Date requestedTime, Date acquiredTim
 
 		this.name = name;
 		try{
-		this.startTimeLong = new Long(startTime.getTime());
+		this.startTimeLong = startTime.getTime();
 		}catch(NullPointerException npe)
 		{
 			this.startTimeLong = null;
 		}
 		try{
-		this.stopTimeLong = new Long(stopTime.getTime());
+		this.stopTimeLong = stopTime.getTime();
 		}catch(NullPointerException npe)
 		{
 			this.stopTimeLong = null;
 		}
 
 		try{
-		this.createTimeLong = new Long(createTime.getTime());
+		this.createTimeLong = createTime.getTime();
 		}catch(NullPointerException npe)
 		{
 			this.createTimeLong = null;
 		}
 		try{
-		this.ingestTimeLong = new Long(ingestTime.getTime());
+		this.ingestTimeLong = ingestTime.getTime();
 		}catch(NullPointerException npe)
 		{
 			this.ingestTimeLong = null;
 		}
 		this.version = version;
 		try{
-		this.requestedTimeLong = new Long(requestedTime.getTime());
+		this.requestedTimeLong = requestedTime.getTime();
 		}catch(NullPointerException npe)
 		{
 			this.requestedTimeLong = null;
 		}
 		try{
-		this.acquiredTimeLong = new Long(acquiredTime.getTime());
+		this.acquiredTimeLong = acquiredTime.getTime();
 		}catch(NullPointerException npe)
 		{
 			this.acquiredTimeLong = null;
@@ -121,7 +121,7 @@ public Granule(String name, Date startTime, Date requestedTime, Date acquiredTim
 		this.checksumType = checksumType;
 		this.status = status;
 		try{
-		this.archiveTimeLong = new Long(archiveTime.getTime());
+		this.archiveTimeLong = archiveTime.getTime();
 		}catch(NullPointerException npe)
 		{
 			this.archiveTimeLong = null;
@@ -197,7 +197,7 @@ public Date getStartTime() {
 
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
-		this.startTimeLong = new Long(startTime.getTime());
+		this.startTimeLong = startTime.getTime();
 	}
 
 	public Date getStopTime() {
@@ -206,7 +206,7 @@ public Date getStopTime() {
 
 	public void setStopTime(Date stopTime) {
 		this.stopTime = stopTime;
-		this.stopTimeLong = new Long(stopTime.getTime());
+		this.stopTimeLong = stopTime.getTime();
 	}
 
 
@@ -216,15 +216,15 @@ public Date getAcquiredTime() {
 
 	public void setAcquiredTime(Date acquiredTime) {
 		this.acquiredTime = acquiredTime;
-		this.acquiredTimeLong = new Long(acquiredTime.getTime());
+		this.acquiredTimeLong = acquiredTime.getTime();
 	}
 	public Date getRequestedTime() {
 		return requestedTime;
 	}
 
 	public void setRequestedTime(Date requestedTime) {
 		this.requestedTime = requestedTime;
-		this.requestedTimeLong = new Long(requestedTime.getTime());
+		this.requestedTimeLong = requestedTime.getTime();
 	}
 
 	public Date getArchiveTime() {
@@ -233,7 +233,7 @@ public Date getArchiveTime() {
 
 	public void setArchiveTime(Date archiveTime) {
 		this.archiveTime = archiveTime;
-		this.archiveTimeLong = new Long(archiveTime.getTime());
+		this.archiveTimeLong = archiveTime.getTime();
 	}
 
 	public Date getCreateTime() {
@@ -242,7 +242,7 @@ public Date getCreateTime() {
 
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
-		this.createTimeLong = new Long(createTime.getTime());
+		this.createTimeLong = createTime.getTime();
 	}
 
 	public Date getIngestTime() {
@@ -251,7 +251,7 @@ public Date getIngestTime() {
 
 	public void setIngestTime(Date ingestTime) {
 		this.ingestTime = ingestTime;
-		this.ingestTimeLong = new Long(ingestTime.getTime());
+		this.ingestTimeLong = ingestTime.getTime();
 	}
 
 	public Date getVerifyTime() {
@@ -260,7 +260,7 @@ public Date getVerifyTime() {
 
 	public void setVerifyTime(Date verifyTime) {
 		this.verifyTime = verifyTime;
-		this.verifyTimeLong =  new Long(verifyTime.getTime());
+		this.verifyTimeLong = verifyTime.getTime();
 	}
 
 	public Integer getVersion() {

diff --git a/src/main/java/gov/nasa/podaac/inventory/model/GranuleDateTime.java b/src/main/java/gov/nasa/podaac/inventory/model/GranuleDateTime.java
@@ -27,7 +27,7 @@ public GranuleDateTime(DatasetElement element, Date keyValue) {
 		this.datasetElement = element;
 		this.value = keyValue;
 		try{
-		this.valueLong = new Long(keyValue.getTime());
+			this.valueLong = keyValue.getTime();
 		}catch(NullPointerException npe)
 		{
 			this.valueLong = null;
@@ -75,7 +75,7 @@ public Long getValueLong() {
 
 	public void setValue(Date value) {
 		this.value = value;
-		this.valueLong = new Long(value.getTime());
+		this.valueLong = value.getTime();
 	}
 
 	@Override