diff options
| author | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-08-01 08:18:53 +0200 |
|---|---|---|
| committer | Julien Lancelot <julien.lancelot@sonarsource.com> | 2017-08-01 08:18:53 +0200 |
| commit | 0ad8ad2414a4c6ada37141b13e4f3ec6c32dbc05 (patch) | |
| tree | 3750ce87ab8e96329b5d28c685237201375114ba | |
| parent | d49a9606747b7ad4d65e7d20bc41492d427d9b84 (diff) | |
| parent | db8cd4e8c5afc1778bc88fc2dccdcd59206720aa (diff) | |
| download | sonarqube-0ad8ad2414a4c6ada37141b13e4f3ec6c32dbc05.tar.gz sonarqube-0ad8ad2414a4c6ada37141b13e4f3ec6c32dbc05.zip | |
Merge remote-tracking branch 'origin/branch-6.5'
| -rw-r--r-- | pom.xml | 21 | ||||
| -rw-r--r-- | sonar-application/pom.xml | 4 | ||||
| -rw-r--r-- | tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java | 2 |
3 files changed, 19 insertions, 8 deletions
@@ -47,19 +47,26 @@ <properties> <!-- see http://repo1.maven.org/maven2/org/sonarsource/dotnet/sonar-csharp-plugin/ --> + <!-- Do not forget to exclude any new transitive dependencies --> <sonarCSharp.version>5.10.1.1411</sonarCSharp.version> <!-- see http://repo1.maven.org/maven2/org/sonarsource/java/sonar-java-plugin/ --> - <sonarJava.version>4.9.0.9858</sonarJava.version> + <!-- Do not forget to exclude any new transitive dependencies --> + <sonarJava.version>4.12.0.11033</sonarJava.version> <!-- see http://repo1.maven.org/maven2/org/sonarsource/javascript/sonar-javascript-plugin/ --> - <sonarJavaScript.version>3.0.0.4962</sonarJavaScript.version> + <!-- Do not forget to exclude any new transitive dependencies --> + <sonarJavaScript.version>3.1.1.5128</sonarJavaScript.version> <!-- see http://repo1.maven.org/maven2/org/sonarsource/php/sonar-php-plugin/ --> + <!-- Do not forget to exclude any new transitive dependencies --> <sonarPhp.version>2.10.0.2087</sonarPhp.version> <!-- see http://repo1.maven.org/maven2/org/sonarsource/python/sonar-python-plugin/ --> - <sonarPython.version>1.7.0.1195</sonarPython.version> + <!-- Do not forget to exclude any new transitive dependencies --> + <sonarPython.version>1.8.0.1496</sonarPython.version> <!-- see http://repo1.maven.org/maven2/org/sonarsource/flex/sonar-flex-plugin/ --> + <!-- Do not forget to exclude any new transitive dependencies --> <sonarFlex.version>2.3</sonarFlex.version> - <!-- see http://http://repo1.maven.org/maven2/org/sonarsource/xml/sonar-xml-plugin/ --> - <sonarXml.version>1.4.2.885</sonarXml.version> + <!-- see http://repo1.maven.org/maven2/org/sonarsource/xml/sonar-xml-plugin/ --> + <!-- Do not forget to exclude any new transitive dependencies --> + <sonarXml.version>1.4.3.1027</sonarXml.version> <sonarGit.version>1.2</sonarGit.version> <sonarSvn.version>1.4.0.522</sonarSvn.version> <sonarUpdateCenter.version>1.18.0.487</sonarUpdateCenter.version> @@ -639,6 +646,10 @@ <groupId>org.codehaus.woodstox</groupId> <artifactId>woodstox-core-lgpl</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.staxmate</groupId> + <artifactId>staxmate</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml index ce9521106d9..3eb3ee72e35 100644 --- a/sonar-application/pom.xml +++ b/sonar-application/pom.xml @@ -242,8 +242,8 @@ <configuration> <rules> <requireFilesSize> - <minsize>138000000</minsize> - <maxsize>146000000</maxsize> + <minsize>136000000</minsize> + <maxsize>144000000</maxsize> <files> <file>${project.build.directory}/sonarqube-${project.version}.zip</file> </files> diff --git a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java index 4c452173371..d79f57b0ac8 100644 --- a/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java +++ b/tests/src/test/java/org/sonarqube/tests/upgrade/UpgradeTest.java @@ -205,7 +205,7 @@ public class UpgradeTest { private void scanProject() { MavenBuild build = MavenBuild.create(new File("projects/struts-1.3.9-diet/pom.xml")) - .setCleanSonarGoals() + .setCleanPackageSonarGoals() // exclude pom.xml, otherwise it will be published in SQ 6.3+ and not in previous versions, resulting in a different number of // components .setProperty("sonar.exclusions", "**/pom.xml") |