Upgrade various dependencies

build-logic/src/main/kotlin/com/ibm/wala/gradle/VerifiedDownload.kt

@@ -49,15 +49,15 @@ abstract class VerifiedDownload : DefaultTask() {
   @TaskAction
   fun downloadAndVerify() {
     downloadExtension.run {
-      src([email protected].map { it.toURL() })
+      src([email protected])
       dest([email protected])
       overwrite(true)
       onlyIfModified(true)
       useETag([email protected]())
       retries(5)
     }
     verifyExtension.run {
-      src([email protected].get().asFile)
+      src([email protected])
       algorithm([email protected]())
       checksum([email protected]())
     }

cast/java/ecj/src/main/java/com/ibm/wala/cast/java/ecj/util/SourceDirCallGraph.java

@@ -51,7 +51,9 @@ public interface Processor {
    * <p>Example args: -sourceDir /tmp/srcTest -mainClass LFoo
    */
   public static void main(String[] args)
-      throws ClassHierarchyException, IllegalArgumentException, CallGraphBuilderCancelException,
+      throws ClassHierarchyException,
+          IllegalArgumentException,
+          CallGraphBuilderCancelException,
           IOException {
     new SourceDirCallGraph()
         .doit(
@@ -68,7 +70,9 @@ protected ClassLoaderFactory getLoaderFactory(AnalysisScope scope) {
   }
 
   public void doit(String[] args, Processor processor)
-      throws ClassHierarchyException, IllegalArgumentException, CallGraphBuilderCancelException,
+      throws ClassHierarchyException,
+          IllegalArgumentException,
+          CallGraphBuilderCancelException,
           IOException {
     long start = System.currentTimeMillis();
     Properties p = CommandLine.parse(args);

cast/java/ecj/src/main/java/com/ibm/wala/cast/java/translator/jdt/JDTJava2CAstTranslator.java

@@ -444,7 +444,9 @@ private CAstEntity visitTypeDecl(AbstractTypeDeclaration n, WalkContext context)
         makePosition(n.getName()));
   }
 
-  /** @param name Used in creating default constructor, and passed into new ClassEntity() */
+  /**
+   * @param name Used in creating default constructor, and passed into new ClassEntity()
+   */
   private CAstEntity createClassDeclaration(
       ASTNode n,
       List<BodyDeclaration> bodyDecls,
@@ -4589,7 +4591,9 @@ private CAstEntity visit(EnumDeclaration n, WalkContext context) {
         makePosition(n.getName()));
   }
 
-  /** @param n for positioning. */
+  /**
+   * @param n for positioning.
+   */
   private CAstEntity createEnumConstructorWithParameters(
       IMethodBinding ctor,
       ASTNode n,

cast/java/ecj/src/main/java/com/ibm/wala/cast/java/translator/jdt/JDTTypeDictionary.java

@@ -64,7 +64,9 @@ public class JDTTypeDictionary extends CAstTypeDictionaryImpl<ITypeBinding> {
 
   protected final JDTIdentityMapper fIdentityMapper; // TAGALONG
 
-  /** @param ast Needed to get root type "java.lang.Object" */
+  /**
+   * @param ast Needed to get root type "java.lang.Object"
+   */
   public JDTTypeDictionary(AST ast, JDTIdentityMapper identityMapper) {
     fAst = ast;
     fIdentityMapper = identityMapper;

cast/java/src/main/java/com/ibm/wala/cast/java/ipa/slicer/AstJavaSlicer.java

@@ -47,7 +47,9 @@ public static Collection<Statement> computeBackwardSlice(SDG<?> sdg, Collection<
     return computeSlice(sdg, ss, true);
   }
 
-  /** @param ss a collection of statements of interest */
+  /**
+   * @param ss a collection of statements of interest
+   */
   public static Collection<Statement> computeSlice(
       SDG<?> sdg, Collection<Statement> ss, boolean backward) throws CancelException {
     return new Slicer().slice(sdg, ss, backward);

cast/java/src/main/java/com/ibm/wala/cast/java/loader/JavaSourceLoaderImpl.java

@@ -85,6 +85,7 @@ public abstract class JavaSourceLoaderImpl extends ClassLoaderImpl {
   /* BEGIN Custom change: Common superclass is optional */
   private final boolean
       existsCommonSuperclass; // extension to deal with X10 that has no common superclass
+
   /* END Custom change: Common superclass is optional */
 
   /**
@@ -589,6 +590,7 @@ public JavaSourceLoaderImpl(
     // standard case: we have a common super class
     this(true, loaderRef, parent, cha);
   }
+
   /* END Custom change: Common superclass is optional */
   public IClassHierarchy getClassHierarchy() {
     return cha;
@@ -600,8 +602,10 @@ protected void loadAllSources(Set<ModuleEntry> modules) {
   }
 
   protected abstract SourceModuleTranslator getTranslator();
+
   /* BEGIN Custom change: Optional deletion of fTypeMap */
   public static volatile boolean deleteTypeMapAfterInit = true;
+
   /* END Custom change: Optional deletion of fTypeMap */
   @Override
   public void init(List<Module> modules) throws IOException {

cast/js/html/nu_validator/src/main/java/com/ibm/wala/cast/js/html/nu_validator/NuValidatorHtmlParser.java

@@ -60,7 +60,8 @@ private int countLines(char[] ch, int start, int length) {
             LineNumberReader r =
                 new LineNumberReader(new StringReader(new String(ch, start, length)));
             try {
-              while (r.read() > -1) ;
+              while (r.read() > -1)
+                ;
             } catch (IOException e) {
               throw new RuntimeException("cannot read from string", e);
             }

cast/js/nodejs/src/main/java/com/ibm/wala/cast/js/nodejs/NodejsCallGraphBuilderUtil.java

@@ -44,7 +44,9 @@
 import java.util.Collection;
 import java.util.Collections;
 
-/** @author Brian Pfretzschner <[email protected]> */
+/**
+ * @author Brian Pfretzschner <[email protected]>
+ */
 public class NodejsCallGraphBuilderUtil extends JSCallGraphUtil {
 
   public static PropagationCallGraphBuilder makeCGBuilder(File mainFile)

cast/js/nodejs/src/main/java/com/ibm/wala/cast/js/nodejs/NodejsRequiredCoreModule.java

@@ -24,7 +24,9 @@
 import java.util.Set;
 import org.apache.commons.io.FilenameUtils;
 
-/** @author Brian Pfretzschner <[email protected]> */
+/**
+ * @author Brian Pfretzschner <[email protected]>
+ */
 public class NodejsRequiredCoreModule extends NodejsRequiredSourceModule {
 
   /**

cast/js/nodejs/src/main/java/com/ibm/wala/cast/js/nodejs/NodejsRequiredSourceModule.java

@@ -44,7 +44,9 @@ public class NodejsRequiredSourceModule extends SourceFileModule {
 
   private final String className;
 
-  /** @param f Must be a file located below folder workingDir. */
+  /**
+   * @param f Must be a file located below folder workingDir.
+   */
   protected NodejsRequiredSourceModule(String className, File f, SourceFileModule clonedFrom)
       throws IOException {
     super(f, clonedFrom);

cast/js/nodejs/src/test/java/com/ibm/wala/cast/js/nodejs/test/NodejsRequireJsonTest.java

@@ -20,7 +20,9 @@
 import java.net.URL;
 import org.junit.jupiter.api.Test;
 
-/** @author Brian Pfretzschner <[email protected]> */
+/**
+ * @author Brian Pfretzschner <[email protected]>
+ */
 public class NodejsRequireJsonTest {
 
   @Test

cast/js/nodejs/src/test/java/com/ibm/wala/cast/js/nodejs/test/NodejsRequireTargetSelectorResolveTest.java

@@ -20,7 +20,9 @@
 import java.net.URL;
 import org.junit.jupiter.api.Test;
 
-/** @author Brian Pfretzschner <[email protected]> */
+/**
+ * @author Brian Pfretzschner <[email protected]>
+ */
 public class NodejsRequireTargetSelectorResolveTest {
 
   @Test

cast/js/rhino/src/main/java/com/ibm/wala/cast/js/translator/RhinoToAstTranslator.java

@@ -320,6 +320,7 @@ private static boolean isPrologueScript(WalkContext context) {
   private static Node getCallTarget(FunctionCall n) {
     return n.getTarget();
   }
+
   /** is n a call to "primitive" within our synthetic modeling code? */
   private static boolean isPrimitiveCall(WalkContext context, FunctionCall n) {
     return isPrologueScript(context)

cast/js/rhino/src/test/java/com/ibm/wala/cast/js/vis/JsViewerDriver.java

@@ -39,7 +39,11 @@
 
 public class JsViewerDriver extends JSCallGraphBuilderUtil {
   public static void main(String args[])
-      throws ClassHierarchyException, IllegalArgumentException, IOException, CancelException, Error,
+      throws ClassHierarchyException,
+          IllegalArgumentException,
+          IOException,
+          CancelException,
+          Error,
           WalaException {
 
     if (args.length != 1) {

cast/js/src/main/java/com/ibm/wala/cast/js/callgraph/fieldbased/WorklistBasedOptimisticCallgraphBuilder.java

@@ -204,6 +204,7 @@ public void processPendingReflectiveCallWorklist(
       }
     }
   }
+
   // add flow corresponding to a new call edge
   private void addCallEdge(
       FlowGraph flowgraph, CallVertex c, FuncVertex callee, Set<Vertex> worklist) {

cast/js/src/main/java/com/ibm/wala/cast/js/client/JavaScriptAnalysisEngine.java

@@ -120,12 +120,16 @@ public enum BuilderType {
 
     private BuilderType builderType = BuilderType.OPTIMISTIC;
 
-    /** @return the builderType */
+    /**
+     * @return the builderType
+     */
     public BuilderType getBuilderType() {
       return builderType;
     }
 
-    /** @param builderType the builderType to set */
+    /**
+     * @param builderType the builderType to set
+     */
     public void setBuilderType(BuilderType builderType) {
       this.builderType = builderType;
     }

cast/js/src/main/java/com/ibm/wala/cast/js/html/FileMapping.java

@@ -14,6 +14,8 @@
 
 public interface FileMapping {
 
-  /** @return Null if no mapping for the given line. */
+  /**
+   * @return Null if no mapping for the given line.
+   */
   IncludedPosition getIncludedPosition(Position line);
 }

cast/js/src/main/java/com/ibm/wala/cast/js/html/ITag.java

@@ -20,7 +20,9 @@
  */
 public interface ITag {
 
-  /** @return tag's name (e.g., "HEAD" / "HTML" / "FORM") */
+  /**
+   * @return tag's name (e.g., "HEAD" / "HTML" / "FORM")
+   */
   String getName();
 
   /**

cast/js/src/main/java/com/ibm/wala/cast/js/html/jericho/JerichoHtmlParser.java

@@ -26,7 +26,9 @@
 import net.htmlparser.jericho.LoggerProvider;
 import net.htmlparser.jericho.Source;
 
-/** @author danielk Uses the Jericho parser to go over the HTML */
+/**
+ * @author danielk Uses the Jericho parser to go over the HTML
+ */
 public class JerichoHtmlParser implements IHtmlParser {
   static Set<Warning> warnings = HashSetFactory.make();
 
@@ -113,7 +115,10 @@ public void parse(URL url, Reader reader, IHtmlCallback callback, String fileNam
       System.err.println("Error parsing file: " + e.getMessage());
     }
   }
-  /** @author danielk Inner class does the actual traversal of the HTML using recursion */
+
+  /**
+   * @author danielk Inner class does the actual traversal of the HTML using recursion
+   */
   private static class Parser {
     private final IHtmlCallback handler;
     private final String fileName;

cast/js/src/main/java/com/ibm/wala/cast/js/ipa/callgraph/JSCallGraphUtil.java

@@ -179,7 +179,9 @@ public static MethodReference getMethodReference(String funName) {
     return MR;
   }
 
-  /** @return The set of class names that where defined in the CHA as a result loading process. */
+  /**
+   * @return The set of class names that where defined in the CHA as a result loading process.
+   */
   public static Set<String> loadAdditionalFile(IClassHierarchy cha, JavaScriptLoader cl, URL url)
       throws IOException {
     return loadAdditionalFile(cha, cl, new SourceURLModule(url));

cast/js/src/main/java/com/ibm/wala/cast/js/translator/PropertyReadExpander.java

@@ -63,7 +63,9 @@ public ExpanderKey key() {
     /** are we handling a sub-node of an assignment? */
     abstract boolean inAssignment();
 
-    /** @see AssignPreOrPostOpContext */
+    /**
+     * @see AssignPreOrPostOpContext
+     */
     abstract void setAssign(CAstNode receiverTemp, CAstNode elementTemp);
   }
 

cast/js/src/testFixtures/java/com/ibm/wala/cast/js/test/TestArgumentSensitivity.java

@@ -42,7 +42,10 @@ public abstract class TestArgumentSensitivity extends TestJSCallGraphShape {
 
   @Test
   public void testArgs()
-      throws IOException, IllegalArgumentException, CancelException, ClassHierarchyException,
+      throws IOException,
+          IllegalArgumentException,
+          CancelException,
+          ClassHierarchyException,
           WalaException {
     JavaScriptLoaderFactory loaders = JSCallGraphUtil.makeLoaders(null);
     AnalysisScope scope = JSCallGraphBuilderUtil.makeScriptScope("tests", "args.js", loaders);

cast/js/src/testFixtures/java/com/ibm/wala/cast/js/test/TestSimpleCallGraphShape.java

@@ -651,6 +651,7 @@ public void testReturnThis()
         new Object[] {"suffix:test1", new String[] {"suffix:bar1"}},
         new Object[] {"suffix:test2", new String[] {"suffix:bar2"}}
       };
+
   // when using the ObjectSensitivityContextSelector, we additionally know that test1 does not call
   // bar2,
   // and test2 does not call bar1

cast/src/main/java/com/ibm/wala/cast/ipa/callgraph/CAstAnalysisScope.java

@@ -79,7 +79,9 @@ public ClassLoaderReference getApplicationLoader() {
     return null;
   }
 
-  /** @return Returns the arrayClassLoader. */
+  /**
+   * @return Returns the arrayClassLoader.
+   */
   @Override
   public ArrayClassLoader getArrayClassLoader() {
     Assertions.UNREACHABLE();
@@ -102,7 +104,9 @@ public void addClassFileToScope(ClassLoaderReference loader, File file) {
     Assertions.UNREACHABLE();
   }
 
-  /** @return the ClassLoaderReference specified by {@code name}. */
+  /**
+   * @return the ClassLoaderReference specified by {@code name}.
+   */
   @Override
   public ClassLoaderReference getLoader(Atom name) {
     assert name.equals(theLoader.getName());
@@ -115,7 +119,9 @@ public Collection<ClassLoaderReference> getLoaders() {
     return Collections.singleton(theLoader);
   }
 
-  /** @return the number of loaders. */
+  /**
+   * @return the number of loaders.
+   */
   @Override
   public int getNumberOfLoaders() {
     return 1;

cast/src/main/java/com/ibm/wala/cast/ir/ssa/AbstractReflectiveGet.java

@@ -33,7 +33,9 @@ public String toString(SymbolTable symbolTable) {
     return getValueString(symbolTable, result) + " = " + super.toString(symbolTable);
   }
 
-  /** @see com.ibm.wala.ssa.SSAInstruction#getDef() */
+  /**
+   * @see com.ibm.wala.ssa.SSAInstruction#getDef()
+   */
   @Override
   public boolean hasDef() {
     return true;
@@ -49,7 +51,9 @@ public int getDef(int i) {
     return result;
   }
 
-  /** @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses() */
+  /**
+   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
+   */
   @Override
   public int getNumberOfUses() {
     return 2;

cast/src/main/java/com/ibm/wala/cast/ir/ssa/AbstractReflectivePut.java

@@ -33,13 +33,17 @@ public String toString(SymbolTable symbolTable) {
     return super.toString(symbolTable) + " = " + getValueString(symbolTable, value);
   }
 
-  /** @see com.ibm.wala.ssa.SSAInstruction#getDef() */
+  /**
+   * @see com.ibm.wala.ssa.SSAInstruction#getDef()
+   */
   @Override
   public int getDef() {
     return -1;
   }
 
-  /** @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses() */
+  /**
+   * @see com.ibm.wala.ssa.SSAInstruction#getNumberOfUses()
+   */
   @Override
   public int getNumberOfUses() {
     return 3;