Update to Spring 3.5.8, remove Q Dev Cli and add Kiro Cli

Author: Yuriy Bezsonov

apps/jvm-analysis-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.5</version>
+        <version>3.5.8</version>
         <relativePath/>
     </parent>
     <groupId>com.unicorn</groupId>
@@ -16,9 +16,9 @@
 
     <properties>
         <java.version>21</java.version>
-        <aws.sdk.version>2.33.4</aws.sdk.version>
-        <jfr-converter.version>4.1</jfr-converter.version>
-        <resilience4j.version>2.2.0</resilience4j.version>
+        <aws.sdk.version>2.39.2</aws.sdk.version>
+        <jfr-converter.version>4.2</jfr-converter.version>
+        <resilience4j.version>2.3.0</resilience4j.version>
     </properties>
 
     <dependencies>
@@ -72,7 +72,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>jib-maven-plugin</artifactId>
-                <version>3.4.6</version>
+                <version>3.5.1</version>
                 <configuration>
                     <from>
                         <image>amazoncorretto:21-alpine</image>

apps/unicorn-store-spring/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.5.5</version>
+        <version>3.5.8</version>
         <relativePath/>
         <!-- lookup parent from repository -->
     </parent>
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.33.4</version>
+                <version>2.39.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -182,7 +182,7 @@
                     <plugin>
                         <groupId>org.graalvm.buildtools</groupId>
                         <artifactId>native-maven-plugin</artifactId>
-                        <version>0.10.6</version>
+                        <version>0.11.3</version>
                         <extensions>true</extensions>
                         <executions>
                             <execution>
@@ -293,7 +293,7 @@
                     <plugin>
                         <groupId>com.google.cloud.tools</groupId>
                         <artifactId>jib-maven-plugin</artifactId>
-                        <version>3.4.6</version>
+                        <version>3.5.1</version>
                         <configuration>
                             <from>
                                 <image>public.ecr.aws/docker/library/amazoncorretto:21-alpine</image>

infrastructure/scripts/setup/ide.sh

@@ -137,18 +137,32 @@ sudo yum -q install -y session-manager-plugin.rpm
 session-manager-plugin
 rm session-manager-plugin.rpm
 
-echo "Installing Q Cli ..."
-curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.codewhisperer.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip" -o /home/ec2-user/q.zip
-unzip /home/ec2-user/q.zip -d /home/ec2-user/
-chmod +x /home/ec2-user/q/install.sh
-sudo Q_INSTALL_GLOBAL=1 /home/ec2-user/q/install.sh
-
-echo "Fixing bash-preexec errors in Amazon Q shell integration..."
-# Run the fix script from the same directory
-bash "$(dirname "$0")/fix-bash-preexec.sh"
-
-echo "Installing Spring CLI"
-curl -L https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/3.5.0/spring-boot-cli-3.5.0-bin.zip -o /home/ec2-user/spring-boot-cli-3.5.0-bin.zip && unzip /home/ec2-user/spring-boot-cli-3.5.0-bin.zip -d /home/ec2-user
+# echo "Installing Q Cli ..."
+# curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.codewhisperer.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip" -o /home/ec2-user/q.zip
+# unzip /home/ec2-user/q.zip -d /home/ec2-user/
+# chmod +x /home/ec2-user/q/install.sh
+# sudo Q_INSTALL_GLOBAL=1 /home/ec2-user/q/install.sh
+
+# echo "Fixing bash-preexec errors in Amazon Q shell integration..."
+# # Run the fix script from the same directory
+# bash "$(dirname "$0")/fix-bash-preexec.sh"
+
+echo "Installing Kiro CLI (optional) ..."
+if curl -fsSL https://cli.kiro.dev/install | bash 2>&1 | tee /tmp/kiro-install.log; then
+    echo "alias kc='AMAZON_Q_SIGV4=1 kiro-cli'" | sudo tee -a /etc/profile.d/workshop.sh
+    echo "Kiro CLI installed successfully"
+else
+    echo "⚠️  Kiro CLI installation failed (optional component)"
+    echo "Installation log saved to /tmp/kiro-install.log"
+fi || true
+
+echo "Installing Spring CLI (optional) ..."
+if curl -L https://repo.maven.apache.org/maven2/org/springframework/boot/spring-boot-cli/3.5.0/spring-boot-cli-3.5.0-bin.zip -o /home/ec2-user/spring-boot-cli-3.5.0-bin.zip 2>/dev/null; then
+    unzip -q /home/ec2-user/spring-boot-cli-3.5.0-bin.zip -d /home/ec2-user 2>/dev/null || true
+    echo "Spring CLI installed successfully"
+else
+    echo "⚠️  Spring CLI download failed (optional component)"
+fi || true
 
 source /etc/profile.d/workshop.sh
 aws configure set default.region ${AWS_REGION}