diff options
| author | Jenkins CI <ci@sonarsource.com> | 2015-10-14 08:01:18 +0200 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2015-10-14 08:01:18 +0200 |
| commit | e51e9c9eb0145ea5e9d40453554c456585b79936 (patch) | |
| tree | 8b1adf27c56a12e762cdd304f09311cc7fff77bb /pom.xml | |
| parent | 8350b39ed0563e9beb354fe27524c95ea4692b67 (diff) | |
| parent | 3afe7a9001453a7106c488a1429e3bff91c8545f (diff) | |
| download | sonarqube-e51e9c9eb0145ea5e9d40453554c456585b79936.tar.gz sonarqube-e51e9c9eb0145ea5e9d40453554c456585b79936.zip | |
Automatic merge from branch-5.1
* origin/branch-5.2:
Improve message when trying to install a non-plugin JAR
Fix enforcer rule about size of zip
Fix reliability of NetworkUtils#freePort()
Fix Maven warnings
SONAR-6219 Fix ruby warning "don't put space before argument parentheses"
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -418,7 +418,7 @@ <configuration> <archive> <manifestEntries> - <Version>${pom.version}</Version> + <Version>${project.version}</Version> <!-- ${buildNumber} is the Git revision. It's generated by the buildnumber-maven-plugin --> <Implementation-Build>${buildNumber}</Implementation-Build> <Build-Time>${timestamp}</Build-Time> @@ -586,47 +586,47 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-markdown</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-check-api</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-colorizer</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-core</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-db</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-batch-protocol</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-ws</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-duplications</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-home</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -651,7 +651,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-plugin-api</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -661,7 +661,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>sonar-server</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.codehaus.sonar</groupId> @@ -681,7 +681,7 @@ <dependency> <groupId>org.sonarsource.sonarqube</groupId> <artifactId>sonar-xoo-plugin</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> @@ -699,7 +699,7 @@ <dependency> <groupId>org.sonarsource.sonarqube</groupId> <artifactId>sonar-testing-harness</artifactId> - <version>${pom.version}</version> + <version>${project.version}</version> </dependency> <dependency> <groupId>org.sonarsource.sonarqube</groupId> |