diff options
| author | ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com> | 2017-02-21 10:06:30 +0100 |
|---|---|---|
| committer | ssjenka <ssjenka@ops-slave-fedora25-1.internal.sonarsource.com> | 2017-02-21 10:06:30 +0100 |
| commit | 75395f9702fb4c311cfee6613b964a826f46f173 (patch) | |
| tree | 1dd75aea06eca262d484aed5cef944d6b54cb643 /sonar-plugin-api/pom.xml | |
| parent | 7ce73daef17c282256aebc4513bbf5718e0b351d (diff) | |
| parent | 3fce43c5b883c551447cd81bb93be0ef0472b3cd (diff) | |
| download | sonarqube-75395f9702fb4c311cfee6613b964a826f46f173.tar.gz sonarqube-75395f9702fb4c311cfee6613b964a826f46f173.zip | |
Automatic merge from branch-6.3
* origin/branch-6.3:
Add logs when Travis downloads phantomjs and JDK8
Ability to release versions without build number in artifact filenames
Diffstat (limited to 'sonar-plugin-api/pom.xml')
| -rw-r--r-- | sonar-plugin-api/pom.xml | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/sonar-plugin-api/pom.xml b/sonar-plugin-api/pom.xml index 0698b2fb985..ed5ab293ba8 100644 --- a/sonar-plugin-api/pom.xml +++ b/sonar-plugin-api/pom.xml @@ -14,7 +14,18 @@ <name>SonarQube :: Plugin API</name> <properties> - <project.version.3digits>${project.version}</project.version.3digits> + <!-- + version as stored in JAR and displayed in webapp. It is + overridden on Travis when replacing SNAPSHOT version by + build unique version, for instance "6.3.0.12345". + --> + <buildVersion>${project.version}</buildVersion> + + <!-- + a truncated version on three fields is kept for backward-compatibility + with scanners + --> + <buildVersionOnThreeFields>${buildVersion}</buildVersionOnThreeFields> </properties> <dependencies> @@ -217,23 +228,22 @@ <artifactId>groovy-maven-plugin</artifactId> <executions> <execution> - <id>compute-3digits-version</id> + <id>compute-version-on-three-fields</id> <phase>generate-resources</phase> <goals> <goal>execute</goal> </goals> <configuration> <source><![CDATA[ - if (! "${project.version}".endsWith("-SNAPSHOT")) { + if (! "${buildVersion}".endsWith("-SNAPSHOT")) { String apiVersion - // example: "6.3.0.1234". To be backward-compatible with scanners, only "6.3.0" must be kept - String[] fields = "${project.version}".tokenize('.') + String[] fields = "${buildVersion}".tokenize('.') if (fields.length > 3) { apiVersion = fields[0..2].join('.') } else { apiVersion = fields.join('.') } - project.properties['project.version.3digits'] = apiVersion + project.properties['buildVersionOnThreeFields'] = apiVersion } ]]> </source> |