diff options
author | Jenkins CI <ci@sonarsource.com> | 2016-05-24 15:49:44 +0200 |
---|---|---|
committer | Jenkins CI <ci@sonarsource.com> | 2016-05-24 15:49:44 +0200 |
commit | dd67aa0a7459397e50a45712667687453f61750e (patch) | |
tree | 40636039de20ad6a2f0c49e43ea1a1d09445243f /pom.xml | |
parent | 0b19ba736ef4e9132729c3043e7a783c2b0f22e8 (diff) | |
parent | 2a29274195e513d4e8de50159cfd7e579d1e98d1 (diff) | |
download | sonarqube-dd67aa0a7459397e50a45712667687453f61750e.tar.gz sonarqube-dd67aa0a7459397e50a45712667687453f61750e.zip |
Automatic merge from branch-5.6
* origin/branch-5.6:
Fix version of Oracle driver for QA
Fix timeout of server startup perf test
Diffstat (limited to 'pom.xml')
-rw-r--r-- | pom.xml | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -729,7 +729,9 @@ <dependency> <groupId>com.oracle</groupId> <artifactId>ojdbc6</artifactId> - <version>11.2.0.4.0</version> + <!-- SonarSource internal tests: --> + <!-- This version should be the same as at http://infra.internal.sonarsource.com/jenkins/orch-oracle*.properties --> + <version>11.2.0.3.0</version> </dependency> <dependency> <groupId>org.postgresql</groupId> |