[build] make sure to use released jruby-complete to setup j2ee integr…

…ation test
jruby · Jun 18, 2015 · 7f1739b · 7f1739b
1 parent 0159f55
commit 7f1739b
Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile b/maven/jruby/src/it/j2ee_jetty_rack/Mavenfile
@@ -4,12 +4,11 @@
 packaging 'war'
 
 # get jruby dependencies
-properties( 'jruby.version' => '@project.version@',
-            'jruby.plugins.version' => '1.0.7',
+properties( 'jruby.plugins.version' => '1.0.10',
             'project.build.sourceEncoding' => 'utf-8',
             'public.dir' => '${basedir}/public' )
 
-pom( 'org.jruby:jruby', '${jruby.version}' )
+pom( 'org.jruby:jruby', '@project.version@' )
 
 jar( 'org.jruby.rack:jruby-rack', '1.1.18',
      :exclusions => [ 'org.jruby:jruby-complete' ] )
@@ -24,7 +23,7 @@ gem 'flickraw', '0.9.7'
 repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
             :id => 'rubygems-releases' )
 
-jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true do
+jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '1.7.19' do
   execute_goal :initialize
 end
 

diff --git a/maven/jruby/src/it/j2ee_jetty_rack/pom.xml b/maven/jruby/src/it/j2ee_jetty_rack/pom.xml
@@ -8,8 +8,7 @@
   <packaging>war</packaging>
   <name>j2ee_jetty_rack</name>
   <properties>
-    <jruby.version>@project.version@</jruby.version>
-    <jruby.plugins.version>1.0.7</jruby.plugins.version>
+    <jruby.plugins.version>1.0.10</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <public.dir>${basedir}/public</public.dir>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
@@ -19,7 +18,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>${jruby.version}</version>
+      <version>@project.version@</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -71,6 +70,7 @@
         <configuration>
           <includeRubygemsInResources>true</includeRubygemsInResources>
           <includeLibDirectoryInResources>true</includeLibDirectoryInResources>
+          <jrubyVersion>1.7.19</jrubyVersion>
         </configuration>
       </plugin>
       <plugin>

diff --git a/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile b/maven/jruby/src/it/j2ee_tomcat_rack/Mavenfile
@@ -4,12 +4,11 @@
 packaging 'war'
 
 # get jruby dependencies
-properties( 'jruby.version' => '@project.version@',
-            'jruby.plugins.version' => '1.0.7',
+properties( 'jruby.plugins.version' => '1.0.10',
             'project.build.sourceEncoding' => 'utf-8',
             'public.dir' => '${basedir}/public' )
 
-pom( 'org.jruby:jruby', '${jruby.version}' )
+pom( 'org.jruby:jruby', '@project.version@' )
 
 jar( 'org.jruby.rack:jruby-rack', '1.1.18',
      :exclusions => [ 'org.jruby:jruby-complete' ] )
@@ -24,7 +23,7 @@ gem 'flickraw', '0.9.7'
 repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
             :id => 'rubygems-releases' )
 
-jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true do
+jruby_plugin :gem, :includeRubygemsInResources => true, :includeLibDirectoryInResources => true, :jrubyVersion => '1.7.19' do
   execute_goal :initialize
 end
 

diff --git a/maven/jruby/src/it/j2ee_tomcat_rack/pom.xml b/maven/jruby/src/it/j2ee_tomcat_rack/pom.xml
@@ -8,8 +8,7 @@
   <packaging>war</packaging>
   <name>j2ee_tomcat_rack</name>
   <properties>
-    <jruby.version>@project.version@</jruby.version>
-    <jruby.plugins.version>1.0.7</jruby.plugins.version>
+    <jruby.plugins.version>1.0.10</jruby.plugins.version>
     <tesla.dump.pom>pom.xml</tesla.dump.pom>
     <public.dir>${basedir}/public</public.dir>
     <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
@@ -19,7 +18,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>${jruby.version}</version>
+      <version>@project.version@</version>
       <type>pom</type>
     </dependency>
     <dependency>
@@ -71,6 +70,7 @@
         <configuration>
           <includeRubygemsInResources>true</includeRubygemsInResources>
           <includeLibDirectoryInResources>true</includeLibDirectoryInResources>
+          <jrubyVersion>1.7.19</jrubyVersion>
         </configuration>
       </plugin>
       <plugin>