diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2015-06-26 09:09:05 +0200 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2015-06-26 09:09:05 +0200 |
| commit | 404e53a9a72a4dedb9d328f4a3bbebd69759511a (patch) | |
| tree | 116ff1782c469fa973aced211ed665eaf1e32ea2 /sonar-runner-cli | |
| parent | d4feed19cf6c8c8adf7fcdb037436871c962175a (diff) | |
| download | sonar-scanner-cli-404e53a9a72a4dedb9d328f4a3bbebd69759511a.tar.gz sonar-scanner-cli-404e53a9a72a4dedb9d328f4a3bbebd69759511a.zip | |
Revert artifactId of sonar-runner-dist to not break ITs and Jenkins
Diffstat (limited to 'sonar-runner-cli')
| -rw-r--r-- | sonar-runner-cli/pom.xml | 2 | ||||
| -rwxr-xr-x | sonar-runner-cli/src/main/assembly/bin/sonar-runner | 4 | ||||
| -rw-r--r-- | sonar-runner-cli/src/main/assembly/bin/sonar-runner.bat | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sonar-runner-cli/pom.xml b/sonar-runner-cli/pom.xml index 54f9eb6..2c3d0c1 100644 --- a/sonar-runner-cli/pom.xml +++ b/sonar-runner-cli/pom.xml @@ -6,7 +6,7 @@ <version>2.5-SNAPSHOT</version> </parent> - <artifactId>sonar-runner-cli</artifactId> + <artifactId>sonar-runner-dist</artifactId> <packaging>jar</packaging> <name>SonarQube Runner - CLI - Distribution</name> diff --git a/sonar-runner-cli/src/main/assembly/bin/sonar-runner b/sonar-runner-cli/src/main/assembly/bin/sonar-runner index 6ebfa40..b0506e5 100755 --- a/sonar-runner-cli/src/main/assembly/bin/sonar-runner +++ b/sonar-runner-cli/src/main/assembly/bin/sonar-runner @@ -80,13 +80,13 @@ if [ -z "$SONAR_RUNNER_HOME" ] ; then fi # check that the SONAR_RUNNER_HOME has been correctly set -if [ ! -f "$SONAR_RUNNER_HOME/lib/sonar-runner-cli-${project.version}.jar" ] ; then +if [ ! -f "$SONAR_RUNNER_HOME/lib/sonar-runner-dist-${project.version}.jar" ] ; then echo '$SONAR_RUNNER_HOME' does not point to a valid installation directory: $SONAR_RUNNER_HOME exit 1 fi JAVA_CMD="`which java`" -JAR_FILE="${SONAR_RUNNER_HOME}"/lib/sonar-runner-cli-${project.version}.jar +JAR_FILE="${SONAR_RUNNER_HOME}"/lib/sonar-runner-dist-${project.version}.jar PROJECT_HOME=`pwd` #echo "Info: Using sonar-runner at $SONAR_RUNNER_HOME" diff --git a/sonar-runner-cli/src/main/assembly/bin/sonar-runner.bat b/sonar-runner-cli/src/main/assembly/bin/sonar-runner.bat index bf5eb80..2b2253e 100644 --- a/sonar-runner-cli/src/main/assembly/bin/sonar-runner.bat +++ b/sonar-runner-cli/src/main/assembly/bin/sonar-runner.bat @@ -58,7 +58,7 @@ goto run if "%SONAR_RUNNER_HOME:~-1%"=="\" set SONAR_RUNNER_HOME=%SONAR_RUNNER_HOME:~0,-1% @REM Check if the provided SONAR_RUNNER_HOME is a valid install dir -IF EXIST "%SONAR_RUNNER_HOME%\lib\sonar-runner-cli-${project.version}.jar" goto run +IF EXIST "%SONAR_RUNNER_HOME%\lib\sonar-runner-dist-${project.version}.jar" goto run echo. echo ERROR: SONAR_RUNNER_HOME exists but does not point to a valid install @@ -74,7 +74,7 @@ echo %SONAR_RUNNER_HOME% set PROJECT_HOME=%CD% -%JAVA_EXEC% %SONAR_RUNNER_OPTS% -cp "%SONAR_RUNNER_HOME%\lib\sonar-runner-cli-${project.version}.jar" "-Drunner.home=%SONAR_RUNNER_HOME%" "-Dproject.home=%PROJECT_HOME%" org.sonar.runner.cli.Main %* +%JAVA_EXEC% %SONAR_RUNNER_OPTS% -cp "%SONAR_RUNNER_HOME%\lib\sonar-runner-dist-${project.version}.jar" "-Drunner.home=%SONAR_RUNNER_HOME%" "-Dproject.home=%PROJECT_HOME%" org.sonar.runner.cli.Main %* if ERRORLEVEL 1 goto error goto end |