Bump JDT Core to 1.9.21-SNAPSHOT

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java

@@ -148,11 +148,17 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
 		for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
 			ContextToken tok = CompilationAndWeavingContext.enteringPhase(CompilationAndWeavingContext.CONNECTING_TYPE_HIERARCHY,
 					units[i].compilationResult.fileName);
-			units[i].scope.connectTypeHierarchy();
+			units[i].scope.connectTypeHierarchy1();
 			CompilationAndWeavingContext.leavingPhase(tok);
 		}
-		stepCompleted = CONNECT_TYPE_HIERARCHY;
-
+		stepCompleted = CONNECT_TYPE_HIERARCHY1;
+		for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
+			ContextToken tok = CompilationAndWeavingContext.enteringPhase(CompilationAndWeavingContext.CONNECTING_TYPE_HIERARCHY,
+					units[i].compilationResult.fileName);
+			units[i].scope.connectTypeHierarchy2();
+			CompilationAndWeavingContext.leavingPhase(tok);
+		}
+		stepCompleted = CONNECT_TYPE_HIERARCHY2;
 		for (int i = lastCompletedUnitIndex + 1; i <= lastUnitIndex; i++) {
 			ContextToken tok = CompilationAndWeavingContext.enteringPhase(CompilationAndWeavingContext.BUILDING_FIELDS_AND_METHODS,
 					units[i].compilationResult.fileName);

pom.xml

@@ -21,7 +21,7 @@
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 
 		<!-- Dependency versions -->
-		<jdt.core.version>1.9.20</jdt.core.version>
+		<jdt.core.version>1.9.21-SNAPSHOT</jdt.core.version>
 		<asm.version>9.5</asm.version>
 		<lib.ant.version>1.6.3</lib.ant.version>
 		<lib.ant.xerces.version>2.6.2</lib.ant.xerces.version>