From bf3692ecf445f3e58693bb18526071f912301848 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Thu, 23 Jul 2026 16:38:38 +0200 Subject: [PATCH 01/14] chore: Add target platform definition for Eclipse 2025-12 See comment https://github.com/microsoft/copilot-for-eclipse/pull/25#issuecomment-5056820246 --- target-platforms/2025-12.target | 64 +++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 target-platforms/2025-12.target diff --git a/target-platforms/2025-12.target b/target-platforms/2025-12.target new file mode 100644 index 00000000..fcbd4cb3 --- /dev/null +++ b/target-platforms/2025-12.target @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 6bdd78b2222ce2ac3095d3b7aad2a2e14d9d2412 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Thu, 23 Jul 2026 17:06:56 +0200 Subject: [PATCH 02/14] chore: Use 2025-12.target in maven build and docs --- .github/copilot-instructions.md | 6 +++--- CONTRIBUTING.md | 7 +++---- com.microsoft.copilot.eclipse.ui.terminal/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 24d0c2d2..4a020d81 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -13,7 +13,7 @@ This is the **GitHub Copilot for Eclipse** plugin - an Eclipse IDE extension tha - **Multi-Platform Support**: Windows, macOS (x64/aarch64), and Linux (x64/aarch64) ### Tech Stack -- **Java**: Primary language (Java 17+, with Eclipse 4.31+ requiring Java 21+) +- **Java**: Primary language (Java 17+, with Eclipse 4.38+ requiring Java 21+) - **Eclipse RCP/OSGi**: Plugin architecture using Eclipse platform APIs - **Maven/Tycho**: Build system for Eclipse plugin development - **LSP4E**: Language Server Protocol integration for Eclipse @@ -46,7 +46,7 @@ You MUST verify compilation and code quality before declaring work complete! - Root POM coordinates multi-module build with Tycho - Each bundle/feature/test has its own POM inheriting from root - Checkstyle validation runs during `verify` phase -- Target platform defined in `base.target`, `target-terminal.target`, `target-tm-terminal.target` +- Target platform defined in `target-platforms/2025-12.target` ### Code Change Review Trigger @@ -569,7 +569,7 @@ distinguish repeated controls with stable context or an ordinal **When** writing tests → use JUnit 5 for core logic; integration tests for Eclipse integration -**When** adding dependencies → only add necessary bundles; check `base.target` for Eclipse 2024-03 version constraints +**When** adding dependencies → only add necessary bundles; check `target-platforms/2025-12.target` for Eclipse 2025-12 version constraints **When** targeting Eclipse versions → support multiple versions when possible diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e78e21d4..13dfca78 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ When you submit a pull request, a CLA bot will automatically determine whether y - **Java 17** or later (CI uses Temurin 17; use a newer JDK if required by your Eclipse IDE) - **Maven 3.8+** (or use the provided Maven wrapper `./mvnw`) - **Node.js 22.13** or later, with npm -- **Eclipse IDE for Eclipse Committers 2024-03** or later (for development) +- **Eclipse IDE for Eclipse Committers 2025-12** or later (for development) - Recommended: **Eclipse Checkstyle plugin** for code style compliance (e.g. install from update site: https://checkstyle.org/eclipse-cs-update-site/) @@ -60,9 +60,8 @@ The installable P2 repository is generated in `com.microsoft.copilot.eclipse.rep activate the check box *Search for nested projects*, and finish the wizard. * Do also import the agent bundle for your OS (e.g., `com.microsoft.copilot.eclipse.core.agent.win32`) after building the project with npm and maven or import all OS-specific agent bundles. -2. Activate one of the target platforms, i.e. open one of the target definition files and select `Set As Active Target Platform`. - * target-terminal.target (Eclipse 4.37+) - * target-tm-terminal.target (Eclipse 4.36 and earlier) +2. Activate one of the target platforms, i.e. open one of the target definition files and select `Set As Active Target Platform`, + e.g. `target-platforms/2025-12.target` (Eclipse 4.38) 3. For using the Checkstyle configuration (assuming you have installed the Eclipse Checkstyle plugin, see prerequisites), add a new named Checkstyle configuration. * Select *Window > Preferences > Checkstyle* and press the *New...* button. diff --git a/com.microsoft.copilot.eclipse.ui.terminal/pom.xml b/com.microsoft.copilot.eclipse.ui.terminal/pom.xml index f70016ec..830edfbf 100644 --- a/com.microsoft.copilot.eclipse.ui.terminal/pom.xml +++ b/com.microsoft.copilot.eclipse.ui.terminal/pom.xml @@ -18,7 +18,7 @@ ${tycho-version} - ../target-terminal.target + ../target-platforms/2025-12.target diff --git a/pom.xml b/pom.xml index ba917990..54d179ec 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ - + com.microsoft.copilot.eclipse.terminal.api com.microsoft.copilot.eclipse.ui.terminal com.microsoft.copilot.eclipse.ui.terminal.tm @@ -96,7 +96,7 @@ ${tycho-version} - ../base.target + ../target-platforms/2025-12.target JavaSE-21 From 60fb0cc4d50f8084d7bb03738b44fd288bce990d Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Thu, 23 Jul 2026 17:22:01 +0200 Subject: [PATCH 03/14] chore: Replace Java 17 with 21 --- .github/copilot-instructions.md | 2 +- .github/workflows/ci.yml | 4 +-- CONTRIBUTING.md | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 26 +++++++++++-------- .../.settings/org.eclipse.jdt.core.prefs | 6 ++--- .../META-INF/MANIFEST.MF | 2 +- com.microsoft.copilot.eclipse.core/.classpath | 18 ++++++++----- .../.settings/org.eclipse.jdt.core.prefs | 11 +++++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 26 +++++++++++-------- .../.settings/org.eclipse.jdt.core.prefs | 6 ++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 18 ++++++++----- .../.settings/org.eclipse.jdt.core.prefs | 6 ++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 18 ++++++++----- .../.settings/org.eclipse.jdt.core.prefs | 6 ++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 19 ++++++++------ .../.settings/org.eclipse.jdt.core.prefs | 6 ++--- .../META-INF/MANIFEST.MF | 2 +- .../.classpath | 26 +++++++++++-------- .../.settings/org.eclipse.jdt.core.prefs | 6 ++--- .../META-INF/MANIFEST.MF | 2 +- com.microsoft.copilot.eclipse.ui/.classpath | 18 ++++++++----- .../.settings/org.eclipse.jdt.core.prefs | 6 ++--- .../META-INF/MANIFEST.MF | 2 +- launch/plugin_debug_configuration.launch | 2 +- 33 files changed, 147 insertions(+), 111 deletions(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 4a020d81..67ed6b7d 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -13,7 +13,7 @@ This is the **GitHub Copilot for Eclipse** plugin - an Eclipse IDE extension tha - **Multi-Platform Support**: Windows, macOS (x64/aarch64), and Linux (x64/aarch64) ### Tech Stack -- **Java**: Primary language (Java 17+, with Eclipse 4.38+ requiring Java 21+) +- **Java**: Primary language (Java 21+, with Eclipse 4.38+ requiring Java 21+) - **Eclipse RCP/OSGi**: Plugin architecture using Eclipse platform APIs - **Maven/Tycho**: Build system for Eclipse plugin development - **LSP4E**: Language Server Protocol integration for Eclipse diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3823ab47..7d45575d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,10 +32,10 @@ jobs: working-directory: com.microsoft.copilot.eclipse.core/copilot-agent run: npm i -f - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: - java-version: '17' + java-version: '21' distribution: 'temurin' cache: maven diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 13dfca78..ef3e9603 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ When you submit a pull request, a CLA bot will automatically determine whether y ### Prerequisites -- **Java 17** or later (CI uses Temurin 17; use a newer JDK if required by your Eclipse IDE) +- **Java 21** or later (CI uses Temurin 21; use a newer JDK if required by your Eclipse IDE) - **Maven 3.8+** (or use the provided Maven wrapper `./mvnw`) - **Node.js 22.13** or later, with npm - **Eclipse IDE for Eclipse Committers 2025-12** or later (for development) diff --git a/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF index eb31b095..b08c1bcf 100644 --- a/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.core.agent.linux.aarch64/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.linux.aarch64 Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot Fragment-Host: com.microsoft.copilot.eclipse.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=aarch64)) diff --git a/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF index d422d011..855176ae 100644 --- a/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.core.agent.linux.x64/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.linux.x64 Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot Fragment-Host: com.microsoft.copilot.eclipse.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.arch=x86_64)) diff --git a/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF index 4e91f835..eaae707a 100644 --- a/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.core.agent.macosx.aarch64/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.macosx.aarch64 Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot Fragment-Host: com.microsoft.copilot.eclipse.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-PlatformFilter: (&(osgi.os=macosx) (osgi.arch=aarch64)) diff --git a/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF index f00dbc95..387ad4dd 100644 --- a/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.core.agent.macosx.x64/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.macosx.x64 Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot Fragment-Host: com.microsoft.copilot.eclipse.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-PlatformFilter: (&(osgi.os=macosx)(osgi.arch=x86_64)) diff --git a/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF index e8f912c1..11d3e10d 100644 --- a/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.core.agent.win32/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Automatic-Module-Name: com.microsoft.copilot.eclipse.core.agent.win32 Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot Fragment-Host: com.microsoft.copilot.eclipse.core -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Eclipse-PlatformFilter: (osgi.os=win32) diff --git a/com.microsoft.copilot.eclipse.core.test/.classpath b/com.microsoft.copilot.eclipse.core.test/.classpath index 38f401ad..766df48f 100644 --- a/com.microsoft.copilot.eclipse.core.test/.classpath +++ b/com.microsoft.copilot.eclipse.core.test/.classpath @@ -1,11 +1,15 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.jdt.core.prefs index 21eccc09..a98206bc 100644 --- a/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF index ebf87739..e4eedf0c 100644 --- a/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.core.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.core.test Bundle-SymbolicName: com.microsoft.copilot.eclipse.core.test;singleton:=true Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Fragment-Host: com.microsoft.copilot.eclipse.core Automatic-Module-Name: com.microsoft.copilot.eclipse.core.test Import-Package: org.objenesis;version="[3.4.0,4.0.0)", diff --git a/com.microsoft.copilot.eclipse.core/.classpath b/com.microsoft.copilot.eclipse.core/.classpath index 8d861214..b1415d56 100644 --- a/com.microsoft.copilot.eclipse.core/.classpath +++ b/com.microsoft.copilot.eclipse.core/.classpath @@ -1,7 +1,11 @@ - - - - - - - + + + + + + + + + + + diff --git a/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.jdt.core.prefs index 21eccc09..2fc4a03e 100644 --- a/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,17 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF index e96a614f..3619dc64 100644 --- a/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF @@ -26,7 +26,7 @@ Export-Package: com.microsoft.copilot.eclipse.core, com.microsoft.copilot.eclipse.core.persistence;x-friends:="com.microsoft.copilot.eclipse.ui,com.microsoft.copilot.eclipse.core.test，com.microsoft.copilot.eclipse.core.utils", com.microsoft.copilot.eclipse.core.utils Bundle-Activator: com.microsoft.copilot.eclipse.core.CopilotCore -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.microsoft.copilot.eclipse.core Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.ui, diff --git a/com.microsoft.copilot.eclipse.swtbot.test/.classpath b/com.microsoft.copilot.eclipse.swtbot.test/.classpath index 38f401ad..766df48f 100644 --- a/com.microsoft.copilot.eclipse.swtbot.test/.classpath +++ b/com.microsoft.copilot.eclipse.swtbot.test/.classpath @@ -1,11 +1,15 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.jdt.core.prefs index 62ef3488..23fa13b1 100644 --- a/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF index 468b6047..3a273183 100644 --- a/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.swtbot.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.swtbot.test Bundle-SymbolicName: com.microsoft.copilot.eclipse.swtbot.test;singleton:=true Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.microsoft.copilot.eclipse.swtbot.test Require-Bundle: org.eclipse.swtbot.swt.finder;bundle-version="4.1.0", org.eclipse.swtbot.eclipse.finder;bundle-version="4.1.0", diff --git a/com.microsoft.copilot.eclipse.terminal.api/.classpath b/com.microsoft.copilot.eclipse.terminal.api/.classpath index 8d861214..b1415d56 100644 --- a/com.microsoft.copilot.eclipse.terminal.api/.classpath +++ b/com.microsoft.copilot.eclipse.terminal.api/.classpath @@ -1,7 +1,11 @@ - - - - - - - + + + + + + + + + + + diff --git a/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.jdt.core.prefs index 62ef3488..23fa13b1 100644 --- a/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF index fbcc5c79..9a0d746c 100644 --- a/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.terminal.api/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: GitHub Copilot Export-Package: com.microsoft.copilot.eclipse.terminal.api Automatic-Module-Name: com.microsoft.copilot.eclipse.terminal.api Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Import-Package: org.osgi.framework;version="[1.10.0,2.0.0)" Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.30.0,4.0.0)", com.microsoft.copilot.eclipse.core;bundle-version="0.21.0", diff --git a/com.microsoft.copilot.eclipse.ui.jobs/.classpath b/com.microsoft.copilot.eclipse.ui.jobs/.classpath index 5508535a..b1415d56 100644 --- a/com.microsoft.copilot.eclipse.ui.jobs/.classpath +++ b/com.microsoft.copilot.eclipse.ui.jobs/.classpath @@ -1,7 +1,11 @@ - - - - - - - + + + + + + + + + + + diff --git a/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs index 20cc7b58..5500104f 100644 --- a/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF index 0fee3467..e76c9cd2 100644 --- a/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.ui.jobs/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.jobs;singleton:=true Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot Bundle-Activator: com.microsoft.copilot.eclipse.ui.jobs.CopilotJobs -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Localization: plugin Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.jobs Bundle-ActivationPolicy: lazy diff --git a/com.microsoft.copilot.eclipse.ui.terminal/.classpath b/com.microsoft.copilot.eclipse.ui.terminal/.classpath index e0ce1f7e..b1415d56 100644 --- a/com.microsoft.copilot.eclipse.ui.terminal/.classpath +++ b/com.microsoft.copilot.eclipse.ui.terminal/.classpath @@ -1,8 +1,11 @@ - - - - - - - - + + + + + + + + + + + diff --git a/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.jdt.core.prefs index 62ef3488..23fa13b1 100644 --- a/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF index 4aa767cf..bb646a7e 100644 --- a/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.ui.terminal/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.ui.terminal Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.terminal;singleton:=true Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.terminal Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/component.xml diff --git a/com.microsoft.copilot.eclipse.ui.test/.classpath b/com.microsoft.copilot.eclipse.ui.test/.classpath index 38f401ad..766df48f 100644 --- a/com.microsoft.copilot.eclipse.ui.test/.classpath +++ b/com.microsoft.copilot.eclipse.ui.test/.classpath @@ -1,11 +1,15 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.jdt.core.prefs index 62ef3488..23fa13b1 100644 --- a/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,9 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF index ab85b21d..cba4993d 100644 --- a/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.ui.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.ui.test Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.test;singleton:=true Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Fragment-Host: com.microsoft.copilot.eclipse.ui Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.test Import-Package: org.objenesis;version="[3.4.0,4.0.0)" diff --git a/com.microsoft.copilot.eclipse.ui/.classpath b/com.microsoft.copilot.eclipse.ui/.classpath index 8d861214..b1415d56 100644 --- a/com.microsoft.copilot.eclipse.ui/.classpath +++ b/com.microsoft.copilot.eclipse.ui/.classpath @@ -1,7 +1,11 @@ - - - - - - - + + + + + + + + + + + diff --git a/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.jdt.core.prefs index 21eccc09..a98206bc 100644 --- a/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,12 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns=false org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647 diff --git a/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF index a7cc5c25..73b4f612 100644 --- a/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.ui/META-INF/MANIFEST.MF @@ -21,7 +21,7 @@ Export-Package: com.microsoft.copilot.eclipse.ui, com.microsoft.copilot.eclipse.ui.extensions, com.microsoft.copilot.eclipse.ui.nes;x-friends:="com.microsoft.copilot.eclipse.ui.test" Bundle-Activator: com.microsoft.copilot.eclipse.ui.CopilotUi -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui Bundle-ActivationPolicy: lazy Import-Package: org.osgi.framework;version="[1.10.0,2.0.0)" diff --git a/launch/plugin_debug_configuration.launch b/launch/plugin_debug_configuration.launch index 8c8419e6..eedd1787 100644 --- a/launch/plugin_debug_configuration.launch +++ b/launch/plugin_debug_configuration.launch @@ -19,7 +19,7 @@ - + From 88335aecab96e91d625e8be129691a747b8c83ef Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Thu, 23 Jul 2026 16:53:57 +0200 Subject: [PATCH 04/14] chore: Unify output folders to target/classes --- com.microsoft.copilot.eclipse.core.test/build.properties | 4 ++-- com.microsoft.copilot.eclipse.core/build.properties | 4 ++-- com.microsoft.copilot.eclipse.swtbot.test/build.properties | 4 ++-- com.microsoft.copilot.eclipse.terminal.api/build.properties | 2 +- com.microsoft.copilot.eclipse.ui.jobs/build.properties | 2 +- com.microsoft.copilot.eclipse.ui.terminal/build.properties | 2 +- com.microsoft.copilot.eclipse.ui.test/build.properties | 4 ++-- com.microsoft.copilot.eclipse.ui/build.properties | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/com.microsoft.copilot.eclipse.core.test/build.properties b/com.microsoft.copilot.eclipse.core.test/build.properties index 100b378a..3cb14ae9 100644 --- a/com.microsoft.copilot.eclipse.core.test/build.properties +++ b/com.microsoft.copilot.eclipse.core.test/build.properties @@ -1,5 +1,5 @@ -source.. = src -output.. = target/classes +source.. = src/ +output.. = target/classes/ bin.includes = META-INF/,\ . diff --git a/com.microsoft.copilot.eclipse.core/build.properties b/com.microsoft.copilot.eclipse.core/build.properties index d6219466..326a0702 100644 --- a/com.microsoft.copilot.eclipse.core/build.properties +++ b/com.microsoft.copilot.eclipse.core/build.properties @@ -1,5 +1,5 @@ -source.. = src -output.. = target/classes +source.. = src/ +output.. = target/classes/ bin.includes = META-INF/,\ .,\ plugin.xml,\ diff --git a/com.microsoft.copilot.eclipse.swtbot.test/build.properties b/com.microsoft.copilot.eclipse.swtbot.test/build.properties index 8e6b406e..73ec1c61 100644 --- a/com.microsoft.copilot.eclipse.swtbot.test/build.properties +++ b/com.microsoft.copilot.eclipse.swtbot.test/build.properties @@ -1,5 +1,5 @@ -source.. = src -output.. = target/classes +source.. = src/ +output.. = target/classes/ bin.includes = META-INF/,\ .,\ plugin.xml,\ diff --git a/com.microsoft.copilot.eclipse.terminal.api/build.properties b/com.microsoft.copilot.eclipse.terminal.api/build.properties index f38581b9..eb7c4c16 100644 --- a/com.microsoft.copilot.eclipse.terminal.api/build.properties +++ b/com.microsoft.copilot.eclipse.terminal.api/build.properties @@ -1,5 +1,5 @@ source.. = src/ -output.. = bin/ +output.. = target/classes/ bin.includes = META-INF/,\ .,\ scripts/ diff --git a/com.microsoft.copilot.eclipse.ui.jobs/build.properties b/com.microsoft.copilot.eclipse.ui.jobs/build.properties index 18012dbe..2257d712 100644 --- a/com.microsoft.copilot.eclipse.ui.jobs/build.properties +++ b/com.microsoft.copilot.eclipse.ui.jobs/build.properties @@ -1,5 +1,5 @@ source.. = src/ -output.. = bin/ +output.. = target/classes/ bin.includes = META-INF/,\ .,\ plugin.xml,\ diff --git a/com.microsoft.copilot.eclipse.ui.terminal/build.properties b/com.microsoft.copilot.eclipse.ui.terminal/build.properties index 4aee9b7a..367dd831 100644 --- a/com.microsoft.copilot.eclipse.ui.terminal/build.properties +++ b/com.microsoft.copilot.eclipse.ui.terminal/build.properties @@ -1,5 +1,5 @@ source.. = src/ -output.. = bin/ +output.. = target/classes/ bin.includes = META-INF/,\ .,\ OSGI-INF/component.xml \ No newline at end of file diff --git a/com.microsoft.copilot.eclipse.ui.test/build.properties b/com.microsoft.copilot.eclipse.ui.test/build.properties index 07c97efe..8ffd6363 100644 --- a/com.microsoft.copilot.eclipse.ui.test/build.properties +++ b/com.microsoft.copilot.eclipse.ui.test/build.properties @@ -1,5 +1,5 @@ -source.. = src -output.. = target/classes +source.. = src/ +output.. = target/classes/ bin.includes = META-INF/,\ .,\ fragment.xml diff --git a/com.microsoft.copilot.eclipse.ui/build.properties b/com.microsoft.copilot.eclipse.ui/build.properties index 5ba08abe..9ce23e6a 100644 --- a/com.microsoft.copilot.eclipse.ui/build.properties +++ b/com.microsoft.copilot.eclipse.ui/build.properties @@ -1,5 +1,5 @@ -source.. = src -output.. = target/classes +source.. = src/ +output.. = target/classes/ bin.includes = META-INF/,\ .,\ plugin.xml,\ From acd8f41e16c10e46e3fa9b3b50b034b1abc6c423 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Thu, 23 Jul 2026 16:54:58 +0200 Subject: [PATCH 05/14] chore: Fix compile error Avoid "OSGi access rules not enforced by classpath access rules, which can lead to classloading errors at runtime." --- .../.settings/org.eclipse.jdt.core.prefs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs index 5500104f..f7d4b5bf 100644 --- a/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs +++ b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.jdt.core.prefs @@ -4,7 +4,7 @@ org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.forbiddenReference=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=21 From 588e9e3292c84ebee139008883f04a0698e03350 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Thu, 23 Jul 2026 17:46:40 +0200 Subject: [PATCH 06/14] chore: Set project encoding to UTF-8 --- .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ .../.settings/org.eclipse.core.resources.prefs | 2 ++ 8 files changed, 16 insertions(+) create mode 100644 com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.core.resources.prefs create mode 100644 com.microsoft.copilot.eclipse.core/.settings/org.eclipse.core.resources.prefs create mode 100644 com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.core.resources.prefs create mode 100644 com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.core.resources.prefs create mode 100644 com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.core.resources.prefs create mode 100644 com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.core.resources.prefs create mode 100644 com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.core.resources.prefs create mode 100644 com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.core.resources.prefs diff --git a/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..4824b802 --- /dev/null +++ b/com.microsoft.copilot.eclipse.core.test/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..4824b802 --- /dev/null +++ b/com.microsoft.copilot.eclipse.core/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..4824b802 --- /dev/null +++ b/com.microsoft.copilot.eclipse.swtbot.test/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..4824b802 --- /dev/null +++ b/com.microsoft.copilot.eclipse.terminal.api/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..4824b802 --- /dev/null +++ b/com.microsoft.copilot.eclipse.ui.jobs/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..4824b802 --- /dev/null +++ b/com.microsoft.copilot.eclipse.ui.terminal/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..4824b802 --- /dev/null +++ b/com.microsoft.copilot.eclipse.ui.test/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.core.resources.prefs b/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 00000000..4824b802 --- /dev/null +++ b/com.microsoft.copilot.eclipse.ui/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 From 9da338fa300e6fd2dedf1ea1724672a3b1442c81 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Thu, 23 Jul 2026 17:44:54 +0200 Subject: [PATCH 07/14] chore: Add m2e launch config for mvn clean verify --- launch/Verify Copilot for Eclipse.launch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 launch/Verify Copilot for Eclipse.launch diff --git a/launch/Verify Copilot for Eclipse.launch b/launch/Verify Copilot for Eclipse.launch new file mode 100644 index 00000000..e2537bd2 --- /dev/null +++ b/launch/Verify Copilot for Eclipse.launch @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + From d223e7d35bc50be65dcace5ec7a763dea31a2398 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Fri, 24 Jul 2026 11:28:27 +0200 Subject: [PATCH 08/14] Replace obsolete terminal.tm target with a new one Build the new target file for terminal.tm bundle (2024-12.target) similar to 2025-12.target and update docs. --- CONTRIBUTING.md | 5 +- base.target | 77 ------------------- .../pom.xml | 2 +- target-platforms/2024-12.target | 67 ++++++++++++++++ target-terminal.target | 14 ---- target-tm-terminal.target | 14 ---- 6 files changed, 71 insertions(+), 108 deletions(-) delete mode 100644 base.target create mode 100644 target-platforms/2024-12.target delete mode 100644 target-terminal.target delete mode 100644 target-tm-terminal.target diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef3e9603..93e05ad8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -60,8 +60,9 @@ The installable P2 repository is generated in `com.microsoft.copilot.eclipse.rep activate the check box *Search for nested projects*, and finish the wizard. * Do also import the agent bundle for your OS (e.g., `com.microsoft.copilot.eclipse.core.agent.win32`) after building the project with npm and maven or import all OS-specific agent bundles. -2. Activate one of the target platforms, i.e. open one of the target definition files and select `Set As Active Target Platform`, - e.g. `target-platforms/2025-12.target` (Eclipse 4.38) +2. Activate one of the target platforms, i.e. open one of the target definition files and select `Set As Active Target Platform`. + * `target-platforms/2025-12.target` (Eclipse 4.38 and later) + * `target-platforms/2024-12.target` (Eclipse 4.36 and earlier) 3. For using the Checkstyle configuration (assuming you have installed the Eclipse Checkstyle plugin, see prerequisites), add a new named Checkstyle configuration. * Select *Window > Preferences > Checkstyle* and press the *New...* button. diff --git a/base.target b/base.target deleted file mode 100644 index a6fc6705..00000000 --- a/base.target +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.mockito - mockito-core - 5.14.2 - jar - - - org.mockito - mockito-junit-jupiter - 5.14.2 - jar - - - org.objenesis - objenesis - 3.4 - jar - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/com.microsoft.copilot.eclipse.ui.terminal.tm/pom.xml b/com.microsoft.copilot.eclipse.ui.terminal.tm/pom.xml index 1d4b3904..a1089315 100644 --- a/com.microsoft.copilot.eclipse.ui.terminal.tm/pom.xml +++ b/com.microsoft.copilot.eclipse.ui.terminal.tm/pom.xml @@ -18,7 +18,7 @@ ${tycho-version} - ../target-tm-terminal.target + ../target-platforms/2024-12.target diff --git a/target-platforms/2024-12.target b/target-platforms/2024-12.target new file mode 100644 index 00000000..53adbaac --- /dev/null +++ b/target-platforms/2024-12.target @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target-terminal.target b/target-terminal.target deleted file mode 100644 index ad2e7c96..00000000 --- a/target-terminal.target +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/target-tm-terminal.target b/target-tm-terminal.target deleted file mode 100644 index ff989f09..00000000 --- a/target-tm-terminal.target +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file From 14497c26de2d710a90ffb7082c7c7d509413384e Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Fri, 24 Jul 2026 11:44:11 +0200 Subject: [PATCH 09/14] Replace unusual comma character in MANIFEST.MF See review comment https://github.com/microsoft/copilot-for-eclipse/pull/368#discussion_r3639608110 --- com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF index 3619dc64..b78d04d8 100644 --- a/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.core/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Export-Package: com.microsoft.copilot.eclipse.core, com.microsoft.copilot.eclipse.core.lsp.protocol.quota, com.microsoft.copilot.eclipse.core.lsp.protocol.tools, com.microsoft.copilot.eclipse.core.nes;x-friends:="com.microsoft.copilot.eclipse.ui", - com.microsoft.copilot.eclipse.core.persistence;x-friends:="com.microsoft.copilot.eclipse.ui,com.microsoft.copilot.eclipse.core.test，com.microsoft.copilot.eclipse.core.utils", + com.microsoft.copilot.eclipse.core.persistence;x-friends:="com.microsoft.copilot.eclipse.ui,com.microsoft.copilot.eclipse.core.test,com.microsoft.copilot.eclipse.core.utils", com.microsoft.copilot.eclipse.core.utils Bundle-Activator: com.microsoft.copilot.eclipse.core.CopilotCore Bundle-RequiredExecutionEnvironment: JavaSE-21 From 7b808c40beb3061615f3d73b111f99a5d3aef074 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Thu, 30 Jul 2026 11:50:54 +0200 Subject: [PATCH 10/14] Explicitly define LSP4E / LSP4J dependency Add separate LSP4E update site to target definition so that we can increase the LSP4E version without having to lift the Eclipse version. --- target-platforms/2024-12.target | 15 ++++++++++++++- target-platforms/2025-12.target | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/target-platforms/2024-12.target b/target-platforms/2024-12.target index 53adbaac..95161df8 100644 --- a/target-platforms/2024-12.target +++ b/target-platforms/2024-12.target @@ -7,7 +7,6 @@ - @@ -62,6 +61,20 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/target-platforms/2025-12.target b/target-platforms/2025-12.target index fcbd4cb3..d5ba85bd 100644 --- a/target-platforms/2025-12.target +++ b/target-platforms/2025-12.target @@ -7,7 +7,6 @@ - @@ -59,6 +58,20 @@ + + + + + + + + + + + + + + \ No newline at end of file From 4109d580f2b32133697f5cc616d01a8de261c722 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Thu, 30 Jul 2026 14:09:24 +0200 Subject: [PATCH 11/14] Add LSP4E and LSP4J to update site / p2 repository This way, we'll always offer the right version of LSP4E and LSP4J bundles on our own update site. --- .../category.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/com.microsoft.copilot.eclipse.repository/category.xml b/com.microsoft.copilot.eclipse.repository/category.xml index 78f864fa..3b147199 100644 --- a/com.microsoft.copilot.eclipse.repository/category.xml +++ b/com.microsoft.copilot.eclipse.repository/category.xml @@ -3,5 +3,15 @@ + + + + + + + + + - \ No newline at end of file + + From f9f78bca6cec7e58a4b461d290abb75d830272a6 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Tue, 8 Sep 2026 16:27:36 +0200 Subject: [PATCH 12/14] Clarify Eclipse version boundaries --- CONTRIBUTING.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 93e05ad8..3b8c2d5e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,8 +61,10 @@ The installable P2 repository is generated in `com.microsoft.copilot.eclipse.rep * Do also import the agent bundle for your OS (e.g., `com.microsoft.copilot.eclipse.core.agent.win32`) after building the project with npm and maven or import all OS-specific agent bundles. 2. Activate one of the target platforms, i.e. open one of the target definition files and select `Set As Active Target Platform`. - * `target-platforms/2025-12.target` (Eclipse 4.38 and later) - * `target-platforms/2024-12.target` (Eclipse 4.36 and earlier) + * `target-platforms/2025-12.target` - Eclipse 2025-12 (4.38), provides the modern terminal implementation + (`org.eclipse.terminal.*` bundles used by `ui.terminal`, available in Eclipse 2025-09 (4.37) and newer versions) + * `target-platforms/2024-12.target` - Eclipse 2024-12 (4.34), provides the legacy TM terminal implementation + (`org.eclipse.tm.terminal.*` bundles used by `ui.terminal.tm`, available in Eclipse 2025-06 (4.36) and earlier versions) 3. For using the Checkstyle configuration (assuming you have installed the Eclipse Checkstyle plugin, see prerequisites), add a new named Checkstyle configuration. * Select *Window > Preferences > Checkstyle* and press the *New...* button. @@ -112,8 +114,8 @@ The project is a multi-module Maven/Tycho build consisting of OSGi bundles: | `com.microsoft.copilot.eclipse.ui` | User interface: chat view, completion UI, agent tools | | `com.microsoft.copilot.eclipse.ui.jobs` | Copilot Jobs view integration | | `com.microsoft.copilot.eclipse.terminal.api` | Terminal tool API definitions | -| `com.microsoft.copilot.eclipse.ui.terminal` | Terminal integration (Eclipse 4.37+) | -| `com.microsoft.copilot.eclipse.ui.terminal.tm` | TM Terminal integration (Eclipse 4.36 and earlier) | +| `com.microsoft.copilot.eclipse.ui.terminal` | Modern terminal integration (runs on Eclipse >= 2025-09 / 4.37) | +| `com.microsoft.copilot.eclipse.ui.terminal.tm` | TM Terminal integration (runs on Eclipse < 2025-09 / 4.37) | | `com.microsoft.copilot.eclipse.branding` | Product branding and about dialog | | `com.microsoft.copilot.eclipse.core.agent.*` | Platform-specific Copilot language server agent bundles | | `com.microsoft.copilot.eclipse.feature` | Eclipse feature definition | From 363cf97c77ffb255b5e4a1ef91bf064cd347e264 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Tue, 15 Sep 2026 14:46:05 +0200 Subject: [PATCH 13/14] chore: Update remaining bundles from Java 17 to 21 --- com.microsoft.copilot.eclipse.ui.jobs.test/.classpath | 2 +- com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF | 2 +- com.microsoft.copilot.eclipse.ui.terminal.tm/.classpath | 2 +- .../META-INF/MANIFEST.MF | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/com.microsoft.copilot.eclipse.ui.jobs.test/.classpath b/com.microsoft.copilot.eclipse.ui.jobs.test/.classpath index 38f401ad..2167a547 100644 --- a/com.microsoft.copilot.eclipse.ui.jobs.test/.classpath +++ b/com.microsoft.copilot.eclipse.ui.jobs.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF index 7acdbcaf..ba734138 100644 --- a/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.ui.jobs.test Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.jobs.test;singleton:=true Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.jobs.test Require-Bundle: junit-jupiter-api;bundle-version="5.10.1", junit-jupiter-params;bundle-version="5.10.1", diff --git a/com.microsoft.copilot.eclipse.ui.terminal.tm/.classpath b/com.microsoft.copilot.eclipse.ui.terminal.tm/.classpath index 8d861214..c0015778 100644 --- a/com.microsoft.copilot.eclipse.ui.terminal.tm/.classpath +++ b/com.microsoft.copilot.eclipse.ui.terminal.tm/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF index c4a5f14b..9bd344f5 100644 --- a/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.ui.terminal.tm/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: com.microsoft.copilot.eclipse.ui.terminal.tm Bundle-SymbolicName: com.microsoft.copilot.eclipse.ui.terminal.tm;singleton:=true Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot -Bundle-RequiredExecutionEnvironment: JavaSE-17 +Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.terminal.tm Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/component.xml From a30245cb36665dcba059df2396c4bcdf1a159a21 Mon Sep 17 00:00:00 2001 From: Dietrich Travkin Date: Fri, 18 Sep 2026 11:17:32 +0200 Subject: [PATCH 14/14] test: pin ui.jobs.test JUnit to 5.x so Tycho resolves a supported provider The 2025-12 target aggregates junit-jupiter versions up to 6.x. With only a minimum version constraint, ui.jobs.test resolved JUnit 6.x, which is outside Tycho 4.0.13's provider ranges, causing 'Could not determine test framework provider'. Bound junit-jupiter api/engine/params to [5.12.0,6.0.0) and add the engine bundle so the standalone test resolves a consistent 5.x set. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> --- .../META-INF/MANIFEST.MF | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF b/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF index ba734138..4be97313 100644 --- a/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF +++ b/com.microsoft.copilot.eclipse.ui.jobs.test/META-INF/MANIFEST.MF @@ -6,8 +6,9 @@ Bundle-Version: 0.21.0.qualifier Bundle-Vendor: GitHub Copilot Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: com.microsoft.copilot.eclipse.ui.jobs.test -Require-Bundle: junit-jupiter-api;bundle-version="5.10.1", - junit-jupiter-params;bundle-version="5.10.1", +Require-Bundle: junit-jupiter-api;bundle-version="[5.10.1,6.0.0)", + junit-jupiter-engine;bundle-version="[5.10.1,6.0.0)", + junit-jupiter-params;bundle-version="[5.10.1,6.0.0)", org.eclipse.core.runtime;bundle-version="[3.30.0,4.0.0)", com.microsoft.copilot.eclipse.ui.jobs;bundle-version="0.21.0" Import-Package: org.osgi.framework;version="[1.10.0,2.0.0)"