From c6f118ecc88534a4d8f273611befcff9effd2858 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 1 Oct 2022 15:07:42 -0500
Subject: [PATCH] Bump jetty-test-helper from 5.9 to 6.0 (#8636)

* Bump jetty-test-helper from 5.9 to 6.0

Bumps [jetty-test-helper](https://github.com/eclipse/jetty.toolchain) from 5.9 to 6.0.
- [Release notes](https://github.com/eclipse/jetty.toolchain/releases)
- [Commits](https://github.com/eclipse/jetty.toolchain/compare/jetty-test-helper-5.9...jetty-test-helper-6.0)

---
updated-dependencies:
- dependency-name: org.eclipse.jetty.toolchain:jetty-test-helper
  dependency-type: direct:production
  update-type: version-update:semver-major
...

* Fixing broken testcase

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
---
 .../jetty/test/keystore/KeystoreGeneratorTest.java       | 9 +++++----
 .../eclipse/jetty/websocket/javax/tests/WSServer.java    | 1 +
 pom.xml                                                  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/jetty-keystore/src/test/java/org/eclipse/jetty/test/keystore/KeystoreGeneratorTest.java b/jetty-keystore/src/test/java/org/eclipse/jetty/test/keystore/KeystoreGeneratorTest.java
index fd3c0912d22..20116df2c80 100644
--- a/jetty-keystore/src/test/java/org/eclipse/jetty/test/keystore/KeystoreGeneratorTest.java
+++ b/jetty-keystore/src/test/java/org/eclipse/jetty/test/keystore/KeystoreGeneratorTest.java
@@ -15,6 +15,7 @@ package org.eclipse.jetty.test.keystore;
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -34,7 +35,7 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.SslConnectionFactory;
 import org.eclipse.jetty.server.handler.AbstractHandler;
-import org.eclipse.jetty.toolchain.test.MavenTestingUtils;
+import org.eclipse.jetty.toolchain.test.jupiter.WorkDir;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -55,12 +56,12 @@ public class KeystoreGeneratorTest
     }
 
     @BeforeEach
-    public void before() throws Exception
+    public void before(WorkDir workDir) throws Exception
     {
         // Generate a test keystore.
         String password = "myKeystorePassword";
-        File targetTestingDir = MavenTestingUtils.getTargetTestingDir();
-        File myPassword = KeystoreGenerator.generateTestKeystore(targetTestingDir.getAbsolutePath(), password);
+        Path outputFile = workDir.getEmptyPathDir().resolve("keystore-test.p12");
+        File myPassword = KeystoreGenerator.generateTestKeystore(outputFile.toString(), password);
         assertTrue(myPassword.exists());
 
         // Configure the SslContextFactory and HttpConnectionFactory to use the keystore.
diff --git a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
index dccfafa5b5a..291bd8aa3fe 100644
--- a/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
+++ b/jetty-websocket/websocket-javax-tests/src/main/java/org/eclipse/jetty/websocket/javax/tests/WSServer.java
@@ -130,6 +130,7 @@ public class WSServer extends LocalServer implements LocalFuzzer.Provider
         {
             File testWebXml = MavenTestingUtils.getTestResourceFile(testResourceName);
             Path webXml = webInf.resolve("web.xml");
+            Files.deleteIfExists(webXml);
             IO.copy(testWebXml, webXml.toFile());
         }
 
diff --git a/pom.xml b/pom.xml
index fb593892e18..fdda231118e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
     <jetty-quiche-native.version>0.12.0</jetty-quiche-native.version>
     <jetty.servlet.api.version>4.0.6</jetty.servlet.api.version>
     <jetty-test-policy.version>1.2</jetty-test-policy.version>
-    <jetty.test.version>5.9</jetty.test.version>
+    <jetty.test.version>6.0</jetty.test.version>
     <jmh.version>1.35</jmh.version>
     <jna.version>5.12.1</jna.version>
     <jnr-constants.version>0.10.3</jnr-constants.version>