diff --git a/build.gradle b/build.gradle index bf5d51a..a687975 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,12 @@ plugins { id 'org.springframework.boot' version '2.7.17' id 'io.spring.dependency-management' version '1.1.3' + id 'com.diffplug.eclipse.apt' version '3.41.1' id 'java' + id 'java-library' + id 'eclipse-wtp' + id 'idea' id 'war' -// id "org.sonarqube" version "4.2.1.3168" } bootJar.enabled = true @@ -11,8 +14,8 @@ jar.enabled = false group = 'com.eactive' version = '2.0.0' -sourceCompatibility = "1.8" -targetCompatibility = "1.8" +sourceCompatibility = "17" +targetCompatibility = "17" configurations { @@ -31,6 +34,12 @@ repositories { mavenCentral() } +war { + archiveFileName = "elink-test-master.war" + exclude '**/persistence.xml' + exclude '**/context.xml' +} + dependencies { annotationProcessor "org.mapstruct:mapstruct-processor:1.5.5.Final" @@ -72,6 +81,11 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' + // Weblogic 14.1.2(Java17) 대응 관련 + // Nashorn(JavaScript 엔진, Java15이상 JRE System Library에서 제외됨) 대응, 대체용 검토필요. +// implementation 'org.graalvm.js:js:25.0.0' +// implementation 'org.graalvm.js:js-scriptengine:25.0.0' + implementation "org.openjdk.nashorn:nashorn-core:15.4" } bootJar { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 442d913..48c0a02 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/eactive/testmaster/loadtest/service/VirtualUser.java b/src/main/java/com/eactive/testmaster/loadtest/service/VirtualUser.java index d4343bc..74bf02f 100644 --- a/src/main/java/com/eactive/testmaster/loadtest/service/VirtualUser.java +++ b/src/main/java/com/eactive/testmaster/loadtest/service/VirtualUser.java @@ -7,24 +7,20 @@ import com.eactive.testmaster.client.dto.ApiResponse; import com.eactive.testmaster.client.dto.internal.ScenarioNode; import com.eactive.testmaster.client.service.ApiClientFactory; import com.eactive.testmaster.loadtest.dto.LoadTestRequestAndResponse; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutionException; -import java.util.regex.Pattern; +import org.apache.commons.lang3.SerializationUtils; +import org.openjdk.nashorn.api.scripting.NashornScriptEngineFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import javax.script.Bindings; import javax.script.ScriptEngine; import javax.script.ScriptException; import javax.script.SimpleBindings; -import jdk.nashorn.api.scripting.NashornScriptEngineFactory; -import org.apache.commons.lang3.SerializationUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; +import java.util.regex.Pattern; public class VirtualUser implements Runnable {