Skip to content
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

chore(deps): bump maven-surefire-plugin from 2.22.2 to 3.0.0 #16427

Merged
merged 5 commits into from
Apr 3, 2023
Merged

chore(deps): bump maven-surefire-plugin from 2.22.2 to 3.0.0 #16427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfe87fa
chore(deps): bump maven-surefire-plugin from 2.22.2 to 3.0.0
dependabot[bot] Mar 27, 2023
950b99d
Merge branch 'main' into dependabot/maven/org.apache.maven.plugins-ma…
mcollovati Apr 3, 2023
a2278cc
write non empty tsconfig.json file to avoid invalid char in JUnit XML…
mcollovati Apr 3, 2023
3407e1c
uses chars different from space as it is ignored
mcollovati Apr 3, 2023
4981282
mark TaskRunPnpmInstallTest as not thread safe
mcollovati Apr 3, 2023
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
5 changes: 4 additions & 1 deletion flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Objects;

import org.apache.commons.io.FileUtils;
Expand Down Expand Up @@ -113,7 +114,9 @@ public void viteShouldUpgradeFromEs2019() throws Exception {

@Test
public void should_notGenerateTsConfig_TsConfigExist() throws Exception {
Files.createFile(new File(npmFolder, "tsconfig.json").toPath());
Path tsconfig = Files
.createFile(new File(npmFolder, "tsconfig.json").toPath());
Files.writeString(tsconfig, "text", UTF_8);
taskGenerateTsConfig.execute();
Assert.assertFalse(
"Should not generate tsconfig.json when tsconfig.json exists",
Expand Down
2 changes: 2 additions & 0 deletions flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.Collections;
import java.util.List;

import net.jcip.annotations.NotThreadSafe;
import org.apache.commons.io.FileUtils;
import org.hamcrest.CoreMatchers;
import org.hamcrest.MatcherAssert;
Expand All @@ -49,6 +50,7 @@
import elemental.json.Json;
import elemental.json.JsonObject;

@NotThreadSafe
@Category(SlowTests.class)
public class TaskRunPnpmInstallTest extends TaskRunNpmInstallTest {

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@

<!-- Plugins -->
<frontend.maven.plugin.version>1.5</frontend.maven.plugin.version>
<maven.surefire.plugin.version>2.22.2</maven.surefire.plugin.version>
<maven.surefire.plugin.version>3.0.0</maven.surefire.plugin.version>
<maven.failsafe.plugin.version>2.22.2</maven.failsafe.plugin.version>
<maven.war.plugin.version>3.3.2</maven.war.plugin.version>
<maven.deploy.plugin.version>2.8.2</maven.deploy.plugin.version>
Expand Down