diff options
| author | Simon Brandhof <simon.brandhof@gmail.com> | 2012-09-06 09:33:36 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@gmail.com> | 2012-09-06 09:34:30 +0200 |
| commit | 1bae22140048e9d48f686ff3a0bd8388b3d016a8 (patch) | |
| tree | 42dc1ae2dfb845cbfb205fcc837a932488cd69e7 /pom.xml | |
| parent | 6fa3003cc351eef3c7a9f525f2a323f8730b8048 (diff) | |
| download | sonarqube-1bae22140048e9d48f686ff3a0bd8388b3d016a8.tar.gz sonarqube-1bae22140048e9d48f686ff3a0bd8388b3d016a8.zip | |
Upgrade JRuby on Rails stack
* SONAR-3780 drop support of servlet 2.4 servers
* SONAR-3435 upgrade jruby from 1.6.1 to 1.6.7.2
* SONAR-3737 upgrade rails from 2.3.5 to 2.3.14
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 19 |
1 files changed, 7 insertions, 12 deletions
@@ -782,18 +782,9 @@ <version>${h2.version}</version> </dependency> <dependency> - <!-- - IMPORTANT: DO NOT UPGRADE THIS LIB. Indeed v.1.0.0.1 is a dedicated branch to support Servlet 2.4. Versions 1.0.5 and greater - support Servlet 2.5+. - Note that Servlet 2.4 will be supported until the end of life of Tomcat 5.5, in 2012 Q4. - See : - - http://www.tomcatexpert.com/blog/2011/08/10/end-life-announced-apache-tomcat-55 - - http://jira.codehaus.org/browse/SONAR-2212 - - http://kenai.com/jira/browse/JRUBY_RACK-31 - --> <groupId>org.jruby.rack</groupId> <artifactId>jruby-rack</artifactId> - <version>1.0.0.1</version> + <version>1.1.10</version> </dependency> <dependency> <groupId>mysql</groupId> @@ -915,10 +906,9 @@ <version>1.2</version> </dependency> <dependency> - <!-- do not upgrade to 1.6.4 due to Solaris incompatibility. See https://jira.codehaus.org/browse/SONAR-2915 --> <groupId>org.jruby</groupId> <artifactId>jruby-complete</artifactId> - <version>1.6.1</version> + <version>1.6.7.2</version> </dependency> <dependency> <groupId>geronimo-spec</groupId> @@ -931,6 +921,11 @@ <version>3.0.1</version> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + </dependency> + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-plus</artifactId> <version>${jetty.version}</version> |