chore: remove output/.gradle and output/.m2 refs

Signed-off-by: behnazh-w <[email protected]>

Author: behnazh-w

docker/user.sh

@@ -52,7 +52,6 @@ fi
 # The directory that could be mounted to the host machine file systems should
 # have the owner as the current user in the host machine.
 chown --recursive macaron:macaron "$HOME"/.m2
-chown --recursive macaron:macaron "$HOME"/.gradle
 chown --recursive macaron:macaron "$HOME"/output
 
 # Run the provided Macaron command with the user macaron.

docs/source/pages/output_files.rst

@@ -20,8 +20,6 @@ Top level structure
 .. code-block::
 
     output/
-        ├── .gradle/
-        ├── .m2/
         ├── build_log/
         ├── git_repos/
         ├── reports/
@@ -182,18 +180,10 @@ This file stores the log messages from the latest run of Macaron.
 build_log
 ^^^^^^^^^
 
-This is the directory for storing the log from running external components such as `CycloneDx SBOM Maven plugin <https://github.com/CycloneDX/cyclonedx-maven-plugin>`_, `CycloneDx SBOM Gradle plugin <https://github.com/CycloneDX/cyclonedx-gradle-plugin>`_ or the `slsa-verifier <https://github.com/slsa-framework/slsa-verifier>`_.
+This is the directory for storing the log from running external components, such as `slsa-verifier <https://github.com/slsa-framework/slsa-verifier>`_.
 
 ^^^^^^^^^^^^^^^
 sbom_debug.json
 ^^^^^^^^^^^^^^^
 
 This file contain the debug information for running the SBOM generator to obtain dependencies of a repository.
-
-^^^^^^^^^^^^^^^
-.m2 and .gradle
-^^^^^^^^^^^^^^^
-
-These two directories cache the content of ``~/.m2`` and ``~/.gradle`` in the Docker container between different runs (which are
-mainly updated by the CycloneDX SBOM plugins).
-This will helps subsequent runs on the same target repository faster.

scripts/release_scripts/run_macaron.sh

@@ -380,13 +380,8 @@ else
     echo "Setting default output directory to ${output}."
 fi
 
-# Mount the necessary .m2 and .gradle directories.
-m2_dir="${output}/.m2"
-gradle_dir="${output}/.gradle"
-
+# Mount the output directory.
 mount_dir_rw_allow_create "" "$output" "${MACARON_WORKSPACE}/output"
-mount_dir_rw_allow_create "" "$m2_dir" "${MACARON_WORKSPACE}/.m2"
-mount_dir_rw_allow_create "" "$gradle_dir" "${MACARON_WORKSPACE}/.gradle"
 
 # Determine the local repos path to be mounted into ${MACARON_WORKSPACE}/output/git_repos/local_repos/
 if [[ -n "${arg_local_repos_path:-}" ]]; then
@@ -498,10 +493,6 @@ else
         # This is because:
         #   - By default if --local-maven-repo is not used, Macaron uses $HOME/.m2 of the current
         #     environment as the local maven repo.
-        #   - If --local-maven-repo is not set when Macaron is running in the Docker container, it will try to
-        #     use $HOME/.m2 WITHIN the container. This is not desirable as this $HOME/.m2 is being used
-        #     by the cyclonedx plugins for dependency resolution, which requires read write. We treat the local
-        #     maven repo as a read only directory, hence they cannot share.
         else
             local_maven_repo_in_container="${MACARON_WORKSPACE}/analyze_local_maven_repo_readonly"
             output_local_maven_repo="${output}/analyze_local_maven_repo_readonly"
@@ -535,21 +526,8 @@ if [[ -n "${arg_datalog_policy_file:-}" ]]; then
     mount_file "-f/--file" "$datalog_policy_file" "$datalog_policy_file_in_container" "ro,Z"
 fi
 
-# Determine that ~/.gradle/gradle.properties exists to be mounted into ${MACARON_WORKSPACE}/gradle.properties
-if [[ -f "$HOME/.gradle/gradle.properties" ]]; then
-    mounts+=("-v" "$HOME/.gradle/gradle.properties":"${MACARON_WORKSPACE}/gradle.properties:ro,Z")
-fi
-
-# Determine that ~/.m2/settings.xml exists to be mounted into ${MACARON_WORKSPACE}/settings.xml
-if [[ -f "$HOME/.m2/settings.xml" ]]; then
-    mounts+=("-v" "$HOME/.m2/settings.xml":"${MACARON_WORKSPACE}/settings.xml:ro,Z")
-fi
-
 # Set up proxy.
 # We respect the host machine's proxy environment variables.
-# For Maven and Gradle projects that Macaron needs to analyzes, the proxy configuration
-# for Maven wrapper `mvnw` and Gradle wrapper `gradlew` are set using `MAVEN_OPTS` and
-# `GRADLE_OPTS` environment variables.
 proxy_var_names=(
     "http_proxy"
     "https_proxy"
@@ -559,8 +537,6 @@ proxy_var_names=(
     "HTTPS_PROXY"
     "FTP_PROXY"
     "NO_PROXY"
-    "MAVEN_OPTS"
-    "GRADLE_OPTS"
 )
 
 for v in "${proxy_var_names[@]}"; do

tests/integration/cases/apache_maven_local_path_with_branch_name_digest_deps_cyclonedx_maven/maven.dl renamed to tests/integration/cases/apache_maven_local_path_with_branch_name_digest/maven.dl

@@ -15,7 +15,6 @@ steps:
 - name: Run macaron analyze
   kind: analyze
   options:
-    ini: config.ini
     main_args:
     - -lr
     - ./output/git_repos/local_repos