Skip to content

Upgrade junit 5 to junit 6 #3573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mehmet-karaman wants to merge 1 commit into from
Closed

Upgrade junit 5 to junit 6 #3573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.xtext.dev-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
</scm>
<properties>
<junit-platform-version>1.14.0</junit-platform-version>
<junit-jupiter-version>5.14.0</junit-jupiter-version>
<junit-jupiter-version>6.0.0</junit-jupiter-version>
<org.eclipse.emf.mwe2-version>2.24.0</org.eclipse.emf.mwe2-version>
<org.eclipse.emf.mwe-version>1.18.0</org.eclipse.emf.mwe-version>
<org.eclipse.lsp4j-version>0.24.0</org.eclipse.lsp4j-version>
Expand Down
15 changes: 15 additions & 0 deletions org.eclipse.xtext.junit5.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,21 @@
<artifactId>org.eclipse.xtext.testlanguages</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>[5.0.0, 6.0.0)</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>[5.0.0, 6.0.0)</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>[5.0.0, 6.0.0)</version>
</dependency>
</dependencies>

<build>
Expand Down
18 changes: 18 additions & 0 deletions org.eclipse.xtext.relengutil/src/org/eclipse/xtext/relengutil/BumpVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ public String put(String key, String value) {
mergable.getMainAttributes().put(MergeableManifest2.BUNDLE_VERSION, newVersion + ".qualifier");
updateRequiredXtextBundles(mergable, newVersion);
updateImportedXtextPackages(mergable, newVersion);
updateImportedJunitPackages(mergable, "[6.0.0, 7.0.0)");
updateExportedXtextPackages(mergable, newVersion);
updateRequiredBundle(mergable, versionsFromDevBom);

Expand Down Expand Up @@ -253,6 +254,23 @@ private static void updateImportedXtextPackages(MergeableManifest2 mergable, Str
}
mergable.addImportedPackages(updatedPackages.toArray(new String[0]), true);
}

private static void updateImportedJunitPackages(MergeableManifest2 mergable, String newVersion) {
String oldPackages = mergable.getMainAttributes().get(MergeableManifest2.IMPORT_PACKAGE);
if (oldPackages == null)
return;
BundleOrPackageList importedPackages = BundleOrPackageList.fromInput(oldPackages, mergable.getLineDelimiter(),
"version");
List<String> updatedPackages = new ArrayList<>();
for (BundleOrPackage importedPackage : importedPackages.list()) {
String packageName = importedPackage.getName();
if (packageName.startsWith("org.junit.jupiter")) {
updatedPackages.add(packageName + ";version=\"" + newVersion + "\"");
}
}
mergable.addImportedPackages(updatedPackages.toArray(new String[0]), true);
}


private static void updateExportedXtextPackages(MergeableManifest2 mergable, String newVersion) {
String oldPackages = mergable.getMainAttributes().get(MergeableManifest2.EXPORT_PACKAGE);
Expand Down
12 changes: 6 additions & 6 deletions org.eclipse.xtext.testing.junit5.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.42.0";visibility:=reexport,
Import-Package: jakarta.inject;version="2.0.1",
org.apache.log4j;version="1.2.26",
org.apache.log4j.spi;version="1.2.26",
org.junit.jupiter.api;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.function;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.io;version="[5.1.0,6.0.0)",
org.junit.jupiter.params;version="[5.1.0,6.0.0)",
org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)",
org.junit.jupiter.api;version="[6.0.0, 7.0.0)",
org.junit.jupiter.api.extension;version="[6.0.0, 7.0.0)",
org.junit.jupiter.api.function;version="[6.0.0, 7.0.0)",
org.junit.jupiter.api.io;version="[6.0.0, 7.0.0)",
org.junit.jupiter.params;version="[6.0.0, 7.0.0)",
org.junit.jupiter.params.provider;version="[6.0.0, 7.0.0)",
org.junit.platform.commons.support;version="[1.0.0,2.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.xtext.testing
Expand Down
15 changes: 15 additions & 0 deletions org.eclipse.xtext.testing.junit5.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,21 @@
<artifactId>org.eclipse.xtext.testing</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>[5.0.0, 6.0.0)</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>[5.0.0, 6.0.0)</version>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>[5.0.0, 6.0.0)</version>
</dependency>
</dependencies>

<build>
Expand Down
12 changes: 6 additions & 6 deletions org.eclipse.xtext.testing/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.42.0";visibility:=reexport,
org.eclipse.xtend.lib;bundle-version="2.42.0"
Import-Package: org.apache.log4j;version="1.2.26",
org.apache.log4j.spi;version="1.2.26",
org.junit.jupiter.api;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.extension;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.function;version="[5.1.0,6.0.0)",
org.junit.jupiter.api.io;version="[5.1.0,6.0.0)",
org.junit.jupiter.params;version="[5.1.0,6.0.0)",
org.junit.jupiter.params.provider;version="[5.1.0,6.0.0)",
org.junit.jupiter.api;version="[6.0.0, 7.0.0)",
org.junit.jupiter.api.extension;version="[6.0.0, 7.0.0)",
org.junit.jupiter.api.function;version="[6.0.0, 7.0.0)",
org.junit.jupiter.api.io;version="[6.0.0, 7.0.0)",
org.junit.jupiter.params;version="[6.0.0, 7.0.0)",
org.junit.jupiter.params.provider;version="[6.0.0, 7.0.0)",
org.junit.platform.commons.support;version="[1.0.0,2.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.xtext.testing
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.ui.testing/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Import-Package: org.apache.log4j;version="1.2.26";resolution:=optional,
org.junit;version="4.13.2",
org.junit.internal;version="4.13.2",
org.junit.internal.builders;version="4.13.2",
org.junit.jupiter.api;version="[5.0.0,6.0.0)";resolution:=optional,
org.junit.jupiter.api;version="[6.0.0, 7.0.0)";resolution:=optional,
org.junit.rules;version="4.13.2";resolution:=optional,
org.junit.runner;version="4.13.2",
org.junit.runner.manipulation;version="4.13.2",
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@

<properties>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
<tycho-version>4.0.13</tycho-version>
<tycho-version>5.0.1</tycho-version>

<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>

<build-helper-maven-plugin-version>3.3.0</build-helper-maven-plugin-version>
<maven-surefire-version>3.0.0</maven-surefire-version>
<maven-surefire-version>3.5.4</maven-surefire-version>

<!--
This assumes that the child project has the same version as the parent.
Expand Down
10 changes: 5 additions & 5 deletions xtext-latest.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.apache.commons.commons-logging" version="0.0.0"/>
<unit id="junit-jupiter-api" version="[5.0.0,6.0.0)"/>
<unit id="junit-jupiter-engine" version="[5.0.0,6.0.0)"/>
<unit id="junit-jupiter-migrationsupport" version="[5.0.0,6.0.0)"/>
<unit id="junit-jupiter-params" version="[5.0.0,6.0.0)"/>
<unit id="junit-jupiter-api" version="[6.0.0,7.0.0)"/>
<unit id="junit-jupiter-engine" version="[6.0.0,7.0.0)"/>
<unit id="junit-jupiter-migrationsupport" version="[6.0.0,7.0.0)"/>
<unit id="junit-jupiter-params" version="[6.0.0,7.0.0)"/>
<unit id="junit-platform-commons" version="[1.0.0,2.0.0)"/>
<unit id="junit-platform-engine" version="[1.0.0,2.0.0)"/>
<unit id="junit-platform-launcher" version="[1.0.0,2.0.0)"/>
<unit id="junit-platform-runner" version="[1.0.0,2.0.0)"/>
<unit id="junit-platform-suite-api" version="[1.0.0,2.0.0)"/>
<unit id="junit-platform-suite-commons" version="[1.0.0,2.0.0)"/>
<unit id="junit-vintage-engine" version="[5.0.0,6.0.0)"/>
<unit id="junit-vintage-engine" version="[6.0.0,7.0.0)"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
Expand Down
Loading