From 07d5865ea6b77354acd2329c26b5ffbd77bae68c Mon Sep 17 00:00:00 2001 From: Felix Schumacher Date: Sun, 4 Feb 2018 09:39:05 +0000 Subject: [PATCH] Update classpath in mirror-server scripts to reflect log4j updates. Followup to r1821929 git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1823083 13f79535-47bb-0310-9956-ffa450edef68 Former-commit-id: 6cf28e673b93ae0b6f1ad91a0880752481796ea6 --- bin/mirror-server.cmd | 4 ++-- bin/mirror-server.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/mirror-server.cmd b/bin/mirror-server.cmd index 5993c0a366..c075731d58 100644 --- a/bin/mirror-server.cmd +++ b/bin/mirror-server.cmd @@ -26,8 +26,8 @@ set JMETER_CMD_LINE_ARGS=%* cd /D %~dp0 set CP=..\lib\ext\ApacheJMeter_http.jar;..\lib\ext\ApacheJMeter_core.jar;..\lib\jorphan.jar;..\lib\oro-2.0.8.jar -set CP=%CP%;..\lib\slf4j-api-1.7.25.jar;..\lib\jcl-over-slf4j-1.7.25.jar;..\lib\log4j-slf4j-impl-2.8.2.jar -set CP=%CP%;..\lib\log4j-api-2.8.2.jar;..\lib\log4j-core-2.8.2.jar;..\lib\log4j-1.2-api-2.8.2.jar +set CP=%CP%;..\lib\slf4j-api-1.7.25.jar;..\lib\jcl-over-slf4j-1.7.25.jar;..\lib\log4j-slf4j-impl-2.10.0.jar +set CP=%CP%;..\lib\log4j-api-2.10.0.jar;..\lib\log4j-core-2.10.0.jar;..\lib\log4j-1.2-api-2.10.0.jar java -cp %CP% org.apache.jmeter.protocol.http.control.HttpMirrorServer %JMETER_CMD_LINE_ARGS% diff --git a/bin/mirror-server.sh b/bin/mirror-server.sh index 7dd5c6b55a..3f8a82e21d 100755 --- a/bin/mirror-server.sh +++ b/bin/mirror-server.sh @@ -21,7 +21,7 @@ cd "$(dirname "$0")" || exit 1 CP=../lib/ext/ApacheJMeter_http.jar:../lib/ext/ApacheJMeter_core.jar:../lib/jorphan.jar:../lib/oro-2.0.8.jar -CP=${CP}:../lib/slf4j-api-1.7.25.jar:../lib/jcl-over-slf4j-1.7.25.jar:../lib/log4j-slf4j-impl-2.8.2.jar -CP=${CP}:../lib/log4j-api-2.8.2.jar:../lib/log4j-core-2.8.2.jar:../lib/log4j-1.2-api-2.8.2.jar +CP=${CP}:../lib/slf4j-api-1.7.25.jar:../lib/jcl-over-slf4j-1.7.25.jar:../lib/log4j-slf4j-impl-2.10.0.jar +CP=${CP}:../lib/log4j-api-2.10.0.jar:../lib/log4j-core-2.10.0.jar:../lib/log4j-1.2-api-2.10.0.jar java -cp $CP org.apache.jmeter.protocol.http.control.HttpMirrorServer "$@"