Merge pull request #48 from usdot-jpo-ode/release/2025-q1

Merge Release/2025 q1 into master

.devcontainer/devcontainer.json

@@ -3,19 +3,15 @@
 {
 	"name": "Java",
 	"build": {
-		"dockerfile": "Dockerfile",
+		"dockerfile": "Dockerfile"
 	},
 
 	// Set *default* container specific settings.json values on container create.
-	"settings": { 
-		"java.home": "/docker-java-home"
+	"customizations": {
+		"extensions": [
+			"vscjava.vscode-java-pack"
+		]
 	},
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"vscjava.vscode-java-pack"
-	],
-
 
 	"containerEnv": {
 		"SHELL": "/bin/bash"

Dockerfile

@@ -1,6 +1,6 @@
 # Build container
-FROM maven:3.8-eclipse-temurin-21-alpine as builder
-MAINTAINER [email protected]
+FROM maven:3.8-eclipse-temurin-21-alpine AS builder
+LABEL maintainer="[email protected]"
 
 WORKDIR /home
 
@@ -14,8 +14,10 @@ RUN mvn clean package -DskipTests
 FROM eclipse-temurin:21-jre-alpine
 
 WORKDIR /home
-COPY --from=builder /home/target/jpo-sdw-depositor-1.8.0-SNAPSHOT.jar /home
+# Copy the jar file from the builder image to the new image 
+# since we run mvn clean package, there should only be one jar file in the target directory, and we can safely copy it with a wildcard
+COPY --from=builder /home/target/jpo-sdw-depositor-*.jar /home/jpo-sdw-depositor.jar
 
 ENTRYPOINT ["java", \
 	"-jar", \
-	"/home/jpo-sdw-depositor-1.8.0-SNAPSHOT.jar"]
+	"/home/jpo-sdw-depositor.jar"]

docs/Release_notes.md

@@ -1,14 +1,33 @@
 jpo-sdw-depositor Release Notes
 ----------------------------
 
+Version 1.9.0, released January 2025
+----------------------------------------
+### **Summary**
+The jpo-sdw-depositor 1.9.0 release simplifies and improves the Docker build process by automating the handling of 
+versioned jar files, eliminating the need for manual updates to the Dockerfile with each new version. The Dockerfile now
+ensures versioned jars are copied to an unversioned name within the Docker image, allowing the application to reference 
+a static file name while preserving versioned jars for distribution. Additionally, polish updates were made to modernize 
+and streamline the build process, including replacing the deprecated MAINTAINER field with LABEL maintainer, resolving 
+casing inconsistencies in Docker commands, and cleaning up unnecessary configurations in .devcontainer.json based on 
+linter recommendations. These changes enhance reliability and maintainability while reducing the risk of errors.
+
+Enhancements in this release:
+- [CDOT PR 28](https://github.com/CDOT-CV/jpo-sdw-depositor/pull/28): Dockerfile jar rename
+- [CDOT PR 30](https://github.com/CDOT-CV/jpo-sdw-depositor/pull/30): Fixed Dockerfile to correctly copy JAR after version update (SNAPSHOT removal)
+
+Known issues:
+- No known issues at this time.
+
+
 Version 1.8.0, released September 2024
 ----------------------------------------
 ### **Summary**
 The changes for the jpo-sdw-depositor 1.8.0 release include a fix for the SDW_SUBSCRIPTION_TOPIC environment variable not getting used instead of the default if provided, as well as the addition of a GitHub action to publish Java artifacts to GitHub's hosted Maven Central.
 
 Enhancements in this release:
 - CDOT PR 24: Fixed SDW_SUBSCRIPTION_TOPIC environment variable not getting used instead of default if provided
-- CDOT PR 25: Added a GiHub action to opublish java artifacts to GitHub's hosted Maven Central
+- CDOT PR 25: Added a GitHub action to publish java artifacts to GitHub's hosted Maven Central
 
 
 Version 1.7.0, released June 2024

pom.xml

@@ -13,7 +13,7 @@
    </parent>
    <groupId>usdot.jpo.ode</groupId>
    <artifactId>jpo-sdw-depositor</artifactId>
-   <version>1.8.0-SNAPSHOT</version>
+   <version>1.9.0</version>
    <packaging>jar</packaging>
    <name>jpo-sdw-depositor</name>