diff --git a/pom.xml b/pom.xml
index 056c6c73a..7ac1e35f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,9 +27,7 @@
 	</parent>
 
 	<properties>
-		<source.level>16</source.level>
-    <!-- AspectJ maven plugin can't handle 17 yet -->
-
+		<source.level>17</source.level>
 		<eclipselink>3.0.3</eclipselink>
 		<hibernate>6.1.7.Final</hibernate>
 		<hsqldb>2.7.1</hsqldb>
diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml
index d472708bf..f8a706883 100644
--- a/spring-data-jpa/pom.xml
+++ b/spring-data-jpa/pom.xml
@@ -365,9 +365,9 @@
 			</plugin>
 
 			<plugin>
-				<groupId>io.starter</groupId>
+				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
-				<version>1.12.9</version>
+				<version>1.14.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.aspectj</groupId>