Fix script for cross-platform compatibility and robust version extraction

Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com>

Author: Copilot

.github/scripts/update-example-versions.sh

@@ -20,8 +20,9 @@ get_version_from_pom() {
     if command -v xmllint &> /dev/null; then
         xmllint --xpath '//*[local-name()="project"]/*[local-name()="version"]/text()' "$pom_file" 2>/dev/null | head -1
     else
-        # Fallback to grep/sed approach
-        grep -m 1 "^  <version>" "$pom_file" | sed 's/.*<version>\(.*\)<\/version>.*/\1/'
+        # Fallback to grep/sed approach - skip parent block, get project version
+        # First skip everything in the parent block, then get the first version tag
+        awk '/<parent>/,/<\/parent>/ {next} /<version>/ {print; exit}' "$pom_file" | sed 's/.*<version>\(.*\)<\/version>.*/\1/'
     fi
 }
 
@@ -64,12 +65,12 @@ main() {
         cp "$file" "$file.bak"
 
         # Replace version numbers in Maven dependency examples
-        # Pattern: <version>X.Y.Z</version> where X.Y.Z is a version number
+        # Pattern: <version>X.Y.Z</version> where X.Y.Z is a version number (or more components)
         # Only replace in dependency blocks (between <dependency> and </dependency>)
-        sed -i.tmp '/<dependency>/,/<\/dependency>/ s/<version>[0-9]\+\.[0-9]\+\.[0-9]\+<\/version>/<version>'"$RELEASE_VERSION"'<\/version>/g' "$file"
-        
-        # Clean up temporary file
-        rm -f "$file.tmp"
+        # Use a more flexible pattern to match versions with multiple components
+        # Use cross-platform sed syntax with explicit temp file
+        sed '/<dependency>/,/<\/dependency>/ s|<version>[^<]*</version>|<version>'"$RELEASE_VERSION"'</version>|g' "$file" > "$file.tmp"
+        mv "$file.tmp" "$file"
 
         # Check if file was modified
         if ! diff -q "$file" "$file.bak" > /dev/null 2>&1; then

.github/workflows/manual-release.yml

@@ -198,7 +198,8 @@ jobs:
             echo "Documentation examples updated with release version"
             
             # Amend the release commit created by release:prepare to include doc updates
-            git add README.md
+            # Add all modified files that the script may have updated
+            git add -u
             git commit --amend --no-edit
             
             # Update the tag to point to the amended commit

README.md

@@ -28,7 +28,7 @@ To use the xAPI Java Client include the appropriate XML in the `dependencies` se
         <dependency>
             <groupId>dev.learning.xapi</groupId>
             <artifactId>xapi-client</artifactId>
-            <version>1.1.11</version>
+            <version>1.1.21</version>
         </dependency>
     </dependencies>
 </project>
@@ -302,7 +302,7 @@ To use the xAPI Model Spring Boot Starter include the appropriate XML in the `de
 <dependency>
   <groupId>dev.learning.xapi</groupId>
   <artifactId>xapi-model-spring-boot-starter</artifactId>
-  <version>1.1.11</version>
+  <version>1.1.21</version>
 </dependency>
 ```
 
@@ -357,7 +357,7 @@ To use the xAPI Model include the appropriate XML in the `dependencies` section
         <dependency>
             <groupId>dev.learning.xapi</groupId>
             <artifactId>xapi-model</artifactId>
-            <version>1.1.11</version>
+            <version>1.1.21</version>
         </dependency>
     </dependencies>
 </project>