Skip to content

Commit 4ab5eae

Browse files
FlorianKroissrubenporras
authored andcommitted
fix(deps): Update to tycho 5.0.2 and JUnit 6
1 parent 2fcaac3 commit 4ab5eae

File tree

4 files changed

+4
-15
lines changed

4 files changed

+4
-15
lines changed

org.eclipse.lsp4e.test/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ Require-Bundle: org.eclipse.core.runtime,
3030
org.eclipse.e4.ui.workbench,
3131
org.eclipse.tm4e.ui,
3232
org.eclipse.core.filesystem,
33-
junit-jupiter-api;bundle-version="[5.14.1,6.0.0)",
34-
junit-jupiter-params;bundle-version="[5.14.1,6.0.0)",
33+
junit-jupiter-api;bundle-version="[6.0.1,7.0.0)",
34+
junit-jupiter-params;bundle-version="[6.0.1,7.0.0)",
3535
org.hamcrest,
3636
org.opentest4j
3737
Automatic-Module-Name: org.eclipse.lsp4e.test

org.eclipse.lsp4e.test/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
<useUIThread>true</useUIThread>
4444
<forkedProcessTimeoutInSeconds>1200</forkedProcessTimeoutInSeconds>
4545
<argLine>-Dfile.encoding=${project.build.sourceEncoding} -Xms1g -Xmx1g -Djava.util.logging.config.file=${project.basedir}/src/jul.properties ${ui.test.vmargs} ${os-jvm-flags}</argLine>
46+
<providerHint>junit6</providerHint>
4647
</configuration>
4748
</plugin>
4849
</plugins>

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<maven.minimum.version>3.9.9</maven.minimum.version>
14-
<tycho-version>5.0.1</tycho-version>
14+
<tycho-version>5.0.2</tycho-version>
1515
<tycho.scmUrl>scm:git:https://github.com/eclipse-lsp4e/lsp4e.git</tycho.scmUrl>
1616
<ui.test.vmargs></ui.test.vmargs>
1717
<jgit.dirtyWorkingTree>error</jgit.dirtyWorkingTree>

target-platforms/target-platform-latest/target-platform-latest.target

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@
2121
<unit id="org.commonmark.ext-gfm-tables" version="0.0.0"/>
2222
<unit id="com.google.guava" version="0.0.0"/>
2323
<unit id="com.google.guava.failureaccess" version="0.0.0"/>
24-
<!-- Pinning JUnit 5 for now -->
25-
<unit id="junit-jupiter-api" version="5.14.1"/>
26-
<unit id="junit-jupiter-engine" version="5.14.1"/>
27-
<unit id="junit-jupiter-params" version="5.14.1"/>
28-
<unit id="junit-platform-commons" version="1.14.1"/>
29-
<unit id="junit-platform-engine" version="1.14.1"/>
30-
<unit id="junit-platform-launcher" version="1.14.1"/>
31-
<unit id="junit-platform-runner" version="1.14.1"/>
32-
<unit id="junit-platform-suite-api" version="1.14.1"/>
33-
<unit id="junit-platform-suite-commons" version="1.14.1"/>
34-
<unit id="junit-platform-suite-engine" version="1.14.1"/>
35-
<unit id="junit-vintage-engine" version="5.14.1"/>
3624
</location>
3725
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
3826
<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>

0 commit comments

Comments
 (0)