Skip to content

Commit

Permalink
params.maven_settings_file should be honored.
Browse files Browse the repository at this point in the history
Closes #36.
  • Loading branch information
headcr4sh committed Jan 29, 2019
1 parent b676b9c commit 794e95e
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [0.8.0] - 2018-01-25
## [0.8.1] - 2019-01-29

### Fixed

- `params.maven_settings_file` should no longer be ignored.
([#36](https://github.com/cathive/concourse-sonarqube-resource/issues/36))

## [0.8.0] - 2019-01-25

### Added

Expand Down Expand Up @@ -42,7 +49,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- scanner-report.txt could not be found if `scanner_type` was set to `maven` ([#24](https://github.com/cathive/concourse-sonarqube-resource/issues/24))
- Version 0.7.0 contained a bug where the bundled sonar-maven-plugin was *not* updated
to version v3.5.0.1254 as originally announced. This version fixes this issue and
makes sure that the desired version of he soncar-maven-plugin is being used.
makes sure that the desired version of he sonar-maven-plugin is being used.

## [0.7.0] - 2018-12-07

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ RUN mvn -q org.apache.maven.plugins:maven-dependency-plugin:3.1.1:get \
ENV PATH="/usr/local/bin:/usr/bin:/bin"

LABEL maintainer="Benjamin P. Jung <[email protected]>" \
version="0.8.0" \
version="0.8.1" \
maven.version="{MAVEN_VERSION}" \
sonar-scanner.cli.version="${SONAR_SCANNER_CLI_VERSION}" \
sonar-scanner.maven-plugin.version="${SONAR_SCANNER_MAVEN_PLUGIN_VERSION}" \
Expand Down
2 changes: 1 addition & 1 deletion assets/out
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ if [[ ! -z "${maven_settings}" ]]; then
maven_settings_file=$(mktemp "${TMPDIR}/sonarqube-resource-maven-settings.xml.XXXXXX")
echo "${maven_settings}" > "${maven_settings_file}"
unset maven_settings
elif [[ ! -z "${maven_settings_file}" ]]; then
else
maven_settings_file=$(jq -r '.params.maven_settings_file // ""' < "${payload}")
fi
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ sonar.organization = cathive
sonar.projectKey = concourse-sonarqube-resource
sonar.projectName = Concourse CI SonarQube Resource
sonar.projectDescription = A resource for Concourse CI that performs SonarQube analyses and reports the state of a project`s quality goals.
sonar.projectVersion = 0.8.0
sonar.projectVersion = 0.8.1
sonar.links.homepage = https://github.com/cathive/concourse-sonarqube-resource
sonar.links.issue = https://github.com/cathive/concourse-sonarqube-resource/issues
sonar.links.ci = https://ci.cathive.com/
Expand Down

0 comments on commit 794e95e

Please sign in to comment.