|
26 | 26 | import java.io.File;
|
27 | 27 | import java.io.IOException;
|
28 | 28 | import java.net.MalformedURLException;
|
| 29 | +import java.net.URI; |
29 | 30 | import java.net.URISyntaxException;
|
30 | 31 | import java.net.URL;
|
31 | 32 | import java.net.URLClassLoader;
|
32 |
| -import java.net.URI; |
33 |
| -import java.nio.file.Files; |
34 | 33 | import java.nio.file.FileSystem;
|
35 | 34 | import java.nio.file.FileSystems;
|
| 35 | +import java.nio.file.Files; |
36 | 36 | import java.nio.file.Path;
|
37 | 37 | import java.nio.file.Paths;
|
38 | 38 | import java.security.CodeSigner;
|
|
42 | 42 | import java.util.List;
|
43 | 43 | import java.util.Map;
|
44 | 44 |
|
45 |
| -import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.*; |
| 45 | +import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.classLoaderCanLoadClass; |
| 46 | +import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.implementationVersionGte; |
| 47 | +import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.implementationVersionLte; |
| 48 | +import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.isAgentClassLoader; |
| 49 | +import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.isInAnyPackage; |
| 50 | +import static co.elastic.apm.agent.sdk.bytebuddy.CustomElementMatchers.isInternalPluginClassLoader; |
46 | 51 | import static net.bytebuddy.matcher.ElementMatchers.none;
|
47 | 52 | import static org.assertj.core.api.Assertions.assertThat;
|
48 | 53 |
|
@@ -84,7 +89,7 @@ void testSemVerFallbackOnMavenProperties(@TempDir Path tempDir) throws URISyntax
|
84 | 89 | Map<String, String> fsProperties = new HashMap<>();
|
85 | 90 | fsProperties.put("create", "false");
|
86 | 91 |
|
87 |
| - URI fsUri = URI.create("jar:file://" + modifiedJar.toAbsolutePath()); |
| 92 | + URI fsUri = URI.create("jar:" + modifiedJar.toUri()); |
88 | 93 | try (FileSystem zipFs = FileSystems.newFileSystem(fsUri, fsProperties)) {
|
89 | 94 | Files.delete(zipFs.getPath("META-INF", "MANIFEST.MF"));
|
90 | 95 | }
|
|
0 commit comments