diff --git a/pom.xml b/pom.xml
index da8e2747..0b187958 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,8 +119,8 @@
maven-compiler-plugin
3.11.0
- 11
- 11
+ 17
+ 17
UTF-8
diff --git a/wise-webapp/${database.base.url}/db/wisemapping.properties b/wise-webapp/${database.base.url}/db/wisemapping.properties
deleted file mode 100644
index e666a75f..00000000
--- a/wise-webapp/${database.base.url}/db/wisemapping.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#HSQL Database Engine 2.7.1
-#Fri Jul 28 22:57:55 PDT 2023
-modified=yes
-tx_timestamp=93
-version=2.7.1
diff --git a/wise-webapp/${database.base.url}/db/wisemapping.script b/wise-webapp/${database.base.url}/db/wisemapping.script
deleted file mode 100644
index 8cb1d376..00000000
--- a/wise-webapp/${database.base.url}/db/wisemapping.script
+++ /dev/null
@@ -1,46 +0,0 @@
-SET DATABASE UNIQUE NAME HSQLDB89A0348046
-SET DATABASE DEFAULT RESULT MEMORY ROWS 0
-SET DATABASE EVENT LOG LEVEL 0
-SET DATABASE TRANSACTION CONTROL LOCKS
-SET DATABASE DEFAULT ISOLATION LEVEL READ COMMITTED
-SET DATABASE TRANSACTION ROLLBACK ON CONFLICT TRUE
-SET DATABASE TEXT TABLE DEFAULTS ''
-SET DATABASE SQL NAMES FALSE
-SET DATABASE SQL RESTRICT EXEC FALSE
-SET DATABASE SQL REFERENCES FALSE
-SET DATABASE SQL SIZE TRUE
-SET DATABASE SQL TYPES FALSE
-SET DATABASE SQL TDC DELETE TRUE
-SET DATABASE SQL TDC UPDATE TRUE
-SET DATABASE SQL SYS INDEX NAMES TRUE
-SET DATABASE SQL CONCAT NULLS TRUE
-SET DATABASE SQL UNIQUE NULLS TRUE
-SET DATABASE SQL CONVERT TRUNCATE TRUE
-SET DATABASE SQL AVG SCALE 0
-SET DATABASE SQL DOUBLE NAN TRUE
-SET FILES WRITE DELAY 500 MILLIS
-SET FILES BACKUP INCREMENT TRUE
-SET FILES CACHE SIZE 10000
-SET FILES CACHE ROWS 50000
-SET FILES SCALE 32
-SET FILES LOB SCALE 32
-SET FILES DEFRAG 0
-SET FILES NIO TRUE
-SET FILES NIO SIZE 256
-SET FILES LOG TRUE
-SET FILES LOG SIZE 50
-SET FILES CHECK 93
-SET DATABASE COLLATION "SQL_TEXT" PAD SPACE
-CREATE USER SA PASSWORD DIGEST 'd41d8cd98f00b204e9800998ecf8427e'
-ALTER USER SA SET LOCAL TRUE
-CREATE SCHEMA PUBLIC AUTHORIZATION DBA
-ALTER SEQUENCE SYSTEM_LOBS.LOB_ID RESTART WITH 1
-SET DATABASE DEFAULT INITIAL SCHEMA PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CARDINAL_NUMBER TO PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.YES_OR_NO TO PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.CHARACTER_DATA TO PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.SQL_IDENTIFIER TO PUBLIC
-GRANT USAGE ON DOMAIN INFORMATION_SCHEMA.TIME_STAMP TO PUBLIC
-GRANT DBA TO SA
-SET SCHEMA SYSTEM_LOBS
-INSERT INTO BLOCKS VALUES(0,2147483647,0)
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 80a3728d..4a6fda7a 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -128,12 +128,7 @@
5.3.15
test
-
-
-
-
-
-
+
org.springframework
spring-aop
@@ -146,11 +141,6 @@
${org.springframework.addons}
compile
-
-
-
-
-
org.springframework.security
spring-security-core
@@ -185,16 +175,16 @@
commons-dbcp2
2.9.0
-
-
-
-
-
-
-
-
-
-
+
+ org.hibernate
+ hibernate-ehcache
+ 5.6.15.Final
+
+
+ javax.cache
+ cache-api
+ 1.1.1
+
org.apache.logging.log4j
log4j-core
@@ -416,7 +406,7 @@
org.jacoco
jacoco-maven-plugin
- 0.8.8
+ 0.8.10
default-prepare-agent
@@ -477,6 +467,7 @@
8080
+ -Ddatabase.base.url=${project.build.directory} -Djetty.port=8080
9999
FORK
foo
@@ -494,7 +485,6 @@
true
- -Ddatabase.base.url=${project.build.directory} -Djetty.port=8080
diff --git a/wise-webapp/src/main/webapp/WEB-INF/views/error.jsp b/wise-webapp/src/main/webapp/WEB-INF/views/error.jsp
deleted file mode 100644
index 52408677..00000000
--- a/wise-webapp/src/main/webapp/WEB-INF/views/error.jsp
+++ /dev/null
@@ -1,6 +0,0 @@
-<%@ page autoFlush="true" buffer="none" %>
-<%@ include file="/jsp/init.jsp" %>
-
-
-
-
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/WEB-INF/views/errorTemplate.jsp b/wise-webapp/src/main/webapp/WEB-INF/views/errorTemplate.jsp
deleted file mode 100644
index 1c45b967..00000000
--- a/wise-webapp/src/main/webapp/WEB-INF/views/errorTemplate.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@page pageEncoding="UTF-8" %>
-<%@include file="/jsp/init.jsp" %>
-
-
-
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-
-
-
-
-
-
-
-
- <spring:message code="SITE.TITLE"/>-
- <c:choose>
- <c:when test="${requestScope.viewTitle!=null}">
- ${requestScope.viewTitle}
- </c:when>
- <c:otherwise>
- <spring:message code="${requestScope.title}"/>
- </c:otherwise>
- </c:choose>
-
-
-
- <spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/>
-
- <%@ include file="/jsp/pageHeaders.jsf" %>
-
-
-
-
-
-
-
-
diff --git a/wise-webapp/src/main/webapp/WEB-INF/views/securityError.jsp b/wise-webapp/src/main/webapp/WEB-INF/views/securityError.jsp
deleted file mode 100644
index 5c812505..00000000
--- a/wise-webapp/src/main/webapp/WEB-INF/views/securityError.jsp
+++ /dev/null
@@ -1,52 +0,0 @@
-<%@page pageEncoding="UTF-8" %>
-<%@include file="init.jsp" %>
-
-
-
-<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
-
-
-
-
-
-
-
-
- <spring:message code="SITE.TITLE"/>-
- <c:choose>
- <c:when test="${requestScope.viewTitle!=null}">
- ${requestScope.viewTitle}
- </c:when>
- <c:otherwise>
- <spring:message code="${requestScope.title}"/>
- </c:otherwise>
- </c:choose>
-
-
-
- <spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/>
-
- <%@ include file="/jsp/pageHeaders.jsf" %>
-
-
-
-
-
-
-
-
diff --git a/wise-webapp/src/main/webapp/css/error.css b/wise-webapp/src/main/webapp/css/error.css
deleted file mode 100644
index 4148f9b0..00000000
--- a/wise-webapp/src/main/webapp/css/error.css
+++ /dev/null
@@ -1,41 +0,0 @@
-div#errorContainer {
- font-family:Helvetica;
- display: flex;
- padding: 200px 80px;
-}
-
-h1 {
- color: #696969;
- font-weight: bold;
- font-size:100px;
-}
-
-h2 {
- color: rgb(241, 163, 39);
- font-size: 40px;
-}
-
-p {
- font-size: 25px;
-}
-
-#icon {
- height: 150px;
-}
-
-div#bottom-logo {
- position: fixed;
- right: 20px;
- bottom: 10px;
- background: url(../../images/logo-text-black.svg) no-repeat;
- width: 90px;
- height: 40px;
-}
-
-.column {
- justify-content: center;
- align-items: center;
- flex: 1;
- display: flex;
-}
-
-
-