Fisheye: Diff - lams-github/lams_tool_mindmap/web/WEB-INF/web.xml

Tree
Options

35d617e

LDEV-5440 Update code to match dependencies
In particular javax -> jakarta package change and new JPA not accepting some attributes.

20 Mar 24 Marcin Cieslak 35d617e013c37361e7d89025c464a7f4a53b9b4e

Merge remote-tracking branch 'origin/LDEV-5302' into v4.7
Conflicts:
lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java
lams_admin/web/user.jsp
lams_central/conf/language/lams/ApplicationResources_zh_CN.properties
lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

21 Sep 22 Marcin Cieslak 3f3f34c22194aeaf302e1fd332925dffd35019aa

Loading ...