Merge branch 'jenkins_with_weblogic' into devs/app_approval
# Conflicts: # CLAUDE.md # settings.gradle # src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java # src/main/java/com/eactive/eai/rms/onl/apim/approval/app/PortalAppApprovalListener.java # src/main/java/com/eactive/eai/rms/onl/apim/approval/user/PortalUserApprovalListener.java
This commit is contained in:
+4
-2
@@ -35,7 +35,7 @@ java {
|
||||
languageVersion = JavaLanguageVersion.of(8)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
compileJava {
|
||||
options.encoding = 'UTF-8'
|
||||
options.compilerArgs = ['-parameters']
|
||||
@@ -51,7 +51,7 @@ war {
|
||||
def profile = project.findProperty("profile") ?: "tomcat"
|
||||
|
||||
if (profile == "weblogic") {
|
||||
webXml = file("WebContent/WEB-INF/weblogic-web.xml")
|
||||
webXml = file("WebContent/WEB-INF/weblogic-web.xml")
|
||||
}
|
||||
|
||||
|
||||
@@ -78,6 +78,8 @@ dependencies {
|
||||
implementation project(':elink-online-common')
|
||||
implementation project(':elink-online-emsclient')
|
||||
implementation project(':elink-portal-common')
|
||||
implementation project(':kjb-safedb')
|
||||
implementation project(":eapim-admin-kjb")
|
||||
|
||||
/* Custom Libs */
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
|
||||
Reference in New Issue
Block a user