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:
+3
-1
@@ -7,6 +7,7 @@ include 'elink-online-common'
|
||||
include 'elink-online-emsclient'
|
||||
include 'elink-portal-common'
|
||||
include 'kjb-safedb'
|
||||
include 'eapim-admin-kjb'
|
||||
|
||||
project (':elink-online-core-jpa').projectDir = new File(settingsDir, "../eapim-online/elink-online-core-jpa")
|
||||
project (':elink-online-core').projectDir = new File(settingsDir, "../eapim-online/elink-online-core")
|
||||
@@ -14,4 +15,5 @@ project (':elink-online-transformer').projectDir = new File(settingsDir, "../eap
|
||||
project (':elink-online-common').projectDir = new File(settingsDir, "../eapim-online/elink-online-common")
|
||||
project (':elink-online-emsclient').projectDir = new File(settingsDir, "../eapim-online/elink-online-emsclient")
|
||||
project (':elink-portal-common').projectDir = new File(settingsDir, "../elink-portal-common")
|
||||
project (':kjb-safedb').projectDir = new File(settingsDir, "../kjb-safedb")
|
||||
project (':kjb-safedb').projectDir = new File(settingsDir, "../kjb-safedb")
|
||||
project (':eapim-admin-kjb').projectDir = new File(settingsDir, "eapim-admin-kjb")
|
||||
Reference in New Issue
Block a user