From 54b5ad5459e102ba64ecb217ee74e4f24a0e3de9 Mon Sep 17 00:00:00 2001 From: Sheng Chen Date: Thu, 1 Sep 2022 17:01:24 +0800 Subject: [PATCH] fix: Update the bundle names (#1482) Signed-off-by: sheche --- .../META-INF/MANIFEST.MF | 24 ++++++++------- java-extension/pom.xml | 4 +-- package.json | 30 ++++++++++--------- scripts/buildJdtlsExt.js | 24 ++++++++------- 4 files changed, 44 insertions(+), 38 deletions(-) diff --git a/java-extension/com.microsoft.java.test.plugin/META-INF/MANIFEST.MF b/java-extension/com.microsoft.java.test.plugin/META-INF/MANIFEST.MF index 81556447..d5be076e 100644 --- a/java-extension/com.microsoft.java.test.plugin/META-INF/MANIFEST.MF +++ b/java-extension/com.microsoft.java.test.plugin/META-INF/MANIFEST.MF @@ -23,18 +23,20 @@ Require-Bundle: org.eclipse.jdt.core, org.eclipse.jdt.junit.runtime, org.eclipse.jdt.junit4.runtime, org.eclipse.jdt.junit5.runtime, - org.junit.jupiter.api;bundle-version="5.4.0", - org.junit.jupiter.engine;bundle-version="5.4.0", - org.junit.jupiter.migrationsupport;bundle-version="5.4.0", - org.junit.jupiter.params;bundle-version="5.4.0", - org.junit.vintage.engine;bundle-version="5.4.0", + junit-jupiter-api;bundle-version="5.4.0", + junit-jupiter-engine;bundle-version="5.4.0", + junit-jupiter-migrationsupport;bundle-version="5.4.0", + junit-jupiter-params;bundle-version="5.4.0", + junit-vintage-engine;bundle-version="5.4.0", org.opentest4j;bundle-version="1.1.1", - org.junit.platform.commons;bundle-version="1.4.0", - org.junit.platform.engine;bundle-version="1.4.0", - org.junit.platform.launcher;bundle-version="1.4.0", - org.junit.platform.runner;bundle-version="1.4.0", - org.junit.platform.suite.api;bundle-version="1.4.0", - org.apiguardian;bundle-version="1.0.0", + junit-platform-commons;bundle-version="1.4.0", + junit-platform-engine;bundle-version="1.4.0", + junit-platform-launcher;bundle-version="1.4.0", + junit-platform-runner;bundle-version="1.4.0", + junit-platform-suite-api;bundle-version="1.4.0", + junit-platform-suite-commons;bundle-version="1.8.1", + junit-platform-suite-engine;bundle-version="1.8.1", + org.apiguardian.api;bundle-version="1.0.0", org.apache.commons.lang3;bundle-version="3.1.0", com.google.gson;bundle-version="2.7.0" Bundle-ClassPath: . diff --git a/java-extension/pom.xml b/java-extension/pom.xml index 6e239ee3..b29c4ace 100644 --- a/java-extension/pom.xml +++ b/java-extension/pom.xml @@ -53,9 +53,9 @@ - 202109 + 202209 p2 - https://download.eclipse.org/releases/2021-09/202109151000/ + https://download.eclipse.org/releases/2022-09/202209021000 oss.sonatype.org diff --git a/package.json b/package.json index 9a55b15c..a4c7b1cc 100644 --- a/package.json +++ b/package.json @@ -55,21 +55,23 @@ "main": "./main.js", "contributes": { "javaExtensions": [ - "./server/com.microsoft.java.test.plugin-0.37.0.jar", - "./server/org.eclipse.jdt.junit4.runtime_1.2.0.v20210326-1251.jar", - "./server/org.eclipse.jdt.junit5.runtime_1.0.1300.v20210320-1132.jar", - "./server/org.junit.jupiter.api_5.7.1.v20210222-1948.jar", - "./server/org.junit.jupiter.engine_5.7.1.v20210222-1948.jar", - "./server/org.junit.jupiter.migrationsupport_5.7.1.v20210222-1948.jar", - "./server/org.junit.jupiter.params_5.7.1.v20210222-1948.jar", - "./server/org.junit.vintage.engine_5.7.1.v20210222-1948.jar", + "./server/junit-jupiter-api_5.9.0.jar", + "./server/junit-jupiter-engine_5.9.0.jar", + "./server/junit-jupiter-migrationsupport_5.9.0.jar", + "./server/junit-jupiter-params_5.9.0.jar", + "./server/junit-platform-commons_1.9.0.jar", + "./server/junit-platform-engine_1.9.0.jar", + "./server/junit-platform-launcher_1.9.0.jar", + "./server/junit-platform-runner_1.9.0.jar", + "./server/junit-platform-suite-api_1.9.0.jar", + "./server/junit-platform-suite-commons_1.9.0.jar", + "./server/junit-platform-suite-engine_1.9.0.jar", + "./server/junit-vintage-engine_5.9.0.jar", + "./server/org.apiguardian.api_1.1.2.jar", + "./server/org.eclipse.jdt.junit4.runtime_1.3.0.v20220609-1843.jar", + "./server/org.eclipse.jdt.junit5.runtime_1.1.0.v20220715-1030.jar", "./server/org.opentest4j_1.2.0.v20190826-0900.jar", - "./server/org.junit.platform.commons_1.7.1.v20210222-1948.jar", - "./server/org.junit.platform.engine_1.7.1.v20210222-1948.jar", - "./server/org.junit.platform.launcher_1.7.1.v20210222-1948.jar", - "./server/org.junit.platform.runner_1.7.1.v20210222-1948.jar", - "./server/org.junit.platform.suite.api_1.7.1.v20210222-1948.jar", - "./server/org.apiguardian_1.1.0.v20190826-0900.jar" + "./server/com.microsoft.java.test.plugin-0.37.0.jar" ], "viewsWelcome": [ { diff --git a/scripts/buildJdtlsExt.js b/scripts/buildJdtlsExt.js index 9a9369cd..93466180 100644 --- a/scripts/buildJdtlsExt.js +++ b/scripts/buildJdtlsExt.js @@ -12,18 +12,20 @@ const serverDir = path.resolve('java-extension'); const bundleList = [ 'org.eclipse.jdt.junit4.runtime_', 'org.eclipse.jdt.junit5.runtime_', - 'org.junit.jupiter.api', - 'org.junit.jupiter.engine', - 'org.junit.jupiter.migrationsupport', - 'org.junit.jupiter.params', - 'org.junit.vintage.engine', + 'junit-jupiter-api', + 'junit-jupiter-engine', + 'junit-jupiter-migrationsupport', + 'junit-jupiter-params', + 'junit-vintage-engine', 'org.opentest4j', - 'org.junit.platform.commons', - 'org.junit.platform.engine', - 'org.junit.platform.launcher', - 'org.junit.platform.runner', - 'org.junit.platform.suite.api', - 'org.apiguardian', + 'junit-platform-commons', + 'junit-platform-engine', + 'junit-platform-launcher', + 'junit-platform-runner', + 'junit-platform-suite-api', + 'junit-platform-suite-commons', + 'junit-platform-suite-engine', + 'org.apiguardian.api', ]; cp.execSync(`${mvnw()} clean verify`, { cwd: serverDir, stdio: [0, 1, 2] }); copy(path.join(serverDir, 'com.microsoft.java.test.plugin/target'), path.resolve('server'), (file) => path.extname(file) === '.jar');