Skip to content

Commit 54b5ad5

Browse files
authored
fix: Update the bundle names (#1482)
Signed-off-by: sheche <sheche@microsoft.com>
1 parent 786d1e6 commit 54b5ad5

File tree

4 files changed

+44
-38
lines changed

4 files changed

+44
-38
lines changed

java-extension/com.microsoft.java.test.plugin/META-INF/MANIFEST.MF

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,20 @@ Require-Bundle: org.eclipse.jdt.core,
2323
org.eclipse.jdt.junit.runtime,
2424
org.eclipse.jdt.junit4.runtime,
2525
org.eclipse.jdt.junit5.runtime,
26-
org.junit.jupiter.api;bundle-version="5.4.0",
27-
org.junit.jupiter.engine;bundle-version="5.4.0",
28-
org.junit.jupiter.migrationsupport;bundle-version="5.4.0",
29-
org.junit.jupiter.params;bundle-version="5.4.0",
30-
org.junit.vintage.engine;bundle-version="5.4.0",
26+
junit-jupiter-api;bundle-version="5.4.0",
27+
junit-jupiter-engine;bundle-version="5.4.0",
28+
junit-jupiter-migrationsupport;bundle-version="5.4.0",
29+
junit-jupiter-params;bundle-version="5.4.0",
30+
junit-vintage-engine;bundle-version="5.4.0",
3131
org.opentest4j;bundle-version="1.1.1",
32-
org.junit.platform.commons;bundle-version="1.4.0",
33-
org.junit.platform.engine;bundle-version="1.4.0",
34-
org.junit.platform.launcher;bundle-version="1.4.0",
35-
org.junit.platform.runner;bundle-version="1.4.0",
36-
org.junit.platform.suite.api;bundle-version="1.4.0",
37-
org.apiguardian;bundle-version="1.0.0",
32+
junit-platform-commons;bundle-version="1.4.0",
33+
junit-platform-engine;bundle-version="1.4.0",
34+
junit-platform-launcher;bundle-version="1.4.0",
35+
junit-platform-runner;bundle-version="1.4.0",
36+
junit-platform-suite-api;bundle-version="1.4.0",
37+
junit-platform-suite-commons;bundle-version="1.8.1",
38+
junit-platform-suite-engine;bundle-version="1.8.1",
39+
org.apiguardian.api;bundle-version="1.0.0",
3840
org.apache.commons.lang3;bundle-version="3.1.0",
3941
com.google.gson;bundle-version="2.7.0"
4042
Bundle-ClassPath: .

java-extension/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353
</build>
5454
<repositories>
5555
<repository>
56-
<id>202109</id>
56+
<id>202209</id>
5757
<layout>p2</layout>
58-
<url>https://download.eclipse.org/releases/2021-09/202109151000/</url>
58+
<url>https://download.eclipse.org/releases/2022-09/202209021000</url>
5959
</repository>
6060
<repository>
6161
<id>oss.sonatype.org</id>

package.json

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,21 +55,23 @@
5555
"main": "./main.js",
5656
"contributes": {
5757
"javaExtensions": [
58-
"./server/com.microsoft.java.test.plugin-0.37.0.jar",
59-
"./server/org.eclipse.jdt.junit4.runtime_1.2.0.v20210326-1251.jar",
60-
"./server/org.eclipse.jdt.junit5.runtime_1.0.1300.v20210320-1132.jar",
61-
"./server/org.junit.jupiter.api_5.7.1.v20210222-1948.jar",
62-
"./server/org.junit.jupiter.engine_5.7.1.v20210222-1948.jar",
63-
"./server/org.junit.jupiter.migrationsupport_5.7.1.v20210222-1948.jar",
64-
"./server/org.junit.jupiter.params_5.7.1.v20210222-1948.jar",
65-
"./server/org.junit.vintage.engine_5.7.1.v20210222-1948.jar",
58+
"./server/junit-jupiter-api_5.9.0.jar",
59+
"./server/junit-jupiter-engine_5.9.0.jar",
60+
"./server/junit-jupiter-migrationsupport_5.9.0.jar",
61+
"./server/junit-jupiter-params_5.9.0.jar",
62+
"./server/junit-platform-commons_1.9.0.jar",
63+
"./server/junit-platform-engine_1.9.0.jar",
64+
"./server/junit-platform-launcher_1.9.0.jar",
65+
"./server/junit-platform-runner_1.9.0.jar",
66+
"./server/junit-platform-suite-api_1.9.0.jar",
67+
"./server/junit-platform-suite-commons_1.9.0.jar",
68+
"./server/junit-platform-suite-engine_1.9.0.jar",
69+
"./server/junit-vintage-engine_5.9.0.jar",
70+
"./server/org.apiguardian.api_1.1.2.jar",
71+
"./server/org.eclipse.jdt.junit4.runtime_1.3.0.v20220609-1843.jar",
72+
"./server/org.eclipse.jdt.junit5.runtime_1.1.0.v20220715-1030.jar",
6673
"./server/org.opentest4j_1.2.0.v20190826-0900.jar",
67-
"./server/org.junit.platform.commons_1.7.1.v20210222-1948.jar",
68-
"./server/org.junit.platform.engine_1.7.1.v20210222-1948.jar",
69-
"./server/org.junit.platform.launcher_1.7.1.v20210222-1948.jar",
70-
"./server/org.junit.platform.runner_1.7.1.v20210222-1948.jar",
71-
"./server/org.junit.platform.suite.api_1.7.1.v20210222-1948.jar",
72-
"./server/org.apiguardian_1.1.0.v20190826-0900.jar"
74+
"./server/com.microsoft.java.test.plugin-0.37.0.jar"
7375
],
7476
"viewsWelcome": [
7577
{

scripts/buildJdtlsExt.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,20 @@ const serverDir = path.resolve('java-extension');
1212
const bundleList = [
1313
'org.eclipse.jdt.junit4.runtime_',
1414
'org.eclipse.jdt.junit5.runtime_',
15-
'org.junit.jupiter.api',
16-
'org.junit.jupiter.engine',
17-
'org.junit.jupiter.migrationsupport',
18-
'org.junit.jupiter.params',
19-
'org.junit.vintage.engine',
15+
'junit-jupiter-api',
16+
'junit-jupiter-engine',
17+
'junit-jupiter-migrationsupport',
18+
'junit-jupiter-params',
19+
'junit-vintage-engine',
2020
'org.opentest4j',
21-
'org.junit.platform.commons',
22-
'org.junit.platform.engine',
23-
'org.junit.platform.launcher',
24-
'org.junit.platform.runner',
25-
'org.junit.platform.suite.api',
26-
'org.apiguardian',
21+
'junit-platform-commons',
22+
'junit-platform-engine',
23+
'junit-platform-launcher',
24+
'junit-platform-runner',
25+
'junit-platform-suite-api',
26+
'junit-platform-suite-commons',
27+
'junit-platform-suite-engine',
28+
'org.apiguardian.api',
2729
];
2830
cp.execSync(`${mvnw()} clean verify`, { cwd: serverDir, stdio: [0, 1, 2] });
2931
copy(path.join(serverDir, 'com.microsoft.java.test.plugin/target'), path.resolve('server'), (file) => path.extname(file) === '.jar');

0 commit comments

Comments
 (0)