From ee8d634e8cc05a52abb3f53ea223ef65baba2746 Mon Sep 17 00:00:00 2001
From: Simon Brandhof <simon.brandhof@gmail.com>
Date: Mon, 25 Mar 2013 23:44:17 +0100
Subject: [PATCH] SONAR-4045 upgrade to jruby 1.7.3 and jruby-rack 1.1.13.1

---
 pom.xml                                                       | 4 ++--
 sonar-application/pom.xml                                     | 4 ++--
 sonar-server/src/main/webapp/META-INF/init.rb                 | 1 +
 .../src/main/webapp/WEB-INF/app/models/sonar/rule_priority.rb | 3 ---
 sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb  | 1 -
 sonar-server/src/main/webapp/WEB-INF/lib/slf4j_logger.rb      | 2 --
 6 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 sonar-server/src/main/webapp/META-INF/init.rb

diff --git a/pom.xml b/pom.xml
index 5fb410737f7..6c78a5d7d35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -827,7 +827,7 @@
       <dependency>
         <groupId>org.jruby.rack</groupId>
         <artifactId>jruby-rack</artifactId>
-        <version>1.1.10</version>
+        <version>1.1.13.1</version>
       </dependency>
       <dependency>
         <groupId>mysql</groupId>
@@ -951,7 +951,7 @@
       <dependency>
         <groupId>org.jruby</groupId>
         <artifactId>jruby-complete</artifactId>
-        <version>1.6.8</version>
+        <version>1.7.3</version>
       </dependency>
       <dependency>
         <groupId>geronimo-spec</groupId>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index e93a9714acd..b825a1fe688 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -210,8 +210,8 @@
             <configuration>
               <rules>
                 <requireFilesSize>
-                  <maxsize>56000000</maxsize>
-                  <minsize>52000000</minsize>
+                  <maxsize>62000000</maxsize>
+                  <minsize>58000000</minsize>
                   <files>
                     <file>${project.build.directory}/sonar-${project.version}.zip</file>
                   </files>
diff --git a/sonar-server/src/main/webapp/META-INF/init.rb b/sonar-server/src/main/webapp/META-INF/init.rb
new file mode 100644
index 00000000000..cc389146b29
--- /dev/null
+++ b/sonar-server/src/main/webapp/META-INF/init.rb
@@ -0,0 +1 @@
+ENV['GEM_HOME'] ||= $servlet_context.getRealPath('/WEB-INF/gems')
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/rule_priority.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/rule_priority.rb
index 116cabcb316..6562c2f6d1c 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/rule_priority.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/models/sonar/rule_priority.rb
@@ -18,9 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
 #
 
-require 'java'
-include_class "org.sonar.api.rules.RulePriority"
-
 class Sonar::RulePriority
 
   INFO = Java::OrgSonarApiRules::RulePriority::INFO
diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb b/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb
index 7ba8d01dcd2..0fa92036fa1 100644
--- a/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/lib/database_version.rb
@@ -17,7 +17,6 @@
 # License along with Sonar; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
 #
-require 'java'
 
 class DatabaseVersion
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/lib/slf4j_logger.rb b/sonar-server/src/main/webapp/WEB-INF/lib/slf4j_logger.rb
index afdb99cebae..43d984136be 100644
--- a/sonar-server/src/main/webapp/WEB-INF/lib/slf4j_logger.rb
+++ b/sonar-server/src/main/webapp/WEB-INF/lib/slf4j_logger.rb
@@ -17,8 +17,6 @@
  # License along with Sonar; if not, write to the Free Software
  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02
  #
-require 'java'
-
 
 #
 # Use SLF4J instead of Rails BufferedLogger.
-- 
2.39.5