diff options
| author | Eric Hartmann <hartmann.eric@gmail.com> | 2013-12-12 09:35:22 +0100 |
|---|---|---|
| committer | Eric Hartmann <hartmann.eric@gmail.com> | 2013-12-12 09:35:22 +0100 |
| commit | ff9e1230c8ccd278077612ceae7d14d42531962e (patch) | |
| tree | 5413336091c9b95a692511e7bf9cf7a9a44a27d5 | |
| parent | 2fe211c408a399b5b3980ec6cdfea974f73aff4e (diff) | |
| download | sonarqube-ff9e1230c8ccd278077612ceae7d14d42531962e.tar.gz sonarqube-ff9e1230c8ccd278077612ceae7d14d42531962e.zip | |
Workaround for [PARENT-34]
| -rw-r--r-- | pom.xml | 33 | ||||
| -rw-r--r-- | sonar-application/pom.xml | 7 |
2 files changed, 23 insertions, 17 deletions
@@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.codehaus.sonar</groupId> @@ -97,7 +96,7 @@ <skipSanityChecks>false</skipSanityChecks> <!-- default GWT configuration. It's overridden by the profile 'dev' to speed up compilation in dev environments--> - <gwt.permutationSuffix/> + <gwt.permutationSuffix /> <gwt.extraJvmArgs>-Xmx512m -Xss1024k</gwt.extraJvmArgs> <sonar.snapshotRepository.url>dav:https://dav.codehaus.org/snapshots.repository/sonar</sonar.snapshotRepository.url> </properties> @@ -230,11 +229,19 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> - <!-- - Do not upgrade to 2.4 because of http://jira.codehaus.org/browse/MRELEASE-818. - Fixed in 2.4.1. - --> - <version>2.3.2</version> + <version>2.4.2</version> + <dependencies> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-api</artifactId> + <version>1.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.maven.scm</groupId> + <artifactId>maven-scm-provider-gitexe</artifactId> + <version>1.8.1</version> + </dependency> + </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -1281,7 +1288,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore/> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1294,7 +1301,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore/> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1307,7 +1314,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore/> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1321,7 +1328,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore/> + <ignore /> </action> </pluginExecution> <pluginExecution> @@ -1334,7 +1341,7 @@ </goals> </pluginExecutionFilter> <action> - <ignore/> + <ignore /> </action> </pluginExecution> </pluginExecutions> diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index 27799dba52c..f7020edca3b 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -258,8 +257,8 @@ <phase>package</phase> <configuration> <target> - <checksum file="${project.build.directory}/sonarqube-${project.version}.zip" algorithm="md5"/> - <checksum file="${project.build.directory}/sonarqube-${project.version}.zip" algorithm="sha"/> + <checksum file="${project.build.directory}/sonarqube-${project.version}.zip" algorithm="md5" /> + <checksum file="${project.build.directory}/sonarqube-${project.version}.zip" algorithm="sha" /> </target> </configuration> <goals> |