Java 21

.github/workflows/maven.yml

@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         # Check for available Temurin releases on https://adoptium.net/releases.html
-        java: [ 11, 17, 20 ]
+        java: [ 17, 21 ]
 
     runs-on: ubuntu-latest
 

.gitignore

@@ -42,6 +42,9 @@ bin/
 /lib/regexp/
 /lib/saxon/
 
+# AspectJ core dumps
+ajcore.*.txt
+
 # When using a RAM disk to speed up development, see how-to in docs/developer/ram-disk/settings-ramdisk.xml
 /.mvn/maven.config
 /.mvn/settings-ramdisk.xml

bcel-builder/src/main/java/org/aspectj/apache/bcel/Constants.java

@@ -104,8 +104,10 @@ public interface Constants {
 	short MINOR_19 = 0;
 	short MAJOR_20 = 64;
 	short MINOR_20 = 0;
-//	short MAJOR_21 = 65;
-//	short MINOR_21 = 0;
+	short MAJOR_21 = 65;
+	short MINOR_21 = 0;
+//	short MAJOR_22 = 66;
+//	short MINOR_22 = 0;
 
 	int PREVIEW_MINOR_VERSION = 65535;
 

bridge/src/main/java/org/aspectj/bridge/context/CompilationAndWeavingContext.java

@@ -41,7 +41,7 @@ public class CompilationAndWeavingContext {
 	public static final int COMPLETING_TYPE_BINDINGS = 6;
 	public static final int PROCESSING_DECLARE_PARENTS = 7;
 	public static final int CHECK_AND_SET_IMPORTS = 8;
-	public static final int CONNECTING_TYPE_HIERARCHY = 9;
+	public static final int CONNECTING_TYPE_HIERARCHY1 = 9;
 	public static final int BUILDING_FIELDS_AND_METHODS = 10;
 	public static final int COLLECTING_ITDS_AND_DECLARES = 11;
 	public static final int PROCESSING_DECLARE_ANNOTATIONS = 12;
@@ -54,31 +54,32 @@ public class CompilationAndWeavingContext {
 	public static final int FIXING_SUPER_CALLS_IN_ITDS = 19;
 	public static final int FIXING_SUPER_CALLS = 20;
 	public static final int OPTIMIZING_THIS_JOIN_POINT_CALLS = 21;
+	public static final int CONNECTING_TYPE_HIERARCHY2 = 22;
 
 	// "BACK END"
 
-	public static final int WEAVING = 22;
-	public static final int PROCESSING_REWEAVABLE_STATE = 23;
-	public static final int PROCESSING_TYPE_MUNGERS = 24;
-	public static final int WEAVING_ASPECTS = 25;
-	public static final int WEAVING_CLASSES = 26;
-	public static final int WEAVING_TYPE = 27;
-	public static final int MATCHING_SHADOW = 28;
-	public static final int IMPLEMENTING_ON_SHADOW = 29;
-	public static final int MATCHING_POINTCUT = 30;
-	public static final int MUNGING_WITH = 31;
-	public static final int PROCESSING_ATASPECTJTYPE_MUNGERS_ONLY = 32;
+	public static final int WEAVING = 23;
+	public static final int PROCESSING_REWEAVABLE_STATE = 24;
+	public static final int PROCESSING_TYPE_MUNGERS = 25;
+	public static final int WEAVING_ASPECTS = 26;
+	public static final int WEAVING_CLASSES = 27;
+	public static final int WEAVING_TYPE = 28;
+	public static final int MATCHING_SHADOW = 29;
+	public static final int IMPLEMENTING_ON_SHADOW = 30;
+	public static final int MATCHING_POINTCUT = 31;
+	public static final int MUNGING_WITH = 32;
+	public static final int PROCESSING_ATASPECTJTYPE_MUNGERS_ONLY = 33;
 
 	// phase names
 	public static final String[] PHASE_NAMES = new String[] { "batch building", "incrementally building",
 			"processing compilation unit", "resolving types defined in compilation unit",
 			"analysing types defined in compilation unit", "generating unwoven code for type defined in compilation unit",
-			"completing type bindings", "processing declare parents", "checking and setting imports", "connecting type hierarchy",
+			"completing type bindings", "processing declare parents", "checking and setting imports", "connecting type hierarchy 1",
 			"building fields and methods", "collecting itds and declares", "processing declare annotations",
 			"weaving intertype declarations", "resolving pointcut declarations", "adding declare warning and errors",
 			"validating @AspectJ annotations", "creating accessors for inlining", "adding @AspectJ annotations",
 			"fixing super calls in ITDs in interface context", "fixing super calls in ITDs",
-			"optimizing thisJoinPoint calls",
+			"optimizing thisJoinPoint calls", "connecting type hierarchy 2",
 
 			// BACK END
 

docs/developer/RELEASE.md

@@ -159,6 +159,10 @@ mvn nexus-staging:rc-list
 # [INFO] ID                   State    Description
 # [INFO] orgaspectj-1106      CLOSED   org.aspectj:aspectjrt:1.9.8.M2
 
+# Because of problems in Nexus Staging Maven Plugin with more recent JDKs,
+# we might need this first
+export MAVEN_OPTS="--add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED"
+
 # Use the ID of the corresponding CLOSED staging repository for releasing to
 # Maven Central
 mvn nexus-staging:rc-release -DstagingRepositoryId=orgaspectj-1106

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java

@@ -331,7 +331,7 @@ public void postParse(TypeDeclaration typeDec) {
 		AspectDeclaration aspectDecl = (AspectDeclaration) typeDec;
 		adviceSequenceNumberInType = aspectDecl.adviceCounter++;
 
-		StringBuffer stringifiedPointcut = new StringBuffer(30);
+		StringBuilder stringifiedPointcut = new StringBuilder(30);
 		pointcutDesignator.print(0, stringifiedPointcut);
 		this.selector = NameMangler.adviceName(EclipseFactory.getName(typeDec.binding).replace('.', '_'), kind,
 				adviceSequenceNumberInType, stringifiedPointcut.toString().hashCode()).toCharArray();
@@ -459,15 +459,15 @@ private static Argument[] extendArgumentsLength(Argument[] args, int addedArgume
 	// return s;
 	// }
 
-	public StringBuffer printBody(int indent, StringBuffer output) {
+	public StringBuilder printBody(int indent, StringBuilder output) {
 		output.append(": ");
 		if (pointcutDesignator != null) {
 			output.append(pointcutDesignator.toString());
 		}
 		return super.printBody(indent, output);
 	}
 
-	public StringBuffer printReturnType(int indent, StringBuffer output) {
+	public StringBuilder printReturnType(int indent, StringBuilder output) {
 		if (this.kind == AdviceKind.Around) {
 			return super.printReturnType(indent, output);
 		}

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java

@@ -1289,7 +1289,7 @@ private IntertypeMemberTypeFinder findOrCreateInterTypeMemberClassFinder(SourceT
 		return finder;
 	}
 
-	public StringBuffer printHeader(int indent, StringBuffer output) {
+	public StringBuilder printHeader(int indent, StringBuilder output) {
 		// since all aspects are made public we want to print the
 		// modifiers that were supplied in the original source code
 		printModifiers(this.declaredModifiers, output);

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java

@@ -153,7 +153,7 @@ public Declare build(ClassScope classScope) {
 		return declareDecl;
 	}
 
-	public StringBuffer print(int tab, StringBuffer output) {
+	public StringBuilder print(int tab, StringBuilder output) {
 		printIndent(tab, output);
 		if (declareDecl == null) {
 			output.append("<declare>");

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java

@@ -113,9 +113,9 @@ public boolean isError() {
 	/*
 	 * (non-Javadoc)
 	 *
-	 * @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuffer)
+	 * @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuilder)
 	 */
-	public StringBuffer print(int indent, StringBuffer output) {
+	public StringBuilder print(int indent, StringBuilder output) {
 		if (pointcut == null)
 			return output.append("<pcd>");
 		return output.append(pointcut.toString());

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java

@@ -86,9 +86,9 @@ public int postParse(TypeDeclaration typeDec, MethodDeclaration enclosingDec, in
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuffer)
+	 * @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuilder)
 	 */
-	public StringBuffer print(int indent, StringBuffer output) {
+	public StringBuilder print(int indent, StringBuilder output) {
 		output.append("PseudoToken<" + getString() + ">");
 		return output;
 	}

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java

@@ -159,9 +159,9 @@ public void postParse(TypeDeclaration typeDec, MethodDeclaration enclosingDec) {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuffer)
+	 * @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuilder)
 	 */
-	public StringBuffer print(int indent, StringBuffer output) {
+	public StringBuilder print(int indent, StringBuilder output) {
 		output.append(tokenSource.toString());
 		return output;
 	}