From cfe87faefa9292f378c84b57b58683c821556a7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Mar 2023 13:42:14 +0000 Subject: [PATCH 1/4] chore(deps): bump maven-surefire-plugin from 2.22.2 to 3.0.0 Bumps [maven-surefire-plugin](https://github.com/apache/maven-surefire) from 2.22.2 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](https://github.com/apache/maven-surefire/compare/surefire-2.22.2...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9f5371ea52e..3ec72bf966d 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 1.5 - 2.22.2 + 3.0.0 2.22.2 3.3.2 2.8.2 From a2278cc13c8d320bd15d1716598cbc4e0c072851 Mon Sep 17 00:00:00 2001 From: Marco Collovati Date: Mon, 3 Apr 2023 09:48:59 +0200 Subject: [PATCH 2/4] write non empty tsconfig.json file to avoid invalid char in JUnit XML test report --- .../flow/server/frontend/TaskGenerateTsConfigTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java index acfcd4c5680..c590b059c37 100644 --- a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java +++ b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java @@ -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; @@ -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, " ", UTF_8); taskGenerateTsConfig.execute(); Assert.assertFalse( "Should not generate tsconfig.json when tsconfig.json exists", From 3407e1ce489ae547f357d25264ad2abd625f6448 Mon Sep 17 00:00:00 2001 From: Marco Collovati Date: Mon, 3 Apr 2023 12:12:41 +0200 Subject: [PATCH 3/4] uses chars different from space as it is ignored --- .../vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java index c590b059c37..42348699e4a 100644 --- a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java +++ b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskGenerateTsConfigTest.java @@ -116,7 +116,7 @@ public void viteShouldUpgradeFromEs2019() throws Exception { public void should_notGenerateTsConfig_TsConfigExist() throws Exception { Path tsconfig = Files .createFile(new File(npmFolder, "tsconfig.json").toPath()); - Files.writeString(tsconfig, " ", UTF_8); + Files.writeString(tsconfig, "text", UTF_8); taskGenerateTsConfig.execute(); Assert.assertFalse( "Should not generate tsconfig.json when tsconfig.json exists", From 4981282a71bab34bb1be9f7c249f4f2ceea00447 Mon Sep 17 00:00:00 2001 From: Marco Collovati Date: Mon, 3 Apr 2023 13:01:40 +0200 Subject: [PATCH 4/4] mark TaskRunPnpmInstallTest as not thread safe --- .../com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java index 845cf7ae1c5..4163999e1af 100644 --- a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java +++ b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java @@ -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; @@ -49,6 +50,7 @@ import elemental.json.Json; import elemental.json.JsonObject; +@NotThreadSafe @Category(SlowTests.class) public class TaskRunPnpmInstallTest extends TaskRunNpmInstallTest {