Merge branch 'master' into jenkins_with_weblogic

# Conflicts: # WebContent/WEB-INF/weblogic.xml
2025-10-13 17:02:33 +09:00
parent 6d2faf3d16 4c4a22a2a5
commit f7736e39a9
8 changed files with 302 additions and 45 deletions
@@ -8,7 +8,7 @@ plugins {
 }

 group 'com.eactvie'
-version '4.5.7'
+//version '4.5.7'

 def springVersion = "5.3.27"
 //def springSecurityVersion = '4.2.13.RELEASE'
@@ -46,8 +46,6 @@ compileJava {
 }

 war {
-	archiveFileName = "eapim-online.war"
-
 	exclude '**/persistence.xml'
 	exclude '**/context.xml'
 }