diff --git a/docs/_plugins/javadoc_tag.rb b/docs/_plugins/javadoc_tag.rb
index 6ca08afdf0..b3e79329f9 100644
--- a/docs/_plugins/javadoc_tag.rb
+++ b/docs/_plugins/javadoc_tag.rb
@@ -239,7 +239,8 @@ class JavadocTag < Liquid::Tag
src_dirs = [
File.join(artifact_dir, "src", "main", "java"),
- File.join(artifact_dir, "target", "generated-sources", "javacc")
+ File.join(artifact_dir, "target", "generated-sources", "javacc"),
+ File.join(artifact_dir, "target", "generated-sources", "antlr4")
].select {|dir| File.exist?(dir)}
targets = src_dirs
diff --git a/docs/_plugins/jdoc_namespace_tag.rb b/docs/_plugins/jdoc_namespace_tag.rb
index 01373ad410..f6de2f0c49 100644
--- a/docs/_plugins/jdoc_namespace_tag.rb
+++ b/docs/_plugins/jdoc_namespace_tag.rb
@@ -99,8 +99,10 @@ class JDocNamespaceDeclaration < Liquid::Tag
private
JDOC_NAMESPACE_MAP = "jdoc_nspaces"
- RESERVED_NSPACES = ['apex', 'core', 'cpp', 'cs', 'dist', 'doc', 'fortran', 'go', 'groovy', 'java', 'javascript', 'jsp',
- 'kotlin', 'matlab', 'objectivec', 'perl', 'php', 'plsql', 'python', 'ruby', 'scala', 'swift', 'test', 'ui',
+ RESERVED_NSPACES = ['apex', 'core', 'cpp', 'cs', 'dart', 'dist', 'doc', 'fortran', 'go', 'groovy', 'java',
+ 'javascript', 'jsp',
+ 'kotlin', 'lua', 'matlab', 'objectivec', 'perl', 'php', 'plsql', 'python', 'ruby', 'scala', 'swift',
+ 'test', 'ui',
'modelica', 'visualforce', 'vm', 'xml'].flat_map {|m| [m, "pmd-" + m]}
def self.make_base_namespaces
diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index ac7b4e1bfc..62281d2e5a 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -55,6 +55,16 @@ AbstractTokenizer and the custom tokenizers of Fortran, Perl and Ruby are deprec
* {% jdoc !!ruby::cpd.RubyTokenizer %}. Was replaced by an {% jdoc core::cpd.AnyTokenizer %}. Use {% jdoc !!ruby::cpd.RubyLanguage#getTokenizer() %} anyway.
* {% jdoc !!core::lang.rule.RuleReference#getOverriddenLanguage() %} and
{% jdoc !!core::lang.rule.RuleReference#setLanguage(net.sourceforge.pmd.lang.Language) %}
+* Antlr4 generated lexers:
+ * {% jdoc !!cs::lang.cs.antlr4.CSharpLexer %} will be moved to package `net.sourceforge.pmd.lang.cs.ast` with PMD 7.
+ * {% jdoc !!dart::lang.dart.antlr4.Dart2Lexer %} will be renamed to `DartLexer` and moved to package
+ `net.sourceforge.pmd.lang.dart.ast` with PMD 7. All other classes in the old package will be removed.
+ * {% jdoc !!go::lang.go.antlr4.GolangLexer %} will be moved to package
+ `net.sourceforge.pmd.lang.go.ast` with PMD 7. All other classes in the old package will be removed.
+ * {% jdoc !!kotlin::lang.kotlin.antlr4.Kotlin %} will be renamed to `KotlinLexer` and moved to package
+ `net.sourceforge.pmd.lang.kotlin.ast` with PMD 7.
+ * {% jdoc !!lua::lang.lua.antlr4.LuaLexer %} will be moved to package
+ `net.sourceforge.pmd.lang.lua.ast` with PMD 7. All other classes in the old package will be removed.
### External Contributions
diff --git a/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/antlr4/package-info.java b/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/antlr4/package-info.java
new file mode 100644
index 0000000000..8a31e36593
--- /dev/null
+++ b/pmd-cs/src/main/java/net/sourceforge/pmd/lang/cs/antlr4/package-info.java
@@ -0,0 +1,9 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+/**
+ * The class {@link net.sourceforge.pmd.lang.cs.antlr4.CSharpLexer} will be moved to package
+ * {@code net.sourceforge.pmd.lang.cs.ast} with PMD 7.
+ */
+package net.sourceforge.pmd.lang.cs.antlr4;
diff --git a/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/antlr4/package-info.java b/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/antlr4/package-info.java
new file mode 100644
index 0000000000..a8f221ec2b
--- /dev/null
+++ b/pmd-dart/src/main/java/net/sourceforge/pmd/lang/dart/antlr4/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+/**
+ * The class {@link net.sourceforge.pmd.lang.dart.antlr4.Dart2Lexer} will be renamed to {@code DartLexter} and
+ * be moved to package {@code net.sourceforge.pmd.lang.dart.ast} with PMD 7.
+ *
+ * All other classes will be removed.
+ */
+package net.sourceforge.pmd.lang.dart.antlr4;
diff --git a/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/antlr4/package-info.java b/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/antlr4/package-info.java
new file mode 100644
index 0000000000..cbadf9a799
--- /dev/null
+++ b/pmd-go/src/main/java/net/sourceforge/pmd/lang/go/antlr4/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+/**
+ * The class {@link net.sourceforge.pmd.lang.go.antlr4.GolangLexer} will be moved to
+ * package {@code net.sourceforge.pmd.lang.go.ast} with PMD 7.
+ *
+ *
All other classes will be removed.
+ */
+package net.sourceforge.pmd.lang.go.antlr4;
diff --git a/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/antlr4/package-info.java b/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/antlr4/package-info.java
new file mode 100644
index 0000000000..46869b9211
--- /dev/null
+++ b/pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/antlr4/package-info.java
@@ -0,0 +1,9 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+/**
+ * The class {@link net.sourceforge.pmd.lang.kotlin.antlr4.Kotlin} will be renamed to {@code KotlinLexer} and
+ * be moved to package {@code net.sourceforge.pmd.lang.kotlin.ast} with PMD 7.
+ */
+package net.sourceforge.pmd.lang.kotlin.antlr4;
diff --git a/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/antlr4/package-info.java b/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/antlr4/package-info.java
new file mode 100644
index 0000000000..54205d4814
--- /dev/null
+++ b/pmd-lua/src/main/java/net/sourceforge/pmd/lang/lua/antlr4/package-info.java
@@ -0,0 +1,11 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+/**
+ * The class {@link net.sourceforge.pmd.lang.lua.antlr4.LuaLexer} will be moved to
+ * package {@code net.sourceforge.pmd.lang.lua.ast} with PMD 7.
+ *
+ *
All other classes will be removed.
+ */
+package net.sourceforge.pmd.lang.lua.antlr4;