Merge branch 'main' into codeReview

Author: BlakeLazarine

.changes/next-release/bugfix-5f981bc5-69dd-4ecc-9b31-24f5d66b1948.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix incompatible version warning for AWS Toolkit in 2025.2"
+}

.changes/next-release/feature-c5fdd407-ad47-4e83-9846-d64559365267.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Amazon Q supports admin control for MCP servers to restrict MCP server usage"
+}

plugins/toolkit/jetbrains-core/build.gradle.kts

@@ -57,6 +57,8 @@ val patchPluginXml = tasks.named<PatchPluginXmlTask>("patchPluginXml")
 patchPluginXml.configure {
     val buildSuffix = if (!project.isCi()) "+${buildMetadata()}" else ""
     pluginVersion.set("$toolkitVersion.${ideProfile.shortName}$buildSuffix")
+    sinceBuild.set(ideProfile.sinceVersion)
+    untilBuild.set(ideProfile.untilVersion)
 }
 
 tasks.jar {
@@ -79,6 +81,8 @@ tasks.integrationTest {
 val gatewayPluginXml = tasks.register<PatchPluginXmlTask>("pluginXmlForGateway") {
     val buildSuffix = if (!project.isCi()) "+${buildMetadata()}" else ""
     pluginVersion.set("GW-$toolkitVersion-${ideProfile.shortName}$buildSuffix")
+    sinceBuild.set(ideProfile.sinceVersion)
+    untilBuild.set(ideProfile.untilVersion)
 }
 
 val patchGatewayPluginXml by tasks.registering {