Replace old by new AspectJ GitHub URL

github.com/eclipse/org.aspectj -> github.com/eclipse-aspectj/aspectj

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

22 files changed, 72 insertions, 72 deletions

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a90ea46fa..04562a580 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,6 @@
 # Contributing to AspectJ
 
-AspectJ is a maven project, as such it should import cleanly into your IDE. The project uses github for issue tracking ( https://github.com/eclipse/org.aspectj/issues ).
+AspectJ is a maven project, as such it should import cleanly into your IDE. The project uses github for issue tracking ( https://github.com/eclipse-aspectj/aspectj/issues ).
 
 ## Working on the codebase
 
@@ -50,4 +50,4 @@ Some issues involving compiler problems, for example if Java code isn't working
 
 Please contribute via Pull Request against the GitHub repository.
 
-Contributors should ensure they have signed the [Eclipse Contributor Agreement](https://accounts.eclipse.org/user/7644/eca/3.1.0), this will be verified by automatic validation that occurs against any Pull Requests.
\ No newline at end of file
+Contributors should ensure they have signed the [Eclipse Contributor Agreement](https://accounts.eclipse.org/user/7644/eca/3.1.0), this will be verified by automatic validation that occurs against any Pull Requests.
diff --git a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java
index 9d8b61140..c44fdb50d 100644
--- a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java
+++ b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java
@@ -794,7 +794,7 @@ public class Main implements Config {
 	/* This section of code handles errors that occur during compilation */
 	static final String internalErrorMessage = "                                                                  \n"
 			+ "If this has not already been logged as a bug raised please raise  \n"
-			+ "a new AspectJ bug at https://github.com/eclipse/org.aspectj/issues \n"
+			+ "a new AspectJ bug at https://github.com/eclipse-aspectj/aspectj/issues \n"
 			+ "including the text below. To make the bug a priority, please also \n"
 			+ "include a test program that can reproduce this problem.\n ";
 
diff --git a/docs/developer/IDE.md b/docs/developer/IDE.md
index fbafbe384..b8a34a04c 100644
--- a/docs/developer/IDE.md
+++ b/docs/developer/IDE.md
@@ -120,7 +120,7 @@ to your path and are good to go. You can now call tools like the Aspectj compile
 generator `ajdoc` (similar to Javadoc) from the command line.
 
 You can find older installer versions until 1.9.6 on the [AspectJ website](https://www.eclipse.org/aspectj/downloads.php),
-more recent ones are attached to AspectJ [GitHub releases](https://github.com/eclipse/org.aspectj/releases) as
+more recent ones are attached to AspectJ [GitHub releases](https://github.com/eclipse-aspectj/aspectj/releases) as
 _aspectj-*jar_.
 
 ## Biased recommendation
diff --git a/docs/release/JavaVersionCompatibility.adoc b/docs/release/JavaVersionCompatibility.adoc
index 7fb193296..b94a364ea 100644
--- a/docs/release/JavaVersionCompatibility.adoc
+++ b/docs/release/JavaVersionCompatibility.adoc
@@ -1,6 +1,6 @@
 = AspectJ Java version compatibility
 
-For reasons described e.g. in https://github.com/eclipse/org.aspectj/issues/139#issuecomment-1072946123[this comment],
+For reasons described e.g. in https://github.com/eclipse-aspectj/aspectj/issues/139#issuecomment-1072946123[this comment],
 for AspectJ users it has become a little challenging to find out which minimum AspectJ version is required in order to
 process byte code or compile source code using features of a certain Java language version. Since Java 10, this cannot
 be easily concluded from the AspectJ version number anymore, and we are sorry for that. So here is a little overview:
diff --git a/docs/release/README-1.9.19.adoc b/docs/release/README-1.9.19.adoc
index c34786812..a81156934 100644
--- a/docs/release/README-1.9.19.adoc
+++ b/docs/release/README-1.9.19.adoc
@@ -5,10 +5,10 @@ _© Copyright 2022 Contributors. All rights reserved._
 _Release info: 1.9.19 available 21-Dec-2022_
 
 Please note that Bugzilla for issue management is deprecated and new issues should be filed as
-https://github.com/eclipse/org.aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.19 can be found
+https://github.com/eclipse-aspectj/aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.19 can be found
 here:
 
-* https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.19[GitHub 1.9.19]
+* https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.19[GitHub 1.9.19]
 * https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&f0=OP&f1=OP&f3=CP&f4=CP&j1=OR&list_id=16866879&product=AspectJ&query_format=advanced&target_milestone=1.9.19[Bugzilla 1.9.19]
 
 == New features
@@ -23,23 +23,23 @@ features, such as:
 
 Please note that the upstream Eclipse Java Compiler (ECJ) which the AspectJ Compiler (AJC) is a fork of still has some
 open issues concerning Java 19 preview feature support, see the list in
-https://github.com/eclipse/org.aspectj/issues/184#issuecomment-1272254940[this comment]. AJC therefore inherits the same
+https://github.com/eclipse-aspectj/aspectj/issues/184#issuecomment-1272254940[this comment]. AJC therefore inherits the same
 problems for the specific cases described in the linked issues.
 
 == Improvements
 
 * Improve condy (constant dynamic) support. Together with some custom compilation or weaving options, this helps to
   avoid a problem when using JaCoCo together with AspectJ, see
-  https://github.com/eclipse/org.aspectj/issues/170#issuecomment-1214163297[this comment in #170] for more details.
+  https://github.com/eclipse-aspectj/aspectj/issues/170#issuecomment-1214163297[this comment in #170] for more details.
 
 == Code examples
 
 You can find some sample code in the AspectJ test suite under the respective AspectJ version in which the features were
 first supported (possibly as JVM preview features):
 
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features198/java17[Pattern matching for switch (preview 1)]
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features199/java18[Pattern matching for switch (preview 2)]
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features1919/java19[Pattern matching for switch (preview 3),
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features198/java17[Pattern matching for switch (preview 1)]
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features199/java18[Pattern matching for switch (preview 2)]
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features1919/java19[Pattern matching for switch (preview 3),
   record patterns (preview 1)]
 * Please note that presently there is no specific sample code for virtual threads and structured concurrency in the
   AspectJ code base, because these are just new APIs, no Java language features. You can find sample code for these
@@ -52,9 +52,9 @@ first supported (possibly as JVM preview features):
   `SOURCE` retention on types, methods, constructors or fields. While declaring such annotations does not make sense to
   begin with, at least the AspectJ weaver or compiler should handle the situation gracefully, which now it does by
   simply ignoring errors caused by it. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=366085[Bugzilla #366085] and
-  https://github.com/eclipse/org.aspectj/pull/196[pull request #196]. Better than this workaround would be for the
+  https://github.com/eclipse-aspectj/aspectj/pull/196[pull request #196]. Better than this workaround would be for the
   compiler or weaver to actually print a warning when meeting source level annotations in declare statements. Hence,
-  follow-up issue https://github.com/eclipse/org.aspectj/issues/201[#201] was created.
+  follow-up issue https://github.com/eclipse-aspectj/aspectj/issues/201[#201] was created.
 * Remove legacy AspectJ Browser code and documentation.
 * Thanks to Andrey Turbanov for several clean code contributions.
 
diff --git a/docs/release/README-1.9.20.adoc b/docs/release/README-1.9.20.adoc
index d44769238..8e1087358 100644
--- a/docs/release/README-1.9.20.adoc
+++ b/docs/release/README-1.9.20.adoc
@@ -19,7 +19,7 @@ This is a bugfix release for 1.9.20, fixing two problems:
   https://github.com/eclipse-aspectj/aspectj/issues/256[AspectJ tracker issue 256]).
 
 The list of issues addressed for 1.9.20.1 can be found
-https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.20.1[here].
+https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.20.1[here].
 
 = AspectJ 1.9.20
 
@@ -28,11 +28,11 @@ _© Copyright 2023 Contributors. All rights reserved._
 _Release info: 1.9.20 available 16-Aug-2023_
 
 Please note that Bugzilla for issue management is deprecated and new issues should be filed as
-https://github.com/eclipse/org.aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.20 can be found
+https://github.com/eclipse-aspectj/aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.20 can be found
 here:
 
-* https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.20[GitHub 1.9.20]
-* https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.20.1[GitHub 1.9.20.1]
+* https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.20[GitHub 1.9.20]
+* https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.20.1[GitHub 1.9.20.1]
 * https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&f0=OP&f1=OP&f3=CP&f4=CP&j1=OR&list_id=16866879&product=AspectJ&query_format=advanced&target_milestone=1.9.20[Bugzilla 1.9.20]
 
 == New features
@@ -47,7 +47,7 @@ features, such as:
 
 Please note, that the upstream Eclipse Java Compiler (ECJ), which the AspectJ Compiler (AJC) is a fork of, still has
 some open issues concerning Java 20 preview feature support, see the list in
-https://github.com/eclipse/org.aspectj/issues/184#issuecomment-1272254940[this comment]. AJC therefore inherits the same
+https://github.com/eclipse-aspectj/aspectj/issues/184#issuecomment-1272254940[this comment]. AJC therefore inherits the same
 problems for the specific cases described in the linked issues.
 
 == Improvements
@@ -68,11 +68,11 @@ problems for the specific cases described in the linked issues.
 You can find some sample code in the AspectJ test suite under the respective AspectJ version in which the features were
 first supported (possibly as JVM preview features):
 
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features198/java17[Pattern matching for switch (preview 1)]
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features199/java18[Pattern matching for switch (preview 2)]
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features1919/java19[Pattern matching for switch (preview 3),
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features198/java17[Pattern matching for switch (preview 1)]
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features199/java18[Pattern matching for switch (preview 2)]
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features1919/java19[Pattern matching for switch (preview 3),
   record patterns (preview 1)]
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features1920/java20[Pattern matching for switch (preview 4),
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features1920/java20[Pattern matching for switch (preview 4),
   record patterns (preview 2)]
 * Please note that presently there is no specific sample code for virtual threads and structured concurrency in the
   AspectJ code base, because these are just new APIs, no Java language features. You can find sample code for these
diff --git a/docs/release/README-1.9.21.adoc b/docs/release/README-1.9.21.adoc
index 66a38162e..6d5d2af97 100644
--- a/docs/release/README-1.9.21.adoc
+++ b/docs/release/README-1.9.21.adoc
@@ -5,11 +5,11 @@ _© Copyright 2023 Contributors. All rights reserved._
 _Release info: 1.9.21 available 11-Dec-2023_
 
 Please note that Bugzilla for issue management is deprecated and new issues should be filed as
-https://github.com/eclipse/org.aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.21 can be found
+https://github.com/eclipse-aspectj/aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.21 can be found
 here:
 
-* https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.21[GitHub 1.9.21]
-* https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.21.1[GitHub 1.9.21.1]
+* https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.21[GitHub 1.9.21]
+* https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.21.1[GitHub 1.9.21.1]
 * https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&f0=OP&f1=OP&f3=CP&f4=CP&j1=OR&list_id=16866879&product=AspectJ&query_format=advanced&target_milestone=1.9.21[Bugzilla 1.9.21]
 
 == New features
diff --git a/docs/release/README-1.9.7.adoc b/docs/release/README-1.9.7.adoc
index c58c78b5d..c59d838dc 100644
--- a/docs/release/README-1.9.7.adoc
+++ b/docs/release/README-1.9.7.adoc
@@ -10,11 +10,11 @@ Public License v 2.0].
 
 Please note, that going forward Bugzilla for issue management is
 deprecated, and new issues should be filed as
-https://github.com/eclipse/org.aspectj/issues/new[GitHub issues]. The
+https://github.com/eclipse-aspectj/aspectj/issues/new[GitHub issues]. The
 list of issues addressed for 1.9.7 can be found
 https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&f0=OP&f1=OP&f3=CP&f4=CP&j1=OR&list_id=16866879&product=AspectJ&query_format=advanced&target_milestone=1.9.7[here
 for Bugzilla] and
-https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.7[here
+https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.7[here
 for GitHub issues].
 
 == New features
@@ -43,11 +43,11 @@ You can find some sample code in the AspectJ test suite under the
 respective AspectJ version in which the features were first supported
 (possibly as JVM preview features):
 
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features195/textblock[AspectJ
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features195/textblock[AspectJ
 1.9.5: text blocks]
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features196/java14[AspectJ
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features196/java14[AspectJ
 1.9.6: records, instanceof patterns]
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features197/java15[AspectJ
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features197/java15[AspectJ
 1.9.7: hidden classes, sealed classes]
 
 == Using LTW on Java 16+
diff --git a/docs/release/README-1.9.8.adoc b/docs/release/README-1.9.8.adoc
index f42916a7b..33208450f 100644
--- a/docs/release/README-1.9.8.adoc
+++ b/docs/release/README-1.9.8.adoc
@@ -5,9 +5,9 @@ _© Copyright 2022 Contributors. All rights reserved._
 _Release info: 1.9.8 available 11-Feb-2022_
 
 Please note, that Bugzilla for issue management is deprecated, and new issues should be filed as
-https://github.com/eclipse/org.aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.8 can be found
+https://github.com/eclipse-aspectj/aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.8 can be found
 https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&f0=OP&f1=OP&f3=CP&f4=CP&j1=OR&list_id=16866879&product=AspectJ&query_format=advanced&target_milestone=1.9.8[here for Bugzilla] and
-https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.8[here for GitHub issues].
+https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.8[here for GitHub issues].
 
 == New features
 
@@ -30,17 +30,17 @@ The following new properties can improve performance, e.g. Spring start-up time:
 For now, they all default to `false` for backward compatibility. This might change in a future Aspect release, if user
 feedback is positive and no negative side effects are found. Please try using them as much as you can and report back
 questions (to the AspectJ users mailing list) or problems (as a GitHub issue), if any. Thanks to Stefan Starke for his
-contribution. See also https://github.com/eclipse/org.aspectj/pull/37[PR #37].
+contribution. See also https://github.com/eclipse-aspectj/aspectj/pull/37[PR #37].
 
 == Code examples
 
 You can find some sample code in the AspectJ test suite under the respective AspectJ version in which the features were
 first supported (possibly as JVM preview features):
 
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features198/compiler_release[Cross-compilation to legacy JDK]:
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features198/compiler_release[Cross-compilation to legacy JDK]:
   An example class which only works correctly on JDK 8 when compiled with `--release 8` due to API changes in
   the JDK. Simply `-source 8 -target 8` would not be enough in this case.
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features198/java17[Pattern matching for `switch`]
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features198/java17[Pattern matching for `switch`]
 
 == Other changes and bug fixes
 
@@ -52,15 +52,15 @@ first supported (possibly as JVM preview features):
   `aspectjweaver` still only require JRE 8+.
 * Document build profiles and properties in _docs/developer/BUILD.md_
 * Add a guide for setting up an AspectJ development environment in _docs/developer/IDE.md_
-* Fix https://github.com/eclipse/org.aspectj/issues/105[issue #105]: Compilation fails when using an aspect library via
+* Fix https://github.com/eclipse-aspectj/aspectj/issues/105[issue #105]: Compilation fails when using an aspect library via
   `-aspectpath` in combination with introducing an annotation via ITD. This was broken since version 1.9.5 and fixed in
   1.9.8.RC3.
-* Fix https://github.com/eclipse/org.aspectj/issues/68[issue #68]: Correctly process class files containing
+* Fix https://github.com/eclipse-aspectj/aspectj/issues/68[issue #68]: Correctly process class files containing
   https://openjdk.java.net/jeps/309[dynamic class-file constants (JEP 309)], which were introduced in Java 11 and broken
   in AspectJ ever since their introduction in 1.9.2. Java itself currently does not use "condy" and neither do other
   widespread JVM languages. Byte code engineering libraries like ASM or Byte Buddy and some instrumentation tools like
   JaCoCo can however produce condy code. Therefore, in order to create a regression test, we actually had to
-  https://github.com/eclipse/org.aspectj/blob/de63b63d/tests/bugs198/github_68/Generator.java#L50-L61[craft a condy
+  https://github.com/eclipse-aspectj/aspectj/blob/de63b63d/tests/bugs198/github_68/Generator.java#L50-L61[craft a condy
   class with ASM].
 * Thanks to Andrey Turbanov for several clean code contributions and to Dmitry Mikhaylov for fixing a potential
   concurrency problem.
diff --git a/docs/release/README-1.9.9.adoc b/docs/release/README-1.9.9.adoc
index b4dda99ba..98834a7bb 100644
--- a/docs/release/README-1.9.9.adoc
+++ b/docs/release/README-1.9.9.adoc
@@ -10,7 +10,7 @@ _Release info: 1.9.9.1 available 31-Mar-2022_
 
 Bugfix release for some compiler options related to the Java Platform Module System (JPMS) which were not working, most
 importantly `--add-modules`, `--add-exports` and `--add-reads`. See
-https://github.com/eclipse/org.aspectj/issues/145[issue #145].
+https://github.com/eclipse-aspectj/aspectj/issues/145[issue #145].
 
 This probably was broken for a long time. AspectJ still is not boasting extensive JPMS support or test coverage, but
 this improvement seems substantial enough to justify a minor release, instead of keeping users waiting for the next
@@ -23,11 +23,11 @@ _© Copyright 2022 Contributors. All rights reserved._
 _Release info: 1.9.9 available 24-Mar-2022_
 
 Please note that Bugzilla for issue management is deprecated and new issues should be filed as
-https://github.com/eclipse/org.aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.9 can be found
+https://github.com/eclipse-aspectj/aspectj/issues/new[GitHub issues]. The list of issues addressed for 1.9.9 can be found
 here:
 
-* https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.9[GitHub 1.9.9]
-* https://github.com/eclipse/org.aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.9.1[GitHub 1.9.9.1]
+* https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.9[GitHub 1.9.9]
+* https://github.com/eclipse-aspectj/aspectj/issues?q=is%3Aissue+is%3Aclosed++milestone%3A1.9.9.1[GitHub 1.9.9.1]
 * https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&f0=OP&f1=OP&f3=CP&f4=CP&j1=OR&list_id=16866879&product=AspectJ&query_format=advanced&target_milestone=1.9.9[Bugzilla 1.9.9]
 
 == New features
@@ -43,17 +43,17 @@ the advice. Previously, this was only working in native syntax aspects. There is
 asynchronous proceed, if you do not create the thread in the advice but want to use e.g. an `ExecutorService` with its
 own thread pool. This still is not working in annotation style aspects, only in native syntax ones.
 
-See https://github.com/eclipse/org.aspectj/issues/128[issue #128] and
-https://github.com/eclipse/org.aspectj/pull/132[pull request #132] for more details.
+See https://github.com/eclipse-aspectj/aspectj/issues/128[issue #128] and
+https://github.com/eclipse-aspectj/aspectj/pull/132[pull request #132] for more details.
 
 == Code examples
 
 You can find some sample code in the AspectJ test suite under the respective AspectJ version in which the features were
 first supported (possibly as JVM preview features):
 
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features198/java17[Pattern matching for switch, preview 1]
-* https://github.com/eclipse/org.aspectj/tree/master/tests/features199/java18[Pattern matching for switch, preview 2]
-* https://github.com/eclipse/org.aspectj/tree/master/tests/bugs199/github_128[Asynchronous proceed in native vs.
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features198/java17[Pattern matching for switch, preview 1]
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/features199/java18[Pattern matching for switch, preview 2]
+* https://github.com/eclipse-aspectj/aspectj/tree/master/tests/bugs199/github_128[Asynchronous proceed in native vs.
   annotation style syntax]
 
 == Other changes and bug fixes
@@ -62,10 +62,10 @@ first supported (possibly as JVM preview features):
   the value of system property `org.aspectj.weaver.openarchives` (1,000 by default). The AspectJ compiler is meant to
   close archives upon cache exhaustion and then re-open them, if it needs them again later. Re-opening was broken, but
   now the compiler works reliably even for cache sizes as small as 20. See
-  https://github.com/eclipse/org.aspectj/issues/125[issue #125].
+  https://github.com/eclipse-aspectj/aspectj/issues/125[issue #125].
 * Improvements for `if()` pointcuts in annotation syntax, see issues
-  https://github.com/eclipse/org.aspectj/issues/115[#115], https://github.com/eclipse/org.aspectj/issues/120[#120],
-  https://github.com/eclipse/org.aspectj/issues/122[#122].
+  https://github.com/eclipse-aspectj/aspectj/issues/115[#115], https://github.com/eclipse-aspectj/aspectj/issues/120[#120],
+  https://github.com/eclipse-aspectj/aspectj/issues/122[#122].
 * Thanks to Andrey Turbanov for several clean code contributions.
 
 == AspectJ usage hints
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index 0daa12747..ca61d85ae 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -158,7 +158,7 @@ public class AspectDeclaration extends TypeDeclaration {
 			if (
 				!Modifier.isStatic(modifiers) &&
 				// Inner classes/aspects of interfaces are implicitly static,
-				// see https://github.com/eclipse/org.aspectj/issues/162
+				// see https://github.com/eclipse-aspectj/aspectj/issues/162
 				(this.enclosingType.modifiers & ClassFileConstants.AccInterface) == 0
 			) {
 				scope.problemReporter().signalError(sourceStart, sourceEnd, "inner aspects must be static");
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java
index d27b2b62a..9ecf56d2d 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/ValidateAtAspectJAnnotationsVisitor.java
@@ -234,7 +234,7 @@ public class ValidateAtAspectJAnnotationsVisitor extends ASTVisitor {
 			if (
 				!Modifier.isStatic(typeDecl.modifiers) &&
 				// Inner classes/aspects of interfaces are implicitly static,
-				// see https://github.com/eclipse/org.aspectj/issues/162
+				// see https://github.com/eclipse-aspectj/aspectj/issues/162
 				(typeDecl.enclosingType.modifiers & ClassFileConstants.AccInterface) == 0
 			) {
 				typeDecl.scope.problemReporter().signalError(typeDecl.sourceStart, typeDecl.sourceEnd,
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index 4f45959df..a937d328e 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -1045,7 +1045,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 			FileSystem fileSystem = getLibraryAccess(classpaths, filenames);
 
 			// Use upstream method to generate '--add-reads', '--add-exports' info and copy it into our FileSystem instance.
-			// See https://github.com/eclipse/org.aspectj/issues/145.
+			// See https://github.com/eclipse-aspectj/aspectj/issues/145.
 			FileSystem fileSystemTemp = buildConfig.getBuildArgParser().getLibraryAccess();
 			fileSystem.moduleUpdates = fileSystemTemp.moduleUpdates;
 			fileSystemTemp.cleanup();
diff --git a/tests/bugs1920/github_162/InterfaceWithInnerClass.java b/tests/bugs1920/github_162/InterfaceWithInnerClass.java
index f26975cc0..507bef54f 100644
--- a/tests/bugs1920/github_162/InterfaceWithInnerClass.java
+++ b/tests/bugs1920/github_162/InterfaceWithInnerClass.java
@@ -3,7 +3,7 @@ import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.JoinPoint;
 
 /**
- * https://github.com/eclipse/org.aspectj/issues/162
+ * https://github.com/eclipse-aspectj/aspectj/issues/162
  */
 public interface InterfaceWithInnerClass {
   public class ImplicitlyStatic {
diff --git a/tests/bugs1920/github_20/ParenthesisedAJKeywords.java b/tests/bugs1920/github_20/ParenthesisedAJKeywords.java
index 1ba013c57..477eac5b0 100644
--- a/tests/bugs1920/github_20/ParenthesisedAJKeywords.java
+++ b/tests/bugs1920/github_20/ParenthesisedAJKeywords.java
@@ -1,5 +1,5 @@
 /**
- * https://github.com/eclipse/org.aspectj/issues/20
+ * https://github.com/eclipse-aspectj/aspectj/issues/20
  */
 public class ParenthesisedAJKeywords {
   public static void main(String[] args) {
diff --git a/tests/bugs198/github_105/Application.java b/tests/bugs198/github_105/Application.java
index bcf4f5624..e32bd0a88 100644
--- a/tests/bugs198/github_105/Application.java
+++ b/tests/bugs198/github_105/Application.java
@@ -6,7 +6,7 @@ import java.lang.annotation.Annotation;
  * This fails in AspectJ 1.9.5 to 1.9.8.RC2 due to a removed safeguard in JDT Core,
  * if the aspect is in a separate library on the aspectpath.
  * <p>
- * See https://github.com/eclipse/org.aspectj/issues/105
+ * See https://github.com/eclipse-aspectj/aspectj/issues/105
  */
 @FooAnnotation
 public class Application {
diff --git a/tests/features164/declareMixin/CaseEConcurrent.java b/tests/features164/declareMixin/CaseEConcurrent.java
index 874f249d5..e52ad7101 100644
--- a/tests/features164/declareMixin/CaseEConcurrent.java
+++ b/tests/features164/declareMixin/CaseEConcurrent.java
@@ -1,5 +1,5 @@
 // TESTING: multiple instances causing factory invocation multiple times (but is cached correctly)
-// Concurrency fix regression test for https://github.com/eclipse/org.aspectj/issues/198
+// Concurrency fix regression test for https://github.com/eclipse-aspectj/aspectj/issues/198
 import org.aspectj.lang.annotation.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -35,7 +35,7 @@ public class CaseEConcurrent {
   }
 
   // Helper methods 'doSomething' and 'callMe' help to produce byte code similar to what we need in order to fix
-  // https://github.com/eclipse/org.aspectj/issues/198. If necessary, just temporarily uncomment, compile and analyse
+  // https://github.com/eclipse-aspectj/aspectj/issues/198. If necessary, just temporarily uncomment, compile and analyse
   // the byte code, e.g. with JDK tool 'javap -v'.
   /*
   public void doSomething() {
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java
index 1c312d18b..4ae5fca68 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc164/DeclareMixinTests.java
@@ -68,7 +68,7 @@ public class DeclareMixinTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	}
 
 	// multiple instances causing factory invocation multiple times (but is cached), concurrent case
-	// see https://github.com/eclipse/org.aspectj/issues/198
+	// see https://github.com/eclipse-aspectj/aspectj/issues/198
 	public void testCaseEConcurrent() {
 		runTest("casee_concurrent");
 	}
diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java
index 9d1dc6c6d..6ec1291d4 100644
--- a/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/ajc199/Bugs199Tests.java
@@ -49,7 +49,7 @@ public class Bugs199Tests extends XMLBasedAjcTestCase {
   }
 
   public void testAsyncProceedNestedAroundAdviceThreadPool_gh128() {
-    // TODO: future improvement, see https://github.com/eclipse/org.aspectj/issues/141
+    // TODO: future improvement, see https://github.com/eclipse-aspectj/aspectj/issues/141
     // runTest("asynchronous proceed for nested around-advice (@AspectJ, thread pool)");
   }
 
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc164/declareMixin.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc164/declareMixin.xml
index c397fae87..a9da3cafb 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc164/declareMixin.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc164/declareMixin.xml
@@ -61,7 +61,7 @@
      <run class="CaseEConcurrent">
        <stdout ordered="no">
          <!--
-           Without the concurrency fix from https://github.com/eclipse/org.aspectj/issues/198, each delegate factory
+           Without the concurrency fix from https://github.com/eclipse-aspectj/aspectj/issues/198, each delegate factory
            would be invoked twice
          -->
          <line text="Delegate factory invoked for CaseEConcurrent instance: a"/>
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml
index 98a255088..37ac7e9a3 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc1920/ajc1920.xml
@@ -176,7 +176,7 @@
 		</run>
 	</ajc-test>
 
-	<!-- RuntimeException in BcelWeaver, see https://github.com/eclipse/org.aspectj/issues/190 -->
+	<!-- RuntimeException in BcelWeaver, see https://github.com/eclipse-aspectj/aspectj/issues/190 -->
 	<ajc-test dir="bugs1920/github_190" vm="1.5" title="switch with Integer.MAX_VALUE case">
 		<compile files="SwitchCaseWith_Integer_MAX_VALUE.java" options="-1.5 -showWeaveInfo">
 			<message kind="weave" text="Join point 'method-execution(java.lang.String SwitchCaseWith_Integer_MAX_VALUE.switchTest(int))'"/>
@@ -191,7 +191,7 @@
 
 	<!--
 		'Syntax error, insert "Expression" to complete Expression' when compiling parenthesised expressions
-		containing AspectJ keywords, e.g. '(before)', see https://github.com/eclipse/org.aspectj/issues/20
+		containing AspectJ keywords, e.g. '(before)', see https://github.com/eclipse-aspectj/aspectj/issues/20
 	-->
 	<ajc-test dir="bugs1920/github_20" vm="1.5" title="parenthesised expression with AspectJ keyword">
 		<compile files="ParenthesisedAJKeywords.java" options="-1.5 -showWeaveInfo"/>
@@ -210,7 +210,7 @@
 
 	<!--
 		'inner aspects must be static' when compiling an interface with an inner aspect which was not explicitly declared
-		static, see https://github.com/eclipse/org.aspectj/issues/162
+		static, see https://github.com/eclipse-aspectj/aspectj/issues/162
 	-->
 	<ajc-test dir="bugs1920/github_162" vm="1.5" title="inner aspect of interface is implicitly static">
 		<compile files="InterfaceWithInnerClass.java" options="-1.5 -showWeaveInfo">
@@ -228,7 +228,7 @@
 
 	<!--
 		When compiling aspect and target class together, matching works as expected,
-		see https://github.com/eclipse/org.aspectj/issues/24
+		see https://github.com/eclipse-aspectj/aspectj/issues/24
 	-->
 	<ajc-test dir="bugs1920/github_24" vm="1.5" title="exact array type matching, aspect compiled together with target class">
 		<compile files="ExactlyMatchingAspect.aj MaybeMissingClass.java" options="-1.5 -showWeaveInfo">
@@ -260,7 +260,7 @@
 
 	<!--
 		When compiling aspect and target class separately, too many joinpoints are matched,
-		see https://github.com/eclipse/org.aspectj/issues/24
+		see https://github.com/eclipse-aspectj/aspectj/issues/24
 	-->
 	<ajc-test dir="bugs1920/github_24" vm="1.5" title="exact array type matching, aspect compiled separately from target class">
 		<compile files="ExactlyMatchingAspect.aj" options="-1.5 -showWeaveInfo" outjar="aspect.jar">
@@ -296,7 +296,7 @@
 
 	<!--
 		When compiling aspect and target class together, too many joinpoints are matched,
-		see https://github.com/eclipse/org.aspectj/issues/24
+		see https://github.com/eclipse-aspectj/aspectj/issues/24
 	-->
 	<ajc-test dir="bugs1920/github_24" vm="1.5" title="fuzzy array type matching, aspect compiled together with target class">
 		<compile files="FuzzilyMatchingAspect.aj MaybeMissingClass.java" options="-1.5 -showWeaveInfo">
@@ -328,7 +328,7 @@
 
 	<!--
 		When compiling aspect and target class separately, too many joinpoints are matched,
-		see https://github.com/eclipse/org.aspectj/issues/24
+		see https://github.com/eclipse-aspectj/aspectj/issues/24
 	-->
 	<ajc-test dir="bugs1920/github_24" vm="1.5" title="fuzzy array type matching, aspect compiled separately from target class">
 		<compile files="FuzzilyMatchingAspect.aj" options="-1.5 -showWeaveInfo" outjar="aspect.jar">
@@ -362,7 +362,7 @@
 	</ajc-test>
 
 	<!--
-		https://github.com/eclipse/org.aspectj/issues/214
+		https://github.com/eclipse-aspectj/aspectj/issues/214
 		https://github.com/mojohaus/aspectj-maven-plugin/issues/164
 		Problem with multiple, subsequent weaving steps and '-Xlint:warning' or '-Xlint:unorderedAdviceAtShadow=warning'
 			java.lang.ArrayIndexOutOfBoundsException: 1
diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
index be4957134..62861cfea 100644
--- a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
+++ b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml
@@ -3,7 +3,7 @@
 
 <suite>
 
-	<!-- https://github.com/eclipse/org.aspectj/issues/68 -->
+	<!-- https://github.com/eclipse-aspectj/aspectj/issues/68 -->
 	<ajc-test dir="bugs198/github_68" vm="11" title="correctly weave code using constant-dynamic">
 		<compile files="Application.java MyAspect.aj" options="-11" inpath="condy.jar"/>
 		<run class="Application">
@@ -16,7 +16,7 @@
 		</run>
 	</ajc-test>
 
-	<!-- https://github.com/eclipse/org.aspectj/issues/105 -->
+	<!-- https://github.com/eclipse-aspectj/aspectj/issues/105 -->
 	<ajc-test dir="bugs198/github_105" vm="8" title="ITD annotation with mandatory parameter via aspectpath">
 		<compile files="FooAnnotation.java BarAnnotation.java FooAspect.aj" options="-8" outjar="aspect.jar"/>
 		<compile files="Application.java" options="-8" aspectpath="aspect.jar"/>