Skip to content

Commit b6d96d7

Browse files
mehmet-karamanmehmet-karaman
committed
Upgrade junit 5 to junit 6
1 parent bc139e9 commit b6d96d7

File tree

9 files changed

+69
-21
lines changed

9 files changed

+69
-21
lines changed

‎org.eclipse.xtext.dev-bom/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
</scm>
127127
<properties>
128128
<junit-platform-version>1.14.0</junit-platform-version>
129-
<junit-jupiter-version>5.14.0</junit-jupiter-version>
129+
<junit-jupiter-version>6.0.0</junit-jupiter-version>
130130
<org.eclipse.emf.mwe2-version>2.24.0</org.eclipse.emf.mwe2-version>
131131
<org.eclipse.emf.mwe-version>1.18.0</org.eclipse.emf.mwe-version>
132132
<org.eclipse.lsp4j-version>0.24.0</org.eclipse.lsp4j-version>

‎org.eclipse.xtext.junit5.tests/pom.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,21 @@
1818
<artifactId>org.eclipse.xtext.testlanguages</artifactId>
1919
<version>${project.version}</version>
2020
</dependency>
21+
<dependency>
22+
<groupId>org.junit.jupiter</groupId>
23+
<artifactId>junit-jupiter-api</artifactId>
24+
<version>[5.0.0, 6.0.0)</version>
25+
</dependency>
26+
<dependency>
27+
<groupId>org.junit.jupiter</groupId>
28+
<artifactId>junit-jupiter-engine</artifactId>
29+
<version>[5.0.0, 6.0.0)</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>org.junit.vintage</groupId>
33+
<artifactId>junit-vintage-engine</artifactId>
34+
<version>[5.0.0, 6.0.0)</version>
35+
</dependency>
2136
</dependencies>
2237

2338
<build>

‎org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public String put(String key, String value) {
7272
mergable.getMainAttributes().put(MergeableManifest2.BUNDLE_VERSION, newVersion + ".qualifier");
7373
updateRequiredXtextBundles(mergable, newVersion);
7474
updateImportedXtextPackages(mergable, newVersion);
75+
updateImportedJunitPackages(mergable, "[6.0.0, 7.0.0)");
7576
updateExportedXtextPackages(mergable, newVersion);
7677
updateRequiredBundle(mergable, versionsFromDevBom);
7778

@@ -253,6 +254,23 @@ private static void updateImportedXtextPackages(MergeableManifest2 mergable, Str
253254
}
254255
mergable.addImportedPackages(updatedPackages.toArray(new String[0]), true);
255256
}
257+
258+
private static void updateImportedJunitPackages(MergeableManifest2 mergable, String newVersion) {
259+
String oldPackages = mergable.getMainAttributes().get(MergeableManifest2.IMPORT_PACKAGE);
260+
if (oldPackages == null)
261+
return;
262+
BundleOrPackageList importedPackages = BundleOrPackageList.fromInput(oldPackages, mergable.getLineDelimiter(),
263+
"version");
264+
List<String> updatedPackages = new ArrayList<>();
265+
for (BundleOrPackage importedPackage : importedPackages.list()) {
266+
String packageName = importedPackage.getName();
267+
if (packageName.startsWith("org.junit.jupiter")) {
268+
updatedPackages.add(packageName + ";version=\"" + newVersion + "\"");
269+
}
270+
}
271+
mergable.addImportedPackages(updatedPackages.toArray(new String[0]), true);
272+
}
273+
256274

257275
private static void updateExportedXtextPackages(MergeableManifest2 mergable, String newVersion) {
258276
String oldPackages = mergable.getMainAttributes().get(MergeableManifest2.EXPORT_PACKAGE);

‎org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.42.0";visibility:=reexport,
1515
Import-Package: jakarta.inject;version="2.0.1",
1616
org.apache.log4j;version="1.2.26",
1717
org.apache.log4j.spi;version="1.2.26",
18-
org.junit.jupiter.api;version="[5.1.0,6.0.0)",
19-
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",
20-
org.junit.jupiter.api.function;version="[5.1.0,6.0.0)",
21-
org.junit.jupiter.api.io;version="[5.1.0,6.0.0)",
22-
org.junit.jupiter.params;version="[5.1.0,6.0.0)",
23-
org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)",
18+
org.junit.jupiter.api;version="[6.0.0, 7.0.0)",
19+
org.junit.jupiter.api.extension;version="[6.0.0, 7.0.0)",
20+
org.junit.jupiter.api.function;version="[6.0.0, 7.0.0)",
21+
org.junit.jupiter.api.io;version="[6.0.0, 7.0.0)",
22+
org.junit.jupiter.params;version="[6.0.0, 7.0.0)",
23+
org.junit.jupiter.params.provider;version="[6.0.0, 7.0.0)",
2424
org.junit.platform.commons.support;version="[1.0.0,2.0.0)";resolution:=optional
2525
Bundle-ActivationPolicy: lazy
2626
Automatic-Module-Name: org.eclipse.xtext.testing

‎org.eclipse.xtext.testing.junit5.tests/pom.xml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,21 @@
1919
<artifactId>org.eclipse.xtext.testing</artifactId>
2020
<version>${project.version}</version>
2121
</dependency>
22+
<dependency>
23+
<groupId>org.junit.jupiter</groupId>
24+
<artifactId>junit-jupiter-api</artifactId>
25+
<version>[5.0.0, 6.0.0)</version>
26+
</dependency>
27+
<dependency>
28+
<groupId>org.junit.jupiter</groupId>
29+
<artifactId>junit-jupiter-engine</artifactId>
30+
<version>[5.0.0, 6.0.0)</version>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.junit.vintage</groupId>
34+
<artifactId>junit-vintage-engine</artifactId>
35+
<version>[5.0.0, 6.0.0)</version>
36+
</dependency>
2237
</dependencies>
2338

2439
<build>

‎org.eclipse.xtext.testing/META-INF/MANIFEST.MF‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.42.0";visibility:=reexport,
2626
org.eclipse.xtend.lib;bundle-version="2.42.0"
2727
Import-Package: org.apache.log4j;version="1.2.26",
2828
org.apache.log4j.spi;version="1.2.26",
29-
org.junit.jupiter.api;version="[5.1.0,6.0.0)",
30-
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",
31-
org.junit.jupiter.api.function;version="[5.1.0,6.0.0)",
32-
org.junit.jupiter.api.io;version="[5.1.0,6.0.0)",
33-
org.junit.jupiter.params;version="[5.1.0,6.0.0)",
34-
org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)",
29+
org.junit.jupiter.api;version="[6.0.0, 7.0.0)",
30+
org.junit.jupiter.api.extension;version="[6.0.0, 7.0.0)",
31+
org.junit.jupiter.api.function;version="[6.0.0, 7.0.0)",
32+
org.junit.jupiter.api.io;version="[6.0.0, 7.0.0)",
33+
org.junit.jupiter.params;version="[6.0.0, 7.0.0)",
34+
org.junit.jupiter.params.provider;version="[6.0.0, 7.0.0)",
3535
org.junit.platform.commons.support;version="[1.0.0,2.0.0)";resolution:=optional
3636
Bundle-ActivationPolicy: lazy
3737
Automatic-Module-Name: org.eclipse.xtext.testing

‎org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Import-Package: org.apache.log4j;version="1.2.26";resolution:=optional,
1111
org.junit;version="4.13.2",
1212
org.junit.internal;version="4.13.2",
1313
org.junit.internal.builders;version="4.13.2",
14-
org.junit.jupiter.api;version="[5.0.0,6.0.0)";resolution:=optional,
14+
org.junit.jupiter.api;version="[6.0.0, 7.0.0)";resolution:=optional,
1515
org.junit.rules;version="4.13.2";resolution:=optional,
1616
org.junit.runner;version="4.13.2",
1717
org.junit.runner.manipulation;version="4.13.2",

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@
125125

126126
<properties>
127127
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
128-
<tycho-version>4.0.13</tycho-version>
128+
<tycho-version>5.0.1</tycho-version>
129129

130130
<maven.compiler.source>17</maven.compiler.source>
131131
<maven.compiler.target>17</maven.compiler.target>
132132
<maven.compiler.release>17</maven.compiler.release>
133133
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
134134

135135
<build-helper-maven-plugin-version>3.3.0</build-helper-maven-plugin-version>
136-
<maven-surefire-version>3.0.0</maven-surefire-version>
136+
<maven-surefire-version>3.5.4</maven-surefire-version>
137137

138138
<!--
139139
This assumes that the child project has the same version as the parent.

‎xtext-latest.target‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,17 @@
6363
<unit id="org.hamcrest" version="2.2.0"/>
6464
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
6565
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
66-
<unit id="junit-jupiter-api" version="[5.0.0,6.0.0)"/>
67-
<unit id="junit-jupiter-engine" version="[5.0.0,6.0.0)"/>
68-
<unit id="junit-jupiter-migrationsupport" version="[5.0.0,6.0.0)"/>
69-
<unit id="junit-jupiter-params" version="[5.0.0,6.0.0)"/>
66+
<unit id="junit-jupiter-api" version="[6.0.0,7.0.0)"/>
67+
<unit id="junit-jupiter-engine" version="[6.0.0,7.0.0)"/>
68+
<unit id="junit-jupiter-migrationsupport" version="[6.0.0,7.0.0)"/>
69+
<unit id="junit-jupiter-params" version="[6.0.0,7.0.0)"/>
7070
<unit id="junit-platform-commons" version="[1.0.0,2.0.0)"/>
7171
<unit id="junit-platform-engine" version="[1.0.0,2.0.0)"/>
7272
<unit id="junit-platform-launcher" version="[1.0.0,2.0.0)"/>
7373
<unit id="junit-platform-runner" version="[1.0.0,2.0.0)"/>
7474
<unit id="junit-platform-suite-api" version="[1.0.0,2.0.0)"/>
7575
<unit id="junit-platform-suite-commons" version="[1.0.0,2.0.0)"/>
76-
<unit id="junit-vintage-engine" version="[5.0.0,6.0.0)"/>
76+
<unit id="junit-vintage-engine" version="[6.0.0,7.0.0)"/>
7777
</location>
7878
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
7979
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>

0 commit comments

Comments
 (0)