Merge main into feature/q-lsp

aws-toolkit-automation · web-flow · commit acdcc9f5c817 · 2025-02-11T04:45:35.000+01:00
diff --git a/.changes/3.54.json b/.changes/3.54.json
@@ -0,0 +1,8 @@
+{
+  "date" : "2025-02-11",
+  "version" : "3.54",
+  "entries" : [ {
+    "type" : "bugfix",
+    "description" : "Amazon Q: Reverting the behavior of making JetBrains suggestions(IntelliSense) and Q suggestions co-exist"
+  } ]
+}
diff --git a/.changes/next-release/bugfix-ed2a36a4-392d-4401-b51b-59f83ebeb8e6.json b/.changes/next-release/bugfix-ed2a36a4-392d-4401-b51b-59f83ebeb8e6.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# _3.54_ (2025-02-11)
+- **(Bug Fix)** Amazon Q: Reverting the behavior of making JetBrains suggestions(IntelliSense) and Q suggestions co-exist
+
 # _3.53_ (2025-02-07)
 - **(Bug Fix)** Amazon Q: Fixed an issue where in a specific scenario when receiving multiple suggestions with JetBrains suggestions visible, users are not able to accept the suggestion.
 
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Toolkit Version
-toolkitVersion=3.54-SNAPSHOT
+toolkitVersion=3.55-SNAPSHOT
 
 # Publish Settings
 publishToken=
