Merge master into feature/flare-mega

Author: aws-toolkit-automation

packages/amazonq/.changes/next-release/Bug Fix-636765f1-2278-4a2d-b512-7c63ecc2ce67.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "/transform: avoid prompting user for target JDK path unnecessarily"
+}

packages/core/src/amazonqGumby/chat/controller/controller.ts

@@ -688,13 +688,17 @@ export class GumbyController {
                 const pathToJavaHome = extractPath(data.message)
                 if (pathToJavaHome) {
                     transformByQState.setSourceJavaHome(pathToJavaHome)
+                    // TO-DO: delete line below and uncomment the block below when releasing CSB
+                    await this.prepareLanguageUpgradeProject(data.tabID)
                     // if source and target JDK versions are the same, just re-use the source JAVA_HOME and start the build
+                    /*
                     if (transformByQState.getTargetJDKVersion() === transformByQState.getSourceJDKVersion()) {
                         transformByQState.setTargetJavaHome(pathToJavaHome)
                         await this.prepareLanguageUpgradeProject(data.tabID)
                     } else {
                         this.promptJavaHome('target', data.tabID)
                     }
+                    */
                 } else {
                     this.messenger.sendUnrecoverableErrorResponse('invalid-java-home', data.tabID)
                 }