Integrate new multi source git import into the scan procedure.

Author: JohT

COMMANDS.md

@@ -25,7 +25,7 @@
     - [Setup jQAssistant Java Code Analyzer](#setup-jqassistant-java-code-analyzer)
     - [Download Maven Artifacts to analyze](#download-maven-artifacts-to-analyze)
     - [Reset the database and scan the java artifacts](#reset-the-database-and-scan-the-java-artifacts)
-    - [Import git log](#import-git-log)
+    - [Import git data](#import-git-data)
         - [Import aggregated git log](#import-aggregated-git-log)
         - [Parameter](#parameter)
         - [Environment Variable](#environment-variable)
@@ -228,9 +228,9 @@ enhance the data further with relationships between artifacts and packages.
 
 Be aware that this script deletes all previous relationships and nodes in the local Neo4j Graph database.
 
-### Import git log
+### Import git data
 
-Use [importGitLog.sh](./scripts/importGitLog.sh) to import git log data into the Graph.
+Use [importGit.sh](./scripts/importGit.sh) to import git data into the Graph.
 It uses `git log` to extract commits, their authors and the names of the files changed with them. These are stored in an intermediate CSV file and are then imported into Neo4j with the following schema:
 
 ```Cypher
@@ -256,7 +256,7 @@ Here is the resulting schema:
 
 #### Parameter
 
-The optional parameter `--repository directory-path-to-a-git-repository` can be used to select a different directory for the repository. By default, the `source` directory within the analysis workspace directory is used. This command only needs the git history to be present so a `git clone --bare` is sufficient. If the `source` directory is also used for the analysis then a full git clone is of course needed (like for Typescript).
+The optional parameter `--source directory-path-to-the-source-folder-containing-git-repositories` can be used to select a different directory for the repositories. By default, the `source` directory within the analysis workspace directory is used.  This command only needs the git history to be present. Therefore, `git clone --bare` is sufficient. If the `source` directory is also used for code analysis (like for Typescript) then a full git clone is of course needed.
 
 #### Environment Variable
 

scripts/downloader/downloadAntDesign.sh

@@ -37,16 +37,20 @@ mkdir -p ./runtime/logs
 ################################################################
 # Download ant-design source files to be analyzed
 ################################################################
-if [ ! -d "${SOURCE_DIRECTORY}" ] ; then # only clone if source doesn't exist
-  git clone --branch "${PROJECT_VERSION}" https://github.com/ant-design/ant-design.git "${SOURCE_DIRECTORY}"
+PROJECT_NAME="ant-design"
+FULL_PROJECT_NAME="${PROJECT_NAME}-${PROJECT_VERSION}"
+FULL_SOURCE_DIRECTORY="${SOURCE_DIRECTORY}/${FULL_PROJECT_NAME}"
+
+if [ ! -d "${FULL_SOURCE_DIRECTORY}" ] ; then # only clone if source doesn't exist
+  git clone --branch "${PROJECT_VERSION}" https://github.com/ant-design/ant-design.git "${FULL_SOURCE_DIRECTORY}"
 fi
 (
-  cd "${SOURCE_DIRECTORY}" || exit
+  cd "${FULL_SOURCE_DIRECTORY}" || exit
   echo "download${ANALYSIS_NAME}: Installing dependencies..."
-  npm install || exit
+  npm install --verbose || exit
   echo "download${ANALYSIS_NAME}: Analyzing source..."
-  npx --yes @jqassistant/ts-lce >./../runtime/logs/jqassistant-typescript-scan.log 2>&1 || exit
+  npx --yes @jqassistant/ts-lce >"./../../runtime/logs/jqassistant-typescript-scan-${PROJECT_NAME}.log" 2>&1 || exit
 )
 mkdir -p artifacts/typescript
-mv -nv "${SOURCE_DIRECTORY}/.reports/jqa/ts-output.json" "artifacts/typescript/ant-design-${PROJECT_VERSION}.json"
+mv -nv "${FULL_SOURCE_DIRECTORY}/.reports/jqa/ts-output.json" "artifacts/typescript/${FULL_PROJECT_NAME}.json"
 ################################################################

scripts/downloader/downloadAxonFramework.sh

@@ -43,14 +43,14 @@ echo "download${ANALYSIS_NAME}: SCRIPTS_DIR=${SCRIPTS_DIR}"
 ################################################################
 # Download Artifacts that will be analyzed
 ARTIFACTS_GROUP="org.axonframework"
-source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g ${ARTIFACTS_GROUP} -a axon-configuration -v ${ARTIFACTS_VERSION} || exit 2
-source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g ${ARTIFACTS_GROUP} -a axon-disruptor -v ${ARTIFACTS_VERSION} || exit 2
-source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g ${ARTIFACTS_GROUP} -a axon-eventsourcing -v ${ARTIFACTS_VERSION} || exit 2
-source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g ${ARTIFACTS_GROUP} -a axon-messaging -v ${ARTIFACTS_VERSION} || exit 2
-source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g ${ARTIFACTS_GROUP} -a axon-modelling -v ${ARTIFACTS_VERSION} || exit 2
-source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g ${ARTIFACTS_GROUP} -a axon-test -v ${ARTIFACTS_VERSION} || exit 2
+source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g "${ARTIFACTS_GROUP}" -a "axon-configuration" -v"${ARTIFACTS_VERSION}" || exit 2
+source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g "${ARTIFACTS_GROUP}" -a "axon-disruptor" -v "${ARTIFACTS_VERSION}" || exit 2
+source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g "${ARTIFACTS_GROUP}" -a "axon-eventsourcing" -v "${ARTIFACTS_VERSION}" || exit 2
+source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g "${ARTIFACTS_GROUP}" -a "axon-messaging" -v "${ARTIFACTS_VERSION}" || exit 2
+source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g "${ARTIFACTS_GROUP}" -a "axon-modelling" -v "${ARTIFACTS_VERSION}" || exit 2
+source "${SCRIPTS_DIR}/downloadMavenArtifact.sh" -g "${ARTIFACTS_GROUP}" -a "axon-test" -v "${ARTIFACTS_VERSION}" || exit 2
 
 # Download the git history (bare clone without working tree) into the "source" folder.
 # This makes it possible to additionally import the git log into the graph 
-git clone --bare https://github.com/AxonFramework/AxonFramework.git --branch "axon-${ARTIFACTS_VERSION}" "${SOURCE_DIRECTORY}/.git"
+git clone --bare https://github.com/AxonFramework/AxonFramework.git --branch "axon-${ARTIFACTS_VERSION}" "${SOURCE_DIRECTORY}/AxonFramework-${ARTIFACTS_VERSION}/.git"
 ################################################################

scripts/downloader/downloadReactRouter.sh

@@ -39,16 +39,20 @@ mkdir -p ./runtime/logs
 ################################################################
 # Download react-router source files to be analyzed
 ################################################################
-if [ ! -d "${SOURCE_DIRECTORY}" ] ; then # only clone if source doesn't exist
-git clone --branch "react-router@${PROJECT_VERSION}" https://github.com/remix-run/react-router.git "${SOURCE_DIRECTORY}"
+PROJECT_NAME="react-router"
+FULL_PROJECT_NAME="${PROJECT_NAME}-${PROJECT_VERSION}"
+FULL_SOURCE_DIRECTORY="${SOURCE_DIRECTORY}/${FULL_PROJECT_NAME}"
+
+if [ ! -d "${FULL_SOURCE_DIRECTORY}" ] ; then # only clone if source doesn't exist
+git clone --branch "react-router@${PROJECT_VERSION}" https://github.com/remix-run/react-router.git "${FULL_SOURCE_DIRECTORY}"
 fi
 (
-  cd "${SOURCE_DIRECTORY}" || exit
+  cd "${FULL_SOURCE_DIRECTORY}" || exit
   echo "download${ANALYSIS_NAME}: Installing dependencies..."
   pnpm install --frozen-lockfile || exit
   echo "download${ANALYSIS_NAME}: Analyzing source..."
-  npx --yes @jqassistant/ts-lce >./../runtime/logs/jqassistant-typescript-scan.log 2>&1 || exit
+  npx --yes @jqassistant/ts-lce >"./../../runtime/logs/jqassistant-typescript-scan-${FULL_PROJECT_NAME}.log" 2>&1 || exit
 )
 mkdir -p artifacts/typescript
-mv -nv "${SOURCE_DIRECTORY}/.reports/jqa/ts-output.json" "artifacts/typescript/react-router-${PROJECT_VERSION}.json"
+mv -nv "${FULL_SOURCE_DIRECTORY}/.reports/jqa/ts-output.json" "artifacts/typescript/${FULL_PROJECT_NAME}.json"
 ################################################################