Merge remote-tracking branch 'origin/jenkins_with_weblogic'

# Conflicts:
#	build.gradle

build.gradle

@@ -1,13 +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 'java-library'
     id 'eclipse-wtp'
     id 'idea'
     id 'war'
-	id 'com.diffplug.eclipse.apt' version '3.41.1'
-//	id "org.sonarqube" version "4.2.1.3168"
 }
 
 bootJar.enabled = true
@@ -18,6 +17,7 @@ version = '2.0.0'
 sourceCompatibility = "1.8"
 targetCompatibility = "1.8"
 
+
 configurations {
     annotationProcessor
     configureEach {
@@ -30,7 +30,6 @@ compileJava {
     options.encoding = 'UTF-8'
 }
 
-
 war {
     archiveFileName = "elink-test-master.war"
 	exclude '**/persistence.xml'
@@ -43,7 +42,7 @@ dependencies {
     implementation 'org.mapstruct:mapstruct:1.5.5.Final'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.data:spring-data-envers'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter-security'
@@ -54,6 +53,16 @@ dependencies {
     implementation 'com.navercorp.lucy:lucy-xss-servlet:2.0.1'
     implementation group: 'com.lmax', name: 'disruptor', version: '3.4.4'
 
+    if (project.hasProperty("profile") && project.property("profile") == "weblogic") {
+        // WebLogic 배포 시에는 톰캣을 WAR에 넣지 않음
+        implementation('org.springframework.boot:spring-boot-starter-web') {
+            exclude group: 'org.springframework.boot', module: 'spring-boot-starter-tomcat'
+        }
+        providedCompile "javax:javaee-api:8.0"
+    } else {
+        implementation 'org.springframework.boot:spring-boot-starter-web'
+    }
+
 //	implementation 'io.springfox:springfox-boot-starter:3.0.0'
     implementation 'org.apache.httpcomponents:httpclient:4.5.14'
     implementation 'com.hazelcast:hazelcast:4.2.8'
@@ -77,10 +86,12 @@ dependencies {
     implementation 'org.mdkt.compiler:InMemoryJavaCompiler:1.3.0'
     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.graalvm.js:js:25.0.0'
+//    implementation 'org.graalvm.js:js-scriptengine:25.0.0'
+    implementation "org.openjdk.nashorn:nashorn-core:15.4"
 }
 
 bootJar {
@@ -91,31 +102,17 @@ test {
     useJUnitPlatform()
 }
 
-//eclipse {
-//	wtp {
-//		component {
-//			contextPath = '/'
-//		}
-//	}
-//    synchronizationTasks settingEclipseEncoding, initDirs
-//	
-//	jdt {
-//		apt {
-//			// generated 된 패스 경로를 .setting/org.eclipse.jdt.apt.core.prefs 의 org.eclipse.jdt.apt.genSrcDir에 적용한다.
-//			// project > properties > Java Compiler > Annoation Processing 화면에서 확인 가능하다.
-//			genSrcDir = file(generatedJavaDir)
-//		}
-//	}
-//	
-//	project {
-//		natures = ['org.eclipse.buildship.core.gradleprojectnature',
-//			'org.eclipse.jdt.core.javanature',
-//			'org.eclipse.wst.common.project.facet.core.nature',
-//			'org.eclipse.wst.common.modulecore.ModuleCoreNature',
-//			'org.eclipse.jem.workbench.JavaEMFNature']
-//		buildCommand 'org.eclipse.buildship.core.gradleprojectbuilder'
-//		buildCommand 'org.eclipse.wst.validation.validationbuilder'
-//		buildCommand 'org.eclipse.wst.common.project.facet.core.builder'
-//		buildCommand 'org.eclipse.jdt.core.javabuilder'
-//	}
-//}
+war {
+
+    // Set the name of the WAR file (optional)
+    archiveFileName = "elink-test-master.war"
+
+//    from('src/main/resources/jeus-web-dd.xml') { into 'WEB-INF' }
+    from('src/main/resources/weblogic.xml') { into 'WEB-INF' }
+
+}
+
+bootWar {
+    archiveFileName = "elink-test-master.war"
+    from('src/main/resources/weblogic.xml') { into 'WEB-INF' }
+}