Merge pull request #34 from CDOT-CV/develop

Updated version to 1.6.0-SNAPSHOT & added release notes for v1.6.0
usdot-jpo-ode · Jan 31, 2024 · 4cc5b55 · 4cc5b55
2 parents 7c4b2a5 + ce9aeec
commit 4cc5b55
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,19 +13,19 @@ jobs:
      options: --user root
    steps:
      - name: Checkout ${{ github.event.repository.name }}
-       uses: actions/checkout@v3  
+       uses: actions/checkout@v4
      - name: Set up Maven
        uses: stCarolas/setup-maven@v4.5
        with:
-        maven-version: 3.8.2               
+        maven-version: 3.9.6
      - name: Build
        run: |
          cd $GITHUB_WORKSPACE
          ls -ls && pwd
          mvn -e -X clean org.jacoco:jacoco-maven-plugin:prepare-agent package
          mvn -e -X clean org.jacoco:jacoco-maven-plugin:report package
      - name: Archive code coverage results
-       uses: actions/upload-artifact@v3
+       uses: actions/upload-artifact@v4
        with:
          name: jpo-sdw-depositor
          path: /__w/jpo-sdw-depositor/jpo-sdw-depositor/target 
@@ -35,22 +35,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ${{ github.event.repository.name }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0   
       - name: Download code coverage results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: jpo-sdw-depositor
           path: home/runner/work/jpo-sdw-depositor/jpo-sdw-depositor/target     
       - name: Find jacoco.xml
         shell: bash
         run: |
           find "$GITHUB_WORKSPACE" -name "jacoco.xml"  
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'  
-          java-version: '21'
       - name: Setup SonarScanner
         uses: warchant/setup-sonar-scanner@v7
       - name: Generate sonar properties file

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -9,9 +9,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - run: ls -la & pwd
       - name: Build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -12,16 +12,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
           tags: usdotjpoode/jpo-sdw-depositor:${{ github.ref_name }}
diff --git a/Dockerfile b/Dockerfile
@@ -14,8 +14,8 @@ RUN mvn clean package -DskipTests
 FROM eclipse-temurin:21-jre-alpine
 
 WORKDIR /home
-COPY --from=builder /home/target/jpo-sdw-depositor-1.3.0.jar /home
+COPY --from=builder /home/target/jpo-sdw-depositor-1.6.0-SNAPSHOT.jar /home
 
 ENTRYPOINT ["java", \
 	"-jar", \
-	"/home/jpo-sdw-depositor-1.3.0.jar"]
+	"/home/jpo-sdw-depositor-1.6.0-SNAPSHOT.jar"]
diff --git a/docs/Release_notes.md b/docs/Release_notes.md
@@ -1,6 +1,20 @@
 Jpo-sdw-depositor Release Notes
 ----------------------------
 
+Version 1.6.0, released February 2024
+----------------------------------------
+
+### **Summary**
+The changes for the jpo-sdw-depositor 1.6.0 release include a java update & dockerhub image documentation.
+
+Enhancements in this release:
+- CDOT PR 12: Updated Java to v21
+- CDOT PR 11: Added dockerhub image documentation
+
+Known Issues:
+- No known issues at this time.
+
+
 Version 1.5.0, released November 2023
 ----------------------------------------
 

diff --git a/pom.xml b/pom.xml
@@ -13,7 +13,7 @@
    </parent>
    <groupId>usdot.jpo.ode</groupId>
    <artifactId>jpo-sdw-depositor</artifactId>
-   <version>1.3.0</version>
+   <version>1.6.0-SNAPSHOT</version>
    <packaging>jar</packaging>
    <name>jpo-sdw-depositor</name>