From 222c411b985501f3f19e55125f0c95f418ea8901 Mon Sep 17 00:00:00 2001 From: app_modernization Date: Wed, 11 Mar 2026 14:00:53 +0800 Subject: [PATCH 1/3] chore: update upgarde prompt after merging extension --- src/commands.ts | 2 +- src/constants.ts | 3 ++- src/upgrade/upgradeManager.ts | 2 +- src/upgrade/utility.ts | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/commands.ts b/src/commands.ts index 0e7a69cd..c58341ff 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -167,7 +167,7 @@ export namespace Commands { /** * Commands from Java Upgrade Tool */ - export const GOTO_AGENT_MODE = "javaupgrade.gotoAgentMode"; + export const GOTO_AGENT_MODE = "appmod.javaUpgrade.gotoAgentMode"; /** * Get the project settings diff --git a/src/constants.ts b/src/constants.ts index 8bb176a5..fa3c125c 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -34,7 +34,8 @@ export namespace Explorer { export namespace ExtensionName { export const JAVA_LANGUAGE_SUPPORT: string = "redhat.java"; export const APP_MODERNIZATION_FOR_JAVA = "vscjava.migrate-java-to-azure"; - export const APP_MODERNIZATION_UPGRADE_FOR_JAVA = "vscjava.vscode-java-upgrade"; + // Java upgarde extension is merged into app modernization extension + export const APP_MODERNIZATION_UPGRADE_FOR_JAVA = "vscjava.migrate-java-to-azure"; export const APP_MODERNIZATION_EXTENSION_NAME = "GitHub Copilot app modernization"; } diff --git a/src/upgrade/upgradeManager.ts b/src/upgrade/upgradeManager.ts index 155eda17..1f9f1d3a 100644 --- a/src/upgrade/upgradeManager.ts +++ b/src/upgrade/upgradeManager.ts @@ -28,7 +28,7 @@ class UpgradeManager { context.subscriptions.push(instrumentOperationAsVsCodeCommand(Commands.JAVA_UPGRADE_WITH_COPILOT, async (promptText?: string) => { await checkOrInstallAppModExtensionForUpgrade(ExtensionName.APP_MODERNIZATION_UPGRADE_FOR_JAVA); const promptToUse = promptText ?? DEFAULT_UPGRADE_PROMPT; - await commands.executeCommand(Commands.GOTO_AGENT_MODE, { prompt: promptToUse }); + await commands.executeCommand(Commands.GOTO_AGENT_MODE, { prompt: promptToUse, useCustomAgent: true }); })); // Show modernization view diff --git a/src/upgrade/utility.ts b/src/upgrade/utility.ts index 9db7e829..f681f81f 100644 --- a/src/upgrade/utility.ts +++ b/src/upgrade/utility.ts @@ -95,15 +95,15 @@ export function buildFixPrompt(issue: UpgradeIssue): string { switch (reason) { case UpgradeReason.JRE_TOO_OLD: { const { suggestedVersion: { name: suggestedVersionName } } = issue; - return `upgrade java runtime to the LTS version ${suggestedVersionName} using java upgrade tools by invoking #generate_upgrade_plan`; + return `upgrade java runtime to the LTS version ${suggestedVersionName}`; } case UpgradeReason.END_OF_LIFE: case UpgradeReason.DEPRECATED: { const { suggestedVersion: { name: suggestedVersionName } } = issue; - return `upgrade ${packageDisplayName} to ${suggestedVersionName} using java upgrade tools by invoking #generate_upgrade_plan`; + return `upgrade ${packageDisplayName} to ${suggestedVersionName}`; } case UpgradeReason.CVE: { - return `fix all critical and high-severity CVE vulnerabilities in this project by invoking #validate_cves_for_java`; + return `fix all critical and high-severity CVE vulnerabilities in this project by invoking #appmod-validate-cves-for-java`; } } } From 31243e239d274138bf06d2b4b7e58b0e89e979cf Mon Sep 17 00:00:00 2001 From: app_modernization Date: Tue, 17 Mar 2026 14:13:49 +0800 Subject: [PATCH 2/3] fix --- src/upgrade/dependency.metadata.ts | 2 +- src/upgrade/utility.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/upgrade/dependency.metadata.ts b/src/upgrade/dependency.metadata.ts index f676f72a..df7b3380 100644 --- a/src/upgrade/dependency.metadata.ts +++ b/src/upgrade/dependency.metadata.ts @@ -4,7 +4,7 @@ import { Upgrade } from "../constants"; import { UpgradeReason, type DependencyCheckMetadata } from "./type"; -const MATURE_JAVA_LTS_VERSION = 21; +const MATURE_JAVA_LTS_VERSION = 25; export const DEPENDENCY_JAVA_RUNTIME = { "name": "Java Runtime", diff --git a/src/upgrade/utility.ts b/src/upgrade/utility.ts index f681f81f..0372e2ad 100644 --- a/src/upgrade/utility.ts +++ b/src/upgrade/utility.ts @@ -34,7 +34,7 @@ export function buildNotificationMessage(issue: UpgradeIssue, hasExtension: bool const upgradeWord = hasExtension ? "upgrade" : `install ${ExtensionName.APP_MODERNIZATION_EXTENSION_NAME} extension and upgrade`; if (packageId === Upgrade.PACKAGE_ID_FOR_JAVA_RUNTIME) { - return `This project is using an older Java runtime (${currentVersion}). Would you like to ${upgradeWord} it to ${suggestedVersionName} (LTS)?`; + return `This project is using an older Java runtime (${currentVersion}). Would you like to ${upgradeWord} it to a newer LTS version?`; } switch (reason) { @@ -94,8 +94,7 @@ export function buildFixPrompt(issue: UpgradeIssue): string { switch (reason) { case UpgradeReason.JRE_TOO_OLD: { - const { suggestedVersion: { name: suggestedVersionName } } = issue; - return `upgrade java runtime to the LTS version ${suggestedVersionName}`; + return `upgrade java runtime to the latest LTS version`; } case UpgradeReason.END_OF_LIFE: case UpgradeReason.DEPRECATED: { From 1b8285726ae814920d92b4febbed5768ce30493a Mon Sep 17 00:00:00 2001 From: app_modernization Date: Thu, 19 Mar 2026 11:53:48 +0800 Subject: [PATCH 3/3] fix: address Copilot review comments --- src/commands.ts | 2 +- src/constants.ts | 4 ++-- src/upgrade/utility.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/commands.ts b/src/commands.ts index c58341ff..a3659a4b 100644 --- a/src/commands.ts +++ b/src/commands.ts @@ -165,7 +165,7 @@ export namespace Commands { export const BUILD_PROJECT = "java.project.build"; /** - * Commands from Java Upgrade Tool + * Commands from appmod (Java Upgrade Tool) */ export const GOTO_AGENT_MODE = "appmod.javaUpgrade.gotoAgentMode"; diff --git a/src/constants.ts b/src/constants.ts index fa3c125c..0345b5a0 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -34,8 +34,8 @@ export namespace Explorer { export namespace ExtensionName { export const JAVA_LANGUAGE_SUPPORT: string = "redhat.java"; export const APP_MODERNIZATION_FOR_JAVA = "vscjava.migrate-java-to-azure"; - // Java upgarde extension is merged into app modernization extension - export const APP_MODERNIZATION_UPGRADE_FOR_JAVA = "vscjava.migrate-java-to-azure"; + // Java upgrade extension is merged into app modernization extension + export const APP_MODERNIZATION_UPGRADE_FOR_JAVA = APP_MODERNIZATION_FOR_JAVA; export const APP_MODERNIZATION_EXTENSION_NAME = "GitHub Copilot app modernization"; } diff --git a/src/upgrade/utility.ts b/src/upgrade/utility.ts index 0372e2ad..40fb2de2 100644 --- a/src/upgrade/utility.ts +++ b/src/upgrade/utility.ts @@ -34,7 +34,7 @@ export function buildNotificationMessage(issue: UpgradeIssue, hasExtension: bool const upgradeWord = hasExtension ? "upgrade" : `install ${ExtensionName.APP_MODERNIZATION_EXTENSION_NAME} extension and upgrade`; if (packageId === Upgrade.PACKAGE_ID_FOR_JAVA_RUNTIME) { - return `This project is using an older Java runtime (${currentVersion}). Would you like to ${upgradeWord} it to a newer LTS version?`; + return `This project is using an older Java runtime (${currentVersion}). Would you like to ${upgradeWord} it to the latest LTS version?`; } switch (reason) {