diff --git a/.classpath b/.classpath
index 1d05b1a7d..4f747f597 100644
--- a/.classpath
+++ b/.classpath
@@ -49,15 +49,9 @@
 	<classpathentry kind="lib" path="war/WEB-INF/lib/javacc-5.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/javax.annotation-3.1.1.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/javax.inject-1.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/javax.inject-1-sources.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/jaxb-svg11-1.0.2.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/jcommon-1.0.23.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/jdom-1.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-core-1.19.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-guice-1.19.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-json-1.19.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-server-1.19.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-servlet-1.19.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/jettison-1.3.5.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/jfreechart-1.0.19.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/jlfgr-1.0.jar"/>
@@ -70,7 +64,6 @@
 	<classpathentry kind="lib" path="war/WEB-INF/lib/juel-api-2.2.7.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/juel-impl-2.2.7.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/mondrian-3.6.6-services.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/mondrian-4.7.0.0-12.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/mondrian-4.7.0.0-12-extradialects.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/olap4j-1.2.0-latest-trunk.jar"/>
@@ -105,14 +98,11 @@
 	<classpathentry kind="lib" path="war/WEB-INF/lib/scribejava-apis-8.3.1.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/scribejava-core-8.3.1.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/scribejava-java8-8.3.1.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/joda-time-2.9.9.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/c3p0-0.9.5.5.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/mchange-commons-java-0.2.20.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/checker-qual-3.12.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-compress-1.21.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/itext-2.1.7.js9.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-io-2.11.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-configuration2-2.7.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-text-1.9.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/requestfactory-server-2.8.2.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/classmate-1.5.1.jar"/>
@@ -136,13 +126,8 @@
 	<classpathentry kind="lib" path="war/WEB-INF/lib/sshd-core-2.8.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/sshd-sftp-2.8.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-cli-1.5.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jxls-2.11.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jxls-poi-2.11.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/xercesImpl-2.12.1.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/xom-1.3.7.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jakarta.xml.bind-api-2.3.2.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/hsqldb-2.6.1.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/rs-schemaupdate-1.3.18.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/icu4j-58.2.jar"/>
@@ -171,27 +156,13 @@
 	<classpathentry kind="lib" path="war/WEB-INF/lib/batik-xml-1.14.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/birt-runtime-4.9.0-20220315.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-jexl3-3.2.1.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/fontbox-2.0.24.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/fop-2.7.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/fop-core-2.7.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/fop-events-2.7.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/fop-util-2.7.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-core-2.12.2.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-databind-2.12.2.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-jaxrs-base-2.12.2.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-jaxrs-json-provider-2.12.2.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-module-jaxb-annotations-2.12.2.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jasperreports-6.18.1.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jasperreports-fonts-6.18.1.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jasperreports-functions-6.18.1.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/pdfbox-2.0.24.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/qdox-1.12.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/xmlgraphics-commons-2.7.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/castor-core-1.4.1.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/castor-xml-1.4.1.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-annotations-2.12.2.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/xml-apis-1.4.01.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/owasp-java-html-sanitizer-20211018.2.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/bcmail-jdk18on-1.71.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/bcpg-jdk18on-1.71.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/bcpkix-jdk18on-1.71.jar"/>
@@ -201,50 +172,93 @@
 	<classpathentry kind="lib" path="war/WEB-INF/lib/log4j-over-slf4j-1.7.36.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/slf4j-api-1.7.36.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/slf4j-ext-1.7.36.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/xdocreport-2.0.3.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/byte-buddy-1.12.9.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/hibernate-validator-6.2.3.Final.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/mysql-connector-java-8.0.29.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/protobuf-java-3.19.4.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-analysis-common-9.2.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-core-9.2.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-queries-9.2.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-queryparser-9.2.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-sandbox-9.2.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/mariadb-java-client-3.0.5.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/hibernate-c3p0-5.6.9.Final.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/hibernate-core-5.6.9.Final.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/hibernate-entitymanager-5.6.9.Final.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/hibernate-envers-5.6.9.Final.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/error_prone_annotations-2.11.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/guava-31.1-jre.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-astbuilder-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-cli-picocli-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-datetime-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-dateutil-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-json-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-jsr223-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-macro-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-nio-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-servlet-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-sql-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-templates-4.0.3.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-xml-4.0.3.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/jcifs-2.1.31.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/postgresql-42.4.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/h2-2.1.214.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/httpclient-4.5.13.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/httpcore-4.4.13.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/liquibase-core-4.12.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/opencsv-5.6.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/Saxon-HE-11.3.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/snakeyaml-1.27.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/xmlresolver-4.2.0.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/xmlresolver-4.2.0-data.jar"/>
-	<classpathentry kind="lib" path="war/WEB-INF/lib/sqlite-jdbc-3.36.0.3.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/eigenbase-xom-1.3.5.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/log4j-api-2.18.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/log4j-core-2.18.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/aopalliance-repackaged-2.6.1.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-configuration2-2.8.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/fontbox-2.0.26.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-astbuilder-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-cli-picocli-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-datetime-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-dateutil-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-json-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-jsr223-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-macro-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-nio-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-servlet-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-sql-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-templates-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/groovy-xml-4.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/guice-bridge-2.6.1.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/gwt-user-2.8.2.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/hibernate-c3p0-5.6.10.Final.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/hibernate-core-5.6.10.Final.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/hibernate-entitymanager-5.6.10.Final.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/hibernate-envers-5.6.10.Final.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/hk2-api-2.6.1.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/hk2-locator-2.6.1.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/hk2-utils-2.6.1.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/httpclient5-5.1.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/httpcore5-5.1.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/httpcore5-h2-5.1.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/itext-2.1.7.js10.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-annotations-2.13.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-core-2.13.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-databind-2.13.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-dataformat-xml-2.13.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-jaxrs-base-2.13.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-jaxrs-json-provider-2.13.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jackson-module-jaxb-annotations-2.13.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jakarta.annotation-api-1.3.5.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jakarta.inject-2.6.1.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jakarta.ws.rs-api-2.1.6.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jakarta.xml.bind-api-2.3.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jasperreports-6.20.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jasperreports-fonts-6.20.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jasperreports-functions-6.20.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/javassist-3.25.0-GA.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-client-2.36.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-common-2.36.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-container-servlet-core-2.36.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-entity-filtering-2.36.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-hk2-2.36.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-media-json-jackson-2.36.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-media-multipart-2.36.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jersey-server-2.36.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jxls-2.12.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/jxls-poi-2.12.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/liquibase-core-4.15.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/mariadb-java-client-3.0.7.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/mimepull-1.9.13.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/mondrian-8.3.0.27-R-services.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/mysql-connector-java-8.0.30.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/osgi-resource-locator-1.0.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/owasp-java-html-sanitizer-20220608.1.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/pdfbox-2.0.26.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/postgresql-42.4.2.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/rs-schemaupdate-1.3.21.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/Saxon-HE-11.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/sqlite-jdbc-3.39.2.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/stax2-api-4.2.1.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/woodstox-core-6.2.7.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/xdocreport-2.0.4.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/xmlresolver-4.4.3.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/xmlresolver-4.4.3-data.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/hsqldb-2.7.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-analysis-common-9.3.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-core-9.3.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-queries-9.3.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-queryparser-9.3.0.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/lucene-sandbox-9.3.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>