Gemini feedback

Author: kabir

.enforcer-scripts/validate-jbang-versions.groovy

@@ -3,15 +3,13 @@ def scriptName = project.properties['jbang.script.name']
 
 // Fail if the script property is missing
 if (scriptName == null) {
-    System.err.println("[ERROR] JBang validator: No jbang.script.name set in properties")
     throw new IllegalStateException("[ERROR] JBang validator: No jbang.script.name set in properties")
 }
 
 def jbangFile = new File(project.basedir, scriptName)
 if (!jbangFile.exists()) {
     // If a script name was explicitly provided but doesn't exist, fail.
     // If using the fallback, we might want to just skip (return true).
-    System.err.println("[INFO] JBang validator: File not found: " + jbangFile.absolutePath)
     throw new IllegalStateException("[ERROR] JBang validator: File not found: " + jbangFile.absolutePath)
 }
 

RELEASE.md

@@ -27,6 +27,8 @@ The following secrets must be configured in GitHub repository settings:
 
 ## Release Steps
 
+The examples below use versions like `0.4.0.Alpha1-SNAPSHOT` and `0.4.0.Alpha1` for demonstration. Be sure to substitute these with the actual versions for your release.
+
 ### 1. Prepare Release Version
 
 Use the provided script to update all version numbers:
@@ -46,8 +48,8 @@ The script automatically updates:
 
 **What gets updated**:
 ```
-pom.xml:              0.3.0.Beta1-SNAPSHOT → 0.3.0.Beta1
-//DEPS io.github...:  0.3.0.Beta1-SNAPSHOT → 0.3.0.Beta1
+pom.xml:              0.4.0.Alpha1-SNAPSHOT → 0.4.0.Alpha1
+//DEPS io.github...:  0.4.0.Alpha1-SNAPSHOT → 0.4.0.Alpha1
 ```
 
 ### 2. Verify Changes
@@ -58,11 +60,8 @@ Review the changes before committing:
 # Review all changes
 git diff
 
-# Verify build with release profile
-mvn validate
-
-# Check that JBang validation passes
-cd examples/helloworld/client && mvn validate
+# Verify build works
+mvn clean install
 ```
 
 ### 3. Create Release PR

examples/helloworld/client/pom.xml

@@ -46,7 +46,6 @@
             <plugin>
                 <groupId>org.codehaus.gmavenplus</groupId>
                 <artifactId>gmavenplus-plugin</artifactId>
-                <version>3.0.2</version>
                 <executions>
                     <execution>
                         <id>validate-jbang-versions</id>
@@ -61,14 +60,6 @@
                         </configuration>
                     </execution>
                 </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.groovy</groupId>
-                        <artifactId>groovy</artifactId>
-                        <version>4.0.15</version>
-                        <scope>runtime</scope>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>

pom.xml

@@ -48,7 +48,9 @@
         <maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
         <maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
         <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
+        <gmavenplus-plugin.version>4.2.1</gmavenplus-plugin.version>
         <sonatype-central-publishing-plugin.version>0.8.0</sonatype-central-publishing-plugin.version>
+        <groovy.version>5.0.3</groovy.version>
         <gson.version>2.13.2</gson.version>
         <jakarta.enterprise.cdi-api.version>4.1.0</jakarta.enterprise.cdi-api.version>
         <jakarta.inject.jakarta.inject-api.version>2.0.1</jakarta.inject.jakarta.inject-api.version>
@@ -389,6 +391,25 @@
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.gmavenplus</groupId>
+                    <artifactId>gmavenplus-plugin</artifactId>
+                    <version>${gmavenplus-plugin.version}</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>org.apache.groovy</groupId>
+                            <artifactId>groovy</artifactId>
+                            <version>${groovy.version}</version>
+                            <scope>runtime</scope>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.groovy</groupId>
+                            <artifactId>groovy-ant</artifactId>
+                            <version>${groovy.version}</version>
+                            <scope>runtime</scope>
+                        </dependency>
+                    </dependencies>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>

update-version.sh

@@ -3,32 +3,36 @@
 # Update version across POMs and JBang scripts
 # Usage: ./update-version.sh FROM_VERSION TO_VERSION [--dry-run]
 
-set -e  # Exit on error
+set -euo pipefail # Exit on error, unset var, and pipe failure
 
 FROM_VERSION=$1
 TO_VERSION=$2
-DRY_RUN=false
-
-# Check for dry-run flag
-if [ "$3" = "--dry-run" ] || [ "$2" = "--dry-run" ]; then
-    DRY_RUN=true
-fi
 
 # Validate arguments
-if [ -z "$FROM_VERSION" ]; then
-    echo "❌ Error: No from version specified"
+if [ -z "$FROM_VERSION" ] || [ -z "$TO_VERSION" ]; then
+    echo "❌ Error: Missing version arguments."
     echo "Usage: $0 FROM_VERSION TO_VERSION [--dry-run]"
     echo "Example: $0 0.3.0.Beta1-SNAPSHOT 0.3.0.Beta1"
     exit 1
 fi
 
-if [ -z "$TO_VERSION" ] && [ "$FROM_VERSION" != "--dry-run" ]; then
-    echo "❌ Error: No to version specified"
+# Check if TO_VERSION looks like a flag
+if [[ "$TO_VERSION" == --* ]]; then
+    echo "❌ Error: TO_VERSION cannot be a flag. Did you mean to provide both FROM_VERSION and TO_VERSION?"
     echo "Usage: $0 FROM_VERSION TO_VERSION [--dry-run]"
     echo "Example: $0 0.3.0.Beta1-SNAPSHOT 0.3.0.Beta1"
     exit 1
 fi
 
+DRY_RUN=false
+if [ "$3" = "--dry-run" ]; then
+    DRY_RUN=true
+elif [ -n "$3" ]; then
+    echo "❌ Error: Invalid third argument. Only '--dry-run' is supported."
+    echo "Usage: $0 FROM_VERSION TO_VERSION [--dry-run]"
+    exit 1
+fi
+
 # Verify we're in the right directory
 if [ ! -f "pom.xml" ]; then
     echo "❌ Error: pom.xml not found. Run this script from the a2a-java root directory."
@@ -89,10 +93,10 @@ for file in $POM_FILES; do
     if grep -q "$FROM_VERSION" "$file"; then
         if [[ "$OSTYPE" == "darwin"* ]]; then
             # macOS requires empty string after -i
-            sed -i "" -e "s/$FROM_VERSION/$TO_VERSION/g" "$file"
+            sed -i "" -e "s|>$FROM_VERSION<|>$TO_VERSION<|g" "$file"
         else
             # Linux doesn't need it
-            sed -i "s/$FROM_VERSION/$TO_VERSION/g" "$file"
+            sed -i "s|>$FROM_VERSION<|>$TO_VERSION<|g" "$file"
         fi
         echo "  ✅ $file"
         UPDATED_POMS=$((UPDATED_POMS + 1))