Support jQAssistant v2

Author: JohT

scripts/resetAndScan.sh

@@ -6,6 +6,7 @@
 # Note: The environment variable NEO4J_INITIAL_PASSWORD is required to login to Neo4j.
 
 JQASSISTANT_CLI_VERSION=${JQASSISTANT_CLI_VERSION:-"1.12.2"} # Version 1.12.2 is the current version (april 2023)
+JQASSISTANT_CLI_ARTIFACT=${JQASSISTANT_CLI_ARTIFACT:-"jqassistant-commandline-neo4jv3"} #  Neo4j v5: "jqassistant-commandline-distribution", Neo4j v4: "jqassistant-commandline-neo4jv3"
 
 NEO4J_EDITION=${NEO4J_EDITION:-"community"} # Choose "community" or "enterprise"
 NEO4J_VERSION=${NEO4J_VERSION:-"4.4.20"} # Version 4.4.x is the current long term support (LTS) version (april 2023)
@@ -16,7 +17,7 @@ ARTIFACTS_DIRECTORY=${ARTIFACTS_DIRECTORY:-"artifacts"} # Directory with the Jav
 TOOLS_DIRECTORY=${TOOLS_DIRECTORY:-"tools"} # Get the tools directory (defaults to "tools")
 
 # Internal constants
-JQASSISTANT_BIN="${TOOLS_DIRECTORY}/jqassistant-commandline-neo4jv3-${JQASSISTANT_CLI_VERSION}/bin"
+JQASSISTANT_BIN="${TOOLS_DIRECTORY}/${JQASSISTANT_CLI_ARTIFACT}-${JQASSISTANT_CLI_VERSION}/bin"
 JQASSISTANT_NEO4J_OPTIONS="-storeUri ${NEO4J_BOLT_URI} -storeUsername ${NEO4J_USER} -storePassword ${NEO4J_INITIAL_PASSWORD}"
 
 # Check if environment variable is set

scripts/setupJQAssistant.sh

@@ -33,7 +33,7 @@ else
 fi
 
 # Internal constants
-JQASSISTANT_INSTALLATION_NAME="jqassistant-commandline-neo4jv3-${JQASSISTANT_CLI_VERSION}"
+JQASSISTANT_INSTALLATION_NAME="${JQASSISTANT_CLI_ARTIFACT}-${JQASSISTANT_CLI_VERSION}"
 JQASSISTANT_INSTALLATION_DIRECTORY="${TOOLS_DIRECTORY}/${JQASSISTANT_INSTALLATION_NAME}"
 
 # Download and unpack jQAssistant
@@ -46,8 +46,6 @@ if [ ! -d "${JQASSISTANT_INSTALLATION_DIRECTORY}" ] ; then
 
         # Download jQAssistant
         # With the option "-L" a redirection will be followed automatically
-        # old: https://repo1.maven.org/maven2/com/buschmais/jqassistant/cli/jqassistant-commandline-neo4jv3/1.12.2/jqassistant-commandline-neo4jv3-1.12.2-distribution.zip
-        # new: https://repo1.maven.org/maven2/com/buschmais/jqassistant/cli/jqassistant-commandline-distribution/2.0.3/jqassistant-commandline-distribution-2.0.3-bin.zip
         curl -L --fail-with-body -o "${SHARED_DOWNLOADS_DIRECTORY}/${JQASSISTANT_INSTALLATION_NAME}.zip" "${jqassistant_cli_fulldownload_url}"
     else
         echo "setupJQAssistant: ${JQASSISTANT_INSTALLATION_NAME} already downloaded"
@@ -56,7 +54,7 @@ if [ ! -d "${JQASSISTANT_INSTALLATION_DIRECTORY}" ] ; then
     downloaded_file_size=$(wc -c "${SHARED_DOWNLOADS_DIRECTORY}/${JQASSISTANT_INSTALLATION_NAME}.zip" | awk '{print $1}')
     echo "setupJQAssistant: Downloadsize ${downloaded_file_size}"
     if [[ "${downloaded_file_size}" -le 1000 ]]; then
-        echo "setupJQAssistant: Failed to download ${JQASSISTANT_INSTALLATION_NAME}: Invalid Filesize"
+        echo "setupJQAssistant: Error: Failed to download ${JQASSISTANT_INSTALLATION_NAME}. Invalid Filesize"
         rm -f "${SHARED_DOWNLOADS_DIRECTORY}/${JQASSISTANT_INSTALLATION_NAME}.zip"
         exit 1
     fi