Merge pull request #4696 from adangel:bump-scala

Bump various scala versions #4696

.all-contributorsrc

@@ -7250,6 +7250,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "eugenepugach",
+      "name": "eugenepugach",
+      "avatar_url": "https://avatars.githubusercontent.com/u/133967768?v=4",
+      "profile": "https://github.com/eugenepugach",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

docs/pages/release_notes.md

@@ -78,6 +78,7 @@ Note: Support for Java 19 preview language features have been removed. The versi
 
 * miscellaneous
   * [#4582](https://github.com/pmd/pmd/issues/4582): \[dist] Download link broken
+  * [#4691](https://github.com/pmd/pmd/issues/4691): \[CVEs] Critical and High CEVs reported on PMD and PMD dependencies
 * core
   * [#1204](https://github.com/pmd/pmd/issues/1204): \[core] Allow numeric properties in XML to be within an unbounded range
   * [#3919](https://github.com/pmd/pmd/issues/3919): \[core] Merge CPD and PMD language
@@ -633,6 +634,7 @@ See also [Detailed Release Notes for PMD 7]({{ baseurl }}pmd_release_notes_pmd7.
     * [#4462](https://github.com/pmd/pmd/issues/4462): Provide Software Bill of Materials (SBOM)
     * [#4460](https://github.com/pmd/pmd/pull/4460):   Fix assembly-plugin warnings
     * [#4582](https://github.com/pmd/pmd/issues/4582): \[dist] Download link broken
+    * [#4691](https://github.com/pmd/pmd/issues/4691): \[CVEs] Critical and High CEVs reported on PMD and PMD dependencies
 * ant
     * [#4080](https://github.com/pmd/pmd/issues/4080): \[ant] Split off Ant integration into a new submodule
 * core

pmd-scala-modules/pmd-scala-common/pom.xml

@@ -13,7 +13,7 @@
     </parent>
 
     <properties>
-        <scalameta.version>4.6.0</scalameta.version>
+        <scalameta.version>4.8.11</scalameta.version>
     </properties>
 
     <build>

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTMemberParamClauseGroup.java

@@ -0,0 +1,22 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.scala.ast;
+
+import scala.meta.Member;
+
+/**
+ * The ASTMemberParamClauseGroup node implementation.
+ */
+public final class ASTMemberParamClauseGroup extends AbstractScalaNode<Member.ParamClauseGroup> {
+
+    ASTMemberParamClauseGroup(Member.ParamClauseGroup scalaNode) {
+        super(scalaNode);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(ScalaParserVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+}

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTPatArgClause.java

@@ -0,0 +1,22 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.scala.ast;
+
+import scala.meta.Pat;
+
+/**
+ * The ASTPatArgClause node implementation.
+ */
+public final class ASTPatArgClause extends AbstractScalaNode<Pat.ArgClause> {
+
+    ASTPatArgClause(Pat.ArgClause scalaNode) {
+        super(scalaNode);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(ScalaParserVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+}

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermArgClause.java

@@ -0,0 +1,22 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.scala.ast;
+
+import scala.meta.Term;
+
+/**
+ * The ASTTermArgClause node implementation.
+ */
+public final class ASTTermArgClause extends AbstractScalaNode<Term.ArgClause> {
+
+    ASTTermArgClause(Term.ArgClause scalaNode) {
+        super(scalaNode);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(ScalaParserVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+}

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTermParamClause.java

@@ -0,0 +1,22 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.scala.ast;
+
+import scala.meta.Term;
+
+/**
+ * The ASTTermParamClause node implementation.
+ */
+public final class ASTTermParamClause extends AbstractScalaNode<Term.ParamClause> {
+
+    ASTTermParamClause(Term.ParamClause scalaNode) {
+        super(scalaNode);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(ScalaParserVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+}

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeArgClause.java

@@ -0,0 +1,22 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.scala.ast;
+
+import scala.meta.Type;
+
+/**
+ * The ASTTypeArgClause node implementation.
+ */
+public final class ASTTypeArgClause extends AbstractScalaNode<Type.ArgClause> {
+
+    ASTTypeArgClause(Type.ArgClause scalaNode) {
+        super(scalaNode);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(ScalaParserVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+}

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeFuncParamClause.java

@@ -0,0 +1,22 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.scala.ast;
+
+import scala.meta.Type;
+
+/**
+ * The ASTTypeFuncParamClause node implementation.
+ */
+public final class ASTTypeFuncParamClause extends AbstractScalaNode<Type.FuncParamClause> {
+
+    ASTTypeFuncParamClause(Type.FuncParamClause scalaNode) {
+        super(scalaNode);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(ScalaParserVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+}

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ASTTypeParamClause.java

@@ -0,0 +1,22 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package net.sourceforge.pmd.lang.scala.ast;
+
+import scala.meta.Type;
+
+/**
+ * The ASTTypeParamClause node implementation.
+ */
+public final class ASTTypeParamClause extends AbstractScalaNode<Type.ParamClause> {
+
+    ASTTypeParamClause(Type.ParamClause scalaNode) {
+        super(scalaNode);
+    }
+
+    @Override
+    protected <P, R> R acceptVisitor(ScalaParserVisitor<? super P, ? extends R> visitor, P data) {
+        return visitor.visit(this, data);
+    }
+}

pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/lang/scala/ast/ScalaTreeBuilder.java

@@ -21,6 +21,7 @@
 import scala.meta.Importer;
 import scala.meta.Init;
 import scala.meta.Lit;
+import scala.meta.Member;
 import scala.meta.Mod;
 import scala.meta.Name;
 import scala.meta.Pat;
@@ -79,6 +80,7 @@ class ScalaTreeBuilder {
         register(Lit.String.class, ASTLitString.class);
         register(Lit.Symbol.class, ASTLitSymbol.class);
         register(Lit.Unit.class, ASTLitUnit.class);
+        register(Member.ParamClauseGroup.class, ASTMemberParamClauseGroup.class);
         register(Mod.Abstract.class, ASTModAbstract.class);
         register(Mod.Annot.class, ASTModAnnot.class);
         register(Mod.Case.class, ASTModCase.class);
@@ -97,6 +99,7 @@ class ScalaTreeBuilder {
         register(Name.Anonymous.class, ASTNameAnonymous.class);
         register(Name.Indeterminate.class, ASTNameIndeterminate.class);
         register(Pat.Alternative.class, ASTPatAlternative.class);
+        register(Pat.ArgClause.class, ASTPatArgClause.class);
         register(Pat.Bind.class, ASTPatBind.class);
         register(Pat.Extract.class, ASTPatExtract.class);
         register(Pat.ExtractInfix.class, ASTPatExtractInfix.class);
@@ -118,6 +121,7 @@ class ScalaTreeBuilder {
         register(Term.ApplyInfix.class, ASTTermApplyInfix.class);
         register(Term.ApplyType.class, ASTTermApplyType.class);
         register(Term.ApplyUnary.class, ASTTermApplyUnary.class);
+        register(Term.ArgClause.class, ASTTermArgClause.class);
         register(Term.Ascribe.class, ASTTermAscribe.class);
         register(Term.Assign.class, ASTTermAssign.class);
         register(Term.Block.class, ASTTermBlock.class);
@@ -133,6 +137,7 @@ class ScalaTreeBuilder {
         register(Term.NewAnonymous.class, ASTTermNewAnonymous.class);
         register(Term.New.class, ASTTermNew.class);
         register(Term.Param.class, ASTTermParam.class);
+        register(Term.ParamClause.class, ASTTermParamClause.class);
         register(Term.PartialFunction.class, ASTTermPartialFunction.class);
         register(Term.Placeholder.class, ASTTermPlaceholder.class);
         register(Term.Repeated.class, ASTTermRepeated.class);
@@ -150,16 +155,19 @@ class ScalaTreeBuilder {
         register(Type.Annotate.class, ASTTypeAnnotate.class);
         register(Type.Apply.class, ASTTypeApply.class);
         register(Type.ApplyInfix.class, ASTTypeApplyInfix.class);
+        register(Type.ArgClause.class, ASTTypeArgClause.class);
         register(Type.Bounds.class, ASTTypeBounds.class);
         register(Type.ByName.class, ASTTypeByName.class);
         register(Type.Existential.class, ASTTypeExistential.class);
+        register(Type.FuncParamClause.class, ASTTypeFuncParamClause.class);
         register(Type.Function.class, ASTTypeFunction.class);
         register(Type.ImplicitFunction.class, ASTTypeImplicitFunction.class);
         register(Type.Lambda.class, ASTTypeLambda.class);
         register(Type.Method.class, ASTTypeMethod.class);
         register(Type.Name.class, ASTTypeName.class);
         register(Type.Or.class, ASTTypeOr.class);
         register(Type.Param.class, ASTTypeParam.class);
+        register(Type.ParamClause.class, ASTTypeParamClause.class);
         register(Type.Placeholder.class, ASTTypePlaceholder.class);
         register(Type.Project.class, ASTTypeProject.class);
         register(Type.Refine.class, ASTTypeRefine.class);

pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/lang/scala/rule/ScalaRuleTest.java

@@ -35,7 +35,7 @@ public RuleContext visit(ScalaNode<?> node, RuleContext data) {
         };
         ASTSource root = scala.parseResource(SCALA_TEST);
         rule.apply(root, null);
-        assertEquals(12, visited.get());
+        assertEquals(13, visited.get());
     }
 
     @Test

pmd-scala-modules/pmd-scala-common/src/test/kotlin/net/sourceforge/pmd/lang/scala/ast/ScalaTreeTests.kt

@@ -30,6 +30,11 @@ class Foo {
                     it::isImplicit shouldBe false
                 }
 
+                child<ASTTypeParamClause> {
+                    it.assertPosition(bline = 1, bcol = 11, eline = 1, ecol = 11) // node has zero length
+                    it::isImplicit shouldBe true
+                }
+
                 child<ASTCtorPrimary> {
                     it.assertPosition(bline = 1, bcol = 11, eline = 1, ecol = 11) // node has zero length
                     it::isImplicit shouldBe true