fix report generation

IntershopCommunicationsAG · Jun 10, 2022 · c6f7857 · c6f7857
1 parent e5ab1d4
commit c6f7857
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,13 +13,12 @@ ENV PATH="${JMETER_BIN}:$PATH" \
     TZ="Europe/Amsterdam" \
     NONGUI="TRUE"
 
-RUN apk add --no-cache curl bash tzdata openjdk17 \
+RUN apk add --no-cache curl bash tzdata openjdk11 \
     && curl -L https://archive.apache.org/dist/jmeter/binaries/apache-jmeter-${JMETER_VERSION}.tgz > /tmp/jmeter.tgz \
     && tar -xvf /tmp/jmeter.tgz -C /opt \
     && rm -f /tmp/jmeter.tgz \
     && rm -f /opt/apache-jmeter-*/lib/log4j-*.* \
-    && rm -f /opt/apache-jmeter-*/plugins/lib/log4j-*.* \
-    && rm -f /opt/apache-jmeter-*/plugins/lib/ext/log4j-*.* \
+    && rm -f /opt/apache-jmeter-*/lib/ext/log4j-*.* \
     && apk add --no-cache nss \
     && rm -rf /var/cache/apk/*
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -18,10 +18,6 @@ dependencies {
     lib_ext("com.microsoft.sqlserver:mssql-jdbc:10.2.1.jre17")
     lib_ext("com.oracle.database.jdbc:ojdbc10:19.14.0.0")
     lib_ext("kg.apc:jmeter-plugins-functions:2.1")
-    // remove log4j shell
-    lib_ext("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
-    lib_ext("org.apache.logging.log4j:log4j-api:2.17.2")
-    lib_ext("org.apache.logging.log4j:log4j-core:2.17.2")
 
     lib_ext("org.mozilla:rhino-engine:1.7.13")