From 09b90a4555db3cc35c5b22b416c385d47ae442d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20Pa=C3=9F?=
<22845248+mpass99@users.noreply.github.com>
Date: Sun, 24 Apr 2022 17:14:56 +0200
Subject: [PATCH] Java11Exec: Quick fix for test dependencies.
---
deploy/aws/java11Exec/pom.xml | 9 +++++++--
.../src/main/java/poseidon/SimpleMakefile.java | 2 ++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/deploy/aws/java11Exec/pom.xml b/deploy/aws/java11Exec/pom.xml
index 5fbbb37..10c60c6 100644
--- a/deploy/aws/java11Exec/pom.xml
+++ b/deploy/aws/java11Exec/pom.xml
@@ -35,8 +35,13 @@
junit
junit
- 4.13.1
- test
+ 4.11
+
+
+
+ org.hamcrest
+ hamcrest-core
+ 1.3
diff --git a/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java b/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java
index 5ff0dd7..cb7a7cf 100644
--- a/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java
+++ b/deploy/aws/java11Exec/src/main/java/poseidon/SimpleMakefile.java
@@ -70,6 +70,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"))
.toArray(String[]::new);
rules.put(ruleName, trimmedCommands);