Fisheye: Diff - lams-github/lams_central/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-5357' into v4.7
Conflicts:
lams_admin/web/userChangePass.jsp
lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
lams_central/web/WEB-INF/web.xml
lams_central/web/authoring/authoring.jsp
lams_central/web/authoring/svgGenerator.jsp
lams_central/web/extGroups.jsp
lams_central/web/orgGroup.jsp
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
lams_monitoring/web/grouping/chosenGrouping.jsp

30 Jan 23 Marcin Cieslak 3eab31a1109437bc25679e6ebe38be0a350e17ac

Loading ...