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>
This commit is contained in:
parent
7eafcd6867
commit
c6f118ecc8
|
@ -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.
|
||||
|
|
|
@ -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());
|
||||
}
|
||||
|
||||
|
|
2
pom.xml
2
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>
|
||||
|
|
Loading…
Reference in New Issue