diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java index c440a01d..c0bcd233 100644 --- a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java +++ b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/ConcurrencySigTest.java @@ -21,9 +21,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.net.URI; -import java.nio.file.FileSystem; -import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -40,8 +37,6 @@ public class ConcurrencySigTest extends SigTestEE { private static final TestLogger log = TestLogger.get(ConcurrencySigTest.class); - private static final String SIG_FILE_VER_SEP = "_"; - public ConcurrencySigTest() { setup(); } @@ -135,12 +130,12 @@ protected File writeStreamToTempFile(InputStream inputStream, String tempFilePre } } - protected File writeStreamToSigFile(InputStream inputStream, String packageVersion) throws IOException { + protected File writeStreamToSigFile(InputStream inputStream) throws IOException { FileOutputStream outputStream = null; String tmpdir = System.getProperty("java.io.tmpdir"); try { File sigfile = new File( - tmpdir + File.separator + SignatureTests.SIG_FILE_NAME + SIG_FILE_VER_SEP + packageVersion); + tmpdir + File.separator + SignatureTests.SIG_FILE_NAME); if (sigfile.exists()) { sigfile.delete(); log.info("Existing signature file deleted to create new one"); @@ -206,13 +201,10 @@ public void signatureTest() throws Fault { log.info("packageFile location is :" + packageListFile); mapFileAsProps = getSigTestDriver().loadMapFile(mapFile); - String packageVersion = mapFileAsProps.getProperty("jakarta.enterprise.concurrent"); - log.info("Package version from mapfile :" + packageVersion); InputStream inStreamSigFile = ConcurrencySigTest.class.getClassLoader() - .getResourceAsStream("ee/jakarta/tck/concurrent/spec/signature/" + SignatureTests.SIG_FILE_NAME - + SIG_FILE_VER_SEP + packageVersion); - File sigFile = writeStreamToSigFile(inStreamSigFile, packageVersion); + .getResourceAsStream("ee/jakarta/tck/concurrent/spec/signature/" + SignatureTests.SIG_FILE_NAME); + File sigFile = writeStreamToSigFile(inStreamSigFile); log.info("signature File location is :" + sigFile.getCanonicalPath()); signatureRepositoryDir = System.getProperty("java.io.tmpdir"); diff --git a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTests.java b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTests.java index 77e4980e..838dfd9c 100644 --- a/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTests.java +++ b/tck/src/main/java/ee/jakarta/tck/concurrent/spec/signature/SignatureTests.java @@ -27,7 +27,7 @@ public class SignatureTests extends TestClient { - public static final String SIG_FILE_NAME = "jakarta.enterprise.concurrent.sig_3.0.0"; + public static final String SIG_FILE_NAME = "jakarta.enterprise.concurrent.sig"; public static final String SIG_MAP_NAME = "sig-test.map"; public static final String SIG_PKG_NAME = "sig-test-pkg-list.txt"; diff --git a/tck/src/main/resources/ee/jakarta/tck/concurrent/spec/signature/jakarta.enterprise.concurrent.sig_3.0.0 b/tck/src/main/resources/ee/jakarta/tck/concurrent/spec/signature/jakarta.enterprise.concurrent.sig similarity index 100% rename from tck/src/main/resources/ee/jakarta/tck/concurrent/spec/signature/jakarta.enterprise.concurrent.sig_3.0.0 rename to tck/src/main/resources/ee/jakarta/tck/concurrent/spec/signature/jakarta.enterprise.concurrent.sig