SAK-50092 Term Manager upgrade to wicket 9 (sakaiproject#12600)

axxter99 · May 18, 2024 · 6e1f060 · 6e1f060
1 parent 495dc12
commit 6e1f060
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/site/term-manager/pom.xml b/site/term-manager/pom.xml
@@ -18,7 +18,7 @@
 
    <properties>
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-      <my.wicket.version>8.15.0</my.wicket.version>
+      <my.wicket.version>9.17.0</my.wicket.version>
    </properties>
 
    <dependencyManagement>

diff --git a/...r/tool/src/java/org/sakaiproject/acadtermmanage/tool/AcademicSessionAdminApplication.java b/...r/tool/src/java/org/sakaiproject/acadtermmanage/tool/AcademicSessionAdminApplication.java
@@ -36,15 +36,18 @@ public class AcademicSessionAdminApplication extends WebApplication {
 	protected void init() {
 
 		//Configure for Spring injection
-	    getComponentInstantiationListeners().add(new SpringComponentInjector(this));
+		getComponentInstantiationListeners().add(new SpringComponentInjector(this));
 
 
 		//Don't throw an exception if we are missing a property, just fallback
 		getResourceSettings().setThrowExceptionOnMissingResource(false);
 
 		//Remove the wicket specific tags from the generated markup
 		getMarkupSettings().setStripWicketTags(true);
-
+
+		// We handle CSP centrally
+		getCspSettings().blocking().disabled();
+
 		// On Wicket session timeout, redirect to main page
 		getApplicationSettings().setPageExpiredErrorPage(getHomePage());
 		getApplicationSettings().setAccessDeniedPage(getHomePage());