diff --git a/deploy/aws/java11Exec/pom.xml b/deploy/aws/java11Exec/pom.xml index f91f132..dd8349e 100644 --- a/deploy/aws/java11Exec/pom.xml +++ b/deploy/aws/java11Exec/pom.xml @@ -35,7 +35,7 @@ junit junit - 4.13.1 + 4.13.2 diff --git a/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java b/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java index 6b94097..7e5a16c 100644 --- a/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java +++ b/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java @@ -71,8 +71,8 @@ class SimpleMakefile { .map(s -> s.startsWith("@") ? s.substring(1) : s) .map(s -> s.contains("#") ? s.substring(0, s.indexOf("#")) : s) .filter(s -> !s.isEmpty()) - .map(s -> s.replaceAll("/usr/java/lib/hamcrest-core-1.3.jar", "/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar")) - .map(s -> s.replaceAll("/usr/java/lib/junit-4.11.jar", "/var/task/lib/junit.junit-4.11.jar")) + .map(s -> s.replaceAll("/usr/java/lib/hamcrest-core-1\\.3\\.jar", "/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar")) + .map(s -> s.replaceAll("/usr/java/lib/junit-4\\.13\\.jar", "/var/task/lib/junit.junit-4.13.2.jar")) .toArray(String[]::new); rules.put(ruleName, trimmedCommands); diff --git a/deploy/aws/java11Exec/src/test/java/poseidon/SimpleMakefileTest.java b/deploy/aws/java11Exec/src/test/java/poseidon/SimpleMakefileTest.java index 5c97f51..f367941 100644 --- a/deploy/aws/java11Exec/src/test/java/poseidon/SimpleMakefileTest.java +++ b/deploy/aws/java11Exec/src/test/java/poseidon/SimpleMakefileTest.java @@ -39,8 +39,8 @@ public class SimpleMakefileTest { static final String SuccessfulMakefileWithAssignments = Base64.getEncoder().encodeToString( ("test:\n" + - "\tjavac -encoding utf8 -cp .:/usr/java/lib/hamcrest-core-1.3.jar:/usr/java/lib/junit-4.11.jar ${FILENAME}\n" + - "\tjava -Dfile.encoding=UTF8 -cp .:/usr/java/lib/hamcrest-core-1.3.jar:/usr/java/lib/junit-4.11.jar org.junit.runner.JUnitCore ${CLASS_NAME}\n" + "\tjavac -encoding utf8 -cp .:/usr/java/lib/hamcrest-core-1.3.jar:/usr/java/lib/junit-4.13.jar ${FILENAME}\n" + + "\tjava -Dfile.encoding=UTF8 -cp .:/usr/java/lib/hamcrest-core-1.3.jar:/usr/java/lib/junit-4.13.jar org.junit.runner.JUnitCore ${CLASS_NAME}\n" ).getBytes(StandardCharsets.UTF_8)); static final String SuccessfulMakefileWithComment = Base64.getEncoder().encodeToString( @@ -126,8 +126,8 @@ public class SimpleMakefileTest { SimpleMakefile make = new SimpleMakefile(files); String cmd = make.parseCommand(command); - assertEquals("javac -encoding utf8 -cp .:/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar:/var/task/lib/junit.junit-4.11.jar RecursiveMath-Test.java && " + - "java -Dfile.encoding=UTF8 -cp .:/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar:/var/task/lib/junit.junit-4.11.jar org.junit.runner.JUnitCore RecursiveMath", cmd); + assertEquals("javac -encoding utf8 -cp .:/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar:/var/task/lib/junit.junit-4.13.2.jar RecursiveMath-Test.java && " + + "java -Dfile.encoding=UTF8 -cp .:/var/task/lib/org.hamcrest.hamcrest-core-1.3.jar:/var/task/lib/junit.junit-4.13.2.jar org.junit.runner.JUnitCore RecursiveMath", cmd); } catch (NoMakefileFoundException | InvalidMakefileException | NoMakeCommandException ignored) { fail(); }