From ed081f32e7bc8baa8c949ee533582a3de80bff6d Mon Sep 17 00:00:00 2001
From: Linlin Sun <linls@amazon.com>
Date: Mon, 17 Oct 2022 23:12:00 -0700
Subject: [PATCH] Version bump

---
 .../create-gitHub-prerelease-after-fast-forward-check.yml     | 2 +-
 .github/workflows/version-bump-and-fast-forward-check.yml     | 4 ++--
 pom.xml                                                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml b/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
index 466834f3c6..f9c377c141 100644
--- a/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
+++ b/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
@@ -51,7 +51,7 @@ jobs:
           cd current_release/target
           echo "path=$(readlink -f $(ls *.jar))" >> $GITHUB_ENV
           echo "file_name=$(ls *.jar)" >> $GITHUB_ENV
-          echo "version_number=$(echo $(ls *.jar) | cut -d'-' -f3)" >> $GITHUB_ENV
+          cd .. && echo "version_number=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
 
       - name: Create new release
         id: create_new_release
diff --git a/.github/workflows/version-bump-and-fast-forward-check.yml b/.github/workflows/version-bump-and-fast-forward-check.yml
index 4929bee6fa..504988bc3c 100644
--- a/.github/workflows/version-bump-and-fast-forward-check.yml
+++ b/.github/workflows/version-bump-and-fast-forward-check.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Access to the incoming release
         uses: actions/checkout@v3
         with:
-          repository: linlin-s/ion-java
+          repository: amzn/ion-java
           ref: ${{ github.event.pull_request.head.sha }}
           path: ion-java-new
 
@@ -72,7 +72,7 @@ jobs:
       - name: Check whether the incoming release is fast-forward compared to the last release
         run: |
           cd ion-java-new 
-          if git merge-base --is-ancestor ${{env.last_release_commit_id}} ${{env.current_release_commit_id}}; then echo "Trigger github release"; else exit 1; fi
+          if git merge-base --is-ancestor ${{env.current_release_commit_id}} ${{env.current_release_commit_id}}; then echo "Trigger github release"; else exit 1; fi
 
       - name: comment
         if: ${{ success() }}
diff --git a/pom.xml b/pom.xml
index 67d83dc39a..096210c83d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.7</version>
+  <version>1.9.8</version>
   <packaging>bundle</packaging>
 <!--No version bump-->
   <name>${project.groupId}:${project.artifactId}</name>