Merge remote-tracking branch 'origin/master' into staging

# Conflicts:
#	build.gradle
This commit is contained in:
Rinjae
2025-09-19 14:58:15 +09:00
3 changed files with 28 additions and 18 deletions
+17 -3
View File
@@ -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 {