diff --git a/vspace/pom.xml b/vspace/pom.xml
index c453493ef..579296960 100644
--- a/vspace/pom.xml
+++ b/vspace/pom.xml
@@ -10,7 +10,7 @@
 
     <properties>
         <org.slf4j-version>1.7.5</org.slf4j-version>
-        <spring.version>5.3.0</spring.version>
+        <spring.version>5.3.31</spring.version>
         <spring-data.version>Kay-SR8</spring-data.version>
         <spring-security-version>5.7.12</spring-security-version>
         <thymeleaf.version>3.0.13.RELEASE</thymeleaf.version>
@@ -40,6 +40,9 @@
 
         <hibernate.show_sql></hibernate.show_sql>
         <buildNumber>v0.16.1</buildNumber>
+        
+        <maven.compiler.source>17</maven.compiler.source>
+  		<maven.compiler.target>17</maven.compiler.target>
     </properties>
 
     <dependencyManagement>
@@ -131,6 +134,13 @@
             <artifactId>spring-aop</artifactId>
         </dependency>
 
+        <dependency>
+			<groupId>org.ow2.asm</groupId>
+			<artifactId>asm</artifactId>
+			<version>9.5</version> <!-- or latest -->
+		</dependency>
+
+
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
@@ -258,11 +268,25 @@
 
         <!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
-            <scope>test</scope>
-        </dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-inline</artifactId>
+			<version>5.2.0</version> <!-- or latest -->
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+		    <groupId>net.bytebuddy</groupId>
+		    <artifactId>byte-buddy</artifactId>
+		    <version>1.14.13</version> <!-- match the version used internally by mockito-inline -->
+		    <scope>test</scope>
+		</dependency>
+		
+		<dependency>
+		    <groupId>net.bytebuddy</groupId>
+		    <artifactId>byte-buddy-agent</artifactId>
+		    <version>1.14.13</version>
+		    <scope>test</scope>
+		</dependency>
 
         <!-- Tiles -->
         <dependency>
@@ -411,10 +435,12 @@
                 </configuration>
             </plugin>
             <plugin>
+            	<groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.10.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -427,6 +453,16 @@
                     <path>/${tomcat.app.name}</path>
                 </configuration>
             </plugin>
+            <plugin>
+		      <groupId>org.apache.maven.plugins</groupId>
+		      <artifactId>maven-surefire-plugin</artifactId>
+		      <version>3.1.2</version> <!-- or latest stable -->
+		      <configuration>
+		        <argLine>
+		          --add-opens=java.base/java.lang=ALL-UNNAMED
+		        </argLine>
+		      </configuration>
+		    </plugin>
         </plugins>
     </build>
 </project>
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/config/ExhibitionLanguageConfigTest.java b/vspace/src/test/java/edu/asu/diging/vspace/config/ExhibitionLanguageConfigTest.java
index 2fa961f49..d4a130510 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/config/ExhibitionLanguageConfigTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/config/ExhibitionLanguageConfigTest.java
@@ -18,7 +18,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.core.env.AbstractEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/auth/impl/AuthenticationFacadeTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/auth/impl/AuthenticationFacadeTest.java
index 4f57d0933..64c0dbc43 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/auth/impl/AuthenticationFacadeTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/auth/impl/AuthenticationFacadeTest.java
@@ -13,7 +13,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ChoiceBlockFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ChoiceBlockFactoryTest.java
index 59b243f1f..19f543594 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ChoiceBlockFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ChoiceBlockFactoryTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.factory.impl.ChoiceBlockFactory;
 import edu.asu.diging.vspace.core.model.IChoice;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ChoiceFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ChoiceFactoryTest.java
index b04d92a5b..b24617c6f 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ChoiceFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ChoiceFactoryTest.java
@@ -11,7 +11,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.IChoice;
 import edu.asu.diging.vspace.core.model.ISequence;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ExhibitionFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ExhibitionFactoryTest.java
index 47fbc70ca..87f367876 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ExhibitionFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ExhibitionFactoryTest.java
@@ -9,7 +9,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.ExhibitionModes;
 import edu.asu.diging.vspace.core.model.IExhibition;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactoryTest.java
index 1d92a6691..47042a235 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ExternalLinkDisplayFactoryTest.java
@@ -9,7 +9,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.IExternalLink;
 import edu.asu.diging.vspace.core.model.display.IExternalLinkDisplay;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ImageBlockFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ImageBlockFactoryTest.java
index 51c32d1f8..fa7d6e370 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ImageBlockFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ImageBlockFactoryTest.java
@@ -9,7 +9,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.IImageBlock;
 import edu.asu.diging.vspace.core.model.ISlide;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ImageFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ImageFactoryTest.java
index 7cc222ca7..c99163da1 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ImageFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ImageFactoryTest.java
@@ -10,7 +10,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.factory.IImageFactory;
 import edu.asu.diging.vspace.core.model.IVSImage;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleFactoryTest.java
index d56fc72da..434a7892c 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleFactoryTest.java
@@ -9,7 +9,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.web.staff.forms.ModuleForm;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleLinkDisplayFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleLinkDisplayFactoryTest.java
index ed2124b8a..5224a2bde 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleLinkDisplayFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleLinkDisplayFactoryTest.java
@@ -8,7 +8,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.IModuleLink;
 import edu.asu.diging.vspace.core.model.display.IModuleLinkDisplay;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleLinkFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleLinkFactoryTest.java
index fc60c8760..4cd61f0a5 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleLinkFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/ModuleLinkFactoryTest.java
@@ -8,7 +8,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.IModuleLink;
 import edu.asu.diging.vspace.core.model.ISpace;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideFactoryTest.java
index 660975df4..e8c91aec9 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SlideFactoryTest.java
@@ -6,7 +6,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.IModule;
 import edu.asu.diging.vspace.core.model.ISlide;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceDisplayFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceDisplayFactoryTest.java
index e9f03b359..af747d1da 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceDisplayFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceDisplayFactoryTest.java
@@ -9,7 +9,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.display.ISpaceDisplay;
 import edu.asu.diging.vspace.core.model.display.impl.SpaceDisplay;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceFactoryTest.java
index 3f744902e..1b6caef80 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceFactoryTest.java
@@ -9,7 +9,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.web.staff.forms.SpaceForm;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceLinkDisplayFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceLinkDisplayFactoryTest.java
index 36bcc345d..917afb20c 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceLinkDisplayFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceLinkDisplayFactoryTest.java
@@ -8,7 +8,7 @@
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.ISpaceLink;
 import edu.asu.diging.vspace.core.model.display.ISpaceLinkDisplay;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceLinkFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceLinkFactoryTest.java
index c152dd1a4..60b4574c7 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceLinkFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceLinkFactoryTest.java
@@ -4,7 +4,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.ISpaceLink;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceTextBlockDisplayFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceTextBlockDisplayFactoryTest.java
index daafc1c13..8f23be4de 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceTextBlockDisplayFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceTextBlockDisplayFactoryTest.java
@@ -8,7 +8,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.ISpaceTextBlock;
 import edu.asu.diging.vspace.core.model.display.ISpaceTextBlockDisplay;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceTextBlockFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceTextBlockFactoryTest.java
index e6fdaaec4..656143b1c 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceTextBlockFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/SpaceTextBlockFactoryTest.java
@@ -8,7 +8,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.ISpace;
 import edu.asu.diging.vspace.core.model.ISpaceTextBlock;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/TextBlockFactoryTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/TextBlockFactoryTest.java
index e6c0360c2..4b5849e5b 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/TextBlockFactoryTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/factory/impl/TextBlockFactoryTest.java
@@ -8,7 +8,7 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.core.model.ISlide;
 import edu.asu.diging.vspace.core.model.ITextBlock;
diff --git a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManagerTest.java b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManagerTest.java
index 665f71ed7..85aba2fc5 100644
--- a/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManagerTest.java
+++ b/vspace/src/test/java/edu/asu/diging/vspace/core/services/impl/ExhibitionManagerTest.java
@@ -21,7 +21,7 @@
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import edu.asu.diging.vspace.config.ExhibitionLanguageConfig;
 import edu.asu.diging.vspace.core.data.ExhibitionRepository;