microsoft · tmeschter · Apr 29, 2026 · Apr 29, 2026
diff --git a/.github/plugins/azure-skills/.claude-plugin/plugin.json b/.github/plugins/azure-skills/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "azure",
   "description": "Microsoft Azure MCP and Skills integration for cloud resource management, deployments, and Azure services. Manage your Azure infrastructure, monitor applications, and deploy resources directly from Claude Code.",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "author": {
     "name": "Microsoft",
     "url": "https://www.microsoft.com"

diff --git a/.github/plugins/azure-skills/.cursor-plugin/plugin.json b/.github/plugins/azure-skills/.cursor-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "azure",
   "description": "Microsoft Azure MCP and Skills integration for cloud resource management, deployments, and Azure services. Manage your Azure infrastructure, monitor applications, and deploy resources directly from Cursor.",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "author": {
     "name": "Microsoft",
     "url": "https://www.microsoft.com"

diff --git a/.github/plugins/azure-skills/.mcp.json b/.github/plugins/azure-skills/.mcp.json
@@ -3,10 +3,6 @@
     "azure": {
       "command": "npx",
       "args": ["-y", "@azure/mcp@latest", "server", "start"]
-    },
-    "context7": {
-      "command": "npx",
-      "args": ["-y", "@upstash/context7-mcp@latest"]
     }
   }
 }
diff --git a/.github/plugins/azure-skills/.plugin/plugin.json b/.github/plugins/azure-skills/.plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "azure",
   "description": "Microsoft Azure MCP and Skills integration for cloud resource management, deployments, and Azure services. Manage your Azure infrastructure, monitor applications, and deploy resources directly from your development environment.",
-  "version": "1.1.20",
+  "version": "1.1.22",
   "author": {
     "name": "Microsoft",
     "url": "https://www.microsoft.com"

diff --git a/.github/plugins/azure-skills/CHANGELOG.md b/.github/plugins/azure-skills/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.1.22
+
+- fix: Remove context7 MCP server from plugin config ([#2100](https://github.com/microsoft/GitHub-Copilot-for-Azure/pull/2100))
+
+## 1.1.21
+
+- feat: Extend `azure-upgrade` skill by adding workflow for migrating legacy Azure SDKs for Java to latest modern ones ([#1901](https://github.com/microsoft/GitHub-Copilot-for-Azure/pull/1901))
+
 ## 1.1.19
 
 - fix: strengthen azure-resource-lookup routing for web app/website prompts ([#2006](https://github.com/microsoft/GitHub-Copilot-for-Azure/pull/2006))

diff --git a/.github/plugins/azure-skills/gemini-extension.json b/.github/plugins/azure-skills/gemini-extension.json
@@ -6,10 +6,6 @@
     "azure": {
       "command": "npx",
       "args": ["-y", "@azure/mcp@latest", "server", "start"]
-    },
-    "context7": {
-      "command": "npx",
-      "args": ["-y", "@upstash/context7-mcp@latest"]
     }
   }
 }
diff --git a/.github/plugins/azure-skills/skills/azure-hosted-copilot-sdk/SKILL.md b/.github/plugins/azure-skills/skills/azure-hosted-copilot-sdk/SKILL.md
@@ -4,7 +4,7 @@ description: "Build, deploy, modify GitHub Copilot SDK apps on Azure. MANDATORY
 license: MIT
 metadata:
   author: Microsoft
-  version: "1.1.1"
+  version: "1.1.2"
 ---
 
 # GitHub Copilot SDK on Azure

diff --git a/.../plugins/azure-skills/skills/azure-hosted-copilot-sdk/references/copilot-sdk.md b/.../plugins/azure-skills/skills/azure-hosted-copilot-sdk/references/copilot-sdk.md
@@ -23,13 +23,15 @@ azd init --template azure-samples/copilot-sdk-service
 
 ## Getting Current Examples
 
-Use **context7** MCP tools as the PRIMARY way to get SDK documentation and code examples:
+Use `github-mcp-server-get_file_contents` with `owner: "github"`, `repo: "copilot-sdk"` to read files directly from the repo and get current SDK documentation and code examples.
+
+If the **context7** MCP server is available, it can also be used to query SDK docs:
 
 1. Call `context7-resolve-library-id` with `libraryName: "copilot-sdk"` to find the library ID
 2. Call `context7-query-docs` with the resolved ID and a query matching the user's goal
 3. Select the most relevant snippets for the user's scenario
 
-> 💡 **Tip:** Fall back to `github-mcp-server-get_file_contents` with `owner: "github"`, `repo: "copilot-sdk"` to read files directly from the repo.
+> 💡 **Tip:** If context7 is not installed, instruct the user to add it. For a quick one-off use: `npx -y @upstash/context7-mcp@latest`. To persist it, add `@upstash/context7-mcp` as an entry in their MCP server configuration file.
 
 ## Three Model Paths
 

diff --git a/...ills/skills/azure-hosted-copilot-sdk/references/existing-project-integration.md b/...ills/skills/azure-hosted-copilot-sdk/references/existing-project-integration.md
@@ -19,7 +19,7 @@ Read the template via MCP for reference implementation:
 
 `github-mcp-server-get_file_contents` with `owner: "azure-samples"`, `repo: "copilot-sdk-service"`. Read `AGENTS.md` first.
 
-Use context7 tools (`context7-resolve-library-id` → `context7-query-docs`) for current SDK API examples.
+Use `github-mcp-server-get_file_contents` with `owner: "github"`, `repo: "copilot-sdk"` for current SDK API examples. If context7 is available, you can also use it (`context7-resolve-library-id` then `context7-query-docs`). If context7 is not available, instruct the user to install it: `npx -y @upstash/context7-mcp@latest`.
 
 ## Integration Steps
 

diff --git a/.github/plugins/azure-skills/skills/azure-prepare/SKILL.md b/.github/plugins/azure-skills/skills/azure-prepare/SKILL.md
@@ -4,7 +4,7 @@ description: "Prepare Azure apps for deployment (infra Bicep/Terraform, azure.ya
 license: MIT
 metadata:
   author: Microsoft
-  version: "1.2.7"
+  version: "1.2.8"
 ---
 
 # Azure Prepare

diff --git a/...b/plugins/azure-skills/skills/azure-prepare/references/recipes/azd/iac-rules.md b/...b/plugins/azure-skills/skills/azure-prepare/references/recipes/azd/iac-rules.md
@@ -18,11 +18,11 @@ For **Terraform**:
 
 If no pattern module exists for the active provider, default immediately to AVM modules in the same provider order (resource, then utility) instead of using non-AVM modules.
 
-## Retrieval Strategy (Hybrid: azure-documentation MCP + Context7)
+## Retrieval Strategy (azure-documentation MCP primary + optional Context7)
 
 - **Primary (authoritative):** Use `mcp_azure_mcp_documentation` (`azure-documentation`) for current Azure guidance and AVM integration documentation.
 - **Primary (module catalog):** Use `mcp_bicep_list_avm_metadata` plus official AVM indexes to select concrete modules.
-- **Secondary (supplemental):** Use Context7 only for implementation examples when `mcp_azure_mcp_documentation` does not provide enough detail.
+- **Secondary (supplemental):** Use Context7 only for implementation examples when `mcp_azure_mcp_documentation` does not provide enough detail. If Context7 is not available, instruct the user to install it: `npx -y @upstash/context7-mcp@latest`.
 
 ## Validation Plan
 

diff --git a/...b/plugins/azure-skills/skills/azure-prepare/references/recipes/azd/terraform.md b/...b/plugins/azure-skills/skills/azure-prepare/references/recipes/azd/terraform.md
@@ -322,7 +322,11 @@ For Terraform module selection, enforce this order:
 2. AVM Terraform Resource Modules
 3. AVM Terraform Utility Modules
 
-Use `mcp_azure_mcp_documentation` (`azure-documentation`) for current guidance and AVM context first, then use Context7 only as supplemental examples if required.
+Use `mcp_azure_mcp_documentation` (`azure-documentation`) for current guidance and AVM context first, then use Context7 only as supplemental examples if required. If Context7 is not available, instruct the user to install it:
+
+```bash
+npx @upstash/context7-mcp@latest
+```
 
 ## Migration from Pure Terraform
 

diff --git a/.github/plugins/azure-skills/skills/azure-upgrade/SKILL.md b/.github/plugins/azure-skills/skills/azure-upgrade/SKILL.md
@@ -1,15 +1,16 @@
 ---
 name: azure-upgrade
-description: "Assess and upgrade Azure workloads between plans, tiers, or SKUs within Azure. Generates assessment reports and automates upgrade steps. WHEN: upgrade Consumption to Flex Consumption, upgrade Azure Functions plan, migrate hosting plan, upgrade Functions SKU, move to Flex Consumption, upgrade Azure service tier, change hosting plan, upgrade function app plan, migrate App Service to Container Apps."
+description: "Assess and upgrade Azure workloads between plans, tiers, or SKUs, or modernize Azure SDK dependencies in source code. WHEN: upgrade Consumption to Flex Consumption, upgrade Azure Functions plan, migrate hosting plan, change hosting plan, function app SKU, migrate App Service to Container Apps, migrate legacy Azure SDKs for Java, upgrade legacy Azure Java SDK, com.microsoft.azure to com.azure."
 license: MIT
+compatibility: python3.10+
 metadata:
   author: Microsoft
-  version: "1.1.1"
+  version: "1.1.2"
 ---
 
 # Azure Upgrade
 
-> This skill handles **assessment and automated upgrades** of existing Azure workloads from one Azure service, hosting plan, or SKU to another — all within Azure. This includes plan/tier upgrades (e.g. Consumption → Flex Consumption), cross-service migrations (e.g. App Service → Container Apps), and SKU changes. This is NOT for cross-cloud migration — use `azure-cloud-migrate` for that.
+> This skill handles **assessment and automated upgrades** of existing Azure workloads from one Azure service, hosting plan, or SKU to another — all within Azure. This includes plan/tier upgrades (e.g. Consumption → Flex Consumption), cross-service migrations (e.g. App Service → Container Apps), and SKU changes. It also covers **Azure SDK for Java source-code modernization** (e.g. legacy Java `com.microsoft.azure.*` → modern `com.azure.*`). This is NOT for cross-cloud migration — use `azure-cloud-migrate` for that.
 
 ## Triggers
 
@@ -19,6 +20,7 @@ metadata:
 | Change hosting tier | "Move my function app to a better plan" |
 | Assess upgrade readiness | "Is my function app ready for Flex Consumption?" |
 | Automate plan migration | "Automate the steps to upgrade my Functions plan" |
+| Modernize legacy Azure Java SDK | "Migrate legacy Azure SDKs for Java", "Upgrade legacy Azure Java SDK", "Migrate my Java project from com.microsoft.azure to com.azure" |
 
 ## Rules
 
@@ -36,6 +38,9 @@ metadata:
 | Source | Target | Reference |
 |--------|--------|-----------|
 | Azure Functions Consumption Plan | Azure Functions Flex Consumption Plan | [consumption-to-flex.md](references/services/functions/consumption-to-flex.md) |
+| Legacy Azure Java SDK (`com.microsoft.azure.*`) | Modern Azure Java SDK (`com.azure.*`) | [languages/java/README.md](references/languages/java/README.md) |
+
+> SDK upgrade scenarios (e.g. Java legacy → modern) run a **source-code modernization flow** that is distinct from Azure service/plan/SKU upgrades: follow the scenario reference, **not** the Steps below.
 
 > No matching scenario? Use `mcp_azure_mcp_documentation` and `mcp_azure_mcp_get_azure_bestpractices` tools to research the upgrade path.
 
@@ -68,6 +73,10 @@ Track progress in `upgrade-status.md` inside the workspace root.
   - [Consumption to Flex Consumption](references/services/functions/consumption-to-flex.md)
   - [Assessment](references/services/functions/assessment.md)
   - [Automation Scripts](references/services/functions/automation.md)
+- **Java SDK Migration Templates**
+  - [Plan Template](references/languages/java/templates/PLAN_TEMPLATE.md)
+  - [Progress Template](references/languages/java/templates/PROGRESS_TEMPLATE.md)
+  - [Summary Template](references/languages/java/templates/SUMMARY_TEMPLATE.md)
 
 ## Next