diff --git a/backend/pom.xml b/backend/pom.xml index dc9d501331..5ee3fb494e 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -150,10 +150,6 @@ org.apache.logging.log4j log4j-slf4j-impl - - org.apache-extras.beanshell - bsh - @@ -520,15 +516,6 @@ src/main/resources/jmeter/lib/ext jython-standalone.jar - - org.apache-extras.beanshell - bsh - 2.0b6 - jar - true - src/main/resources/jmeter/lib/ext - bsh-2.0b6.jar - ${project.build.directory}/wars false diff --git a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java index f6bd0a53b8..43131a3c25 100644 --- a/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java +++ b/backend/src/main/java/io/metersphere/api/jmeter/JMeterService.java @@ -30,7 +30,7 @@ public class JMeterService { public void run(String testId, String debugReportId, InputStream is) { String JMETER_HOME = getJmeterHome(); - NewDriver.setContextClassLoader(); +// NewDriver.setContextClassLoader(); String JMETER_PROPERTIES = JMETER_HOME + "/bin/jmeter.properties"; JMeterUtils.loadJMeterProperties(JMETER_PROPERTIES); diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index ee74568be0..cf6b065263 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit ee74568be0beba46da19616f5832e83f9164c688 +Subproject commit cf6b06526324326a563d933e07118fac014a63b4