Skip to content

Commit 93173f2

Browse files
committed
[build] use latest versions
1 parent 7001411 commit 93173f2

File tree

2 files changed

+57
-11
lines changed

2 files changed

+57
-11
lines changed

Mavenfile

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ plugin( 'org.codehaus.mojo:exec-maven-plugin', '1.3.2' ) do
2727
invoker_main << ' org.jruby.anno.InvokerGenerator'
2828
invoker_main << " #{gen_sources}/annotated_classes.txt ${project.build.outputDirectory}"
2929
30-
dependency 'org.jruby', 'jruby-core', '1.7.10'
30+
dependency 'org.jruby', 'jruby-core', '1.7.17'
3131
3232
execute_goal :java, :id => 'invoker-generator', :phase => 'process-classes',
3333
:mainClass => 'org.jruby.anno.InvokerGenerator', :classpathScope => 'compile',
@@ -78,7 +78,7 @@ end
7878

7979
# NOTE: unfortunately we can not use 1.6.8 to generate invokers ...
8080
# although we'd like to compile against 1.6 to make sure all is well
81-
jar 'org.jruby:jruby-core', '1.7.16', :scope => :provided # 1.6.8
81+
jar 'org.jruby:jruby-core', '1.7.17', :scope => :provided # 1.6.8
8282
jar 'junit:junit', '4.11', :scope => :test
8383

8484
jruby_plugin! :gem do
@@ -90,15 +90,15 @@ end
9090

9191
supported_bc_versions = [ '1.47', '1.48', '1.49', '1.50' ]
9292

93-
properties( 'jruby.plugins.version' => '1.0.5',
94-
'jruby.versions' => '1.7.13',
93+
properties( 'jruby.plugins.version' => '1.0.6',
94+
'jruby.versions' => '1.7.17',
9595
'bc.versions' => supported_bc_versions.last,
9696
'invoker.test' => '${bc.versions}',
9797
# allow to skip all tests with -Dmaven.test.skip
9898
'invoker.skip' => '${maven.test.skip}',
9999
'runit.dir' => 'src/test/ruby/**/test_*.rb',
100100
# use this version of jruby for ALL the jruby-maven-plugins
101-
'jruby.version' => '1.7.13',
101+
'jruby.version' => '1.7.17',
102102
# dump pom.xml as readonly when running 'rmvn'
103103
'tesla.dump.pom' => 'pom.xml',
104104
'tesla.dump.readonly' => true )
@@ -160,7 +160,15 @@ profile :id => 'test-1.7.16' do
160160
plugin :invoker, '1.8' do
161161
execute_goals( :install, :run, invoker_run_options )
162162
end
163-
properties 'jruby.versions' => '1.7.16', 'jruby.modes' => '1.8,1.9,2.0',
163+
properties 'jruby.versions' => '1.7.16.2', 'jruby.modes' => '1.8,1.9,2.0',
164+
'bc.versions' => supported_bc_versions.join(',')
165+
end
166+
167+
profile :id => 'test-1.7.17' do
168+
plugin :invoker, '1.8' do
169+
execute_goals( :install, :run, invoker_run_options )
170+
end
171+
properties 'jruby.versions' => '1.7.17', 'jruby.modes' => '1.8,1.9,2.0',
164172
'bc.versions' => supported_bc_versions.join(',')
165173
end
166174

pom.xml

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
</scm>
3636
<properties>
3737
<bc.versions>1.50</bc.versions>
38-
<jruby.plugins.version>1.0.5</jruby.plugins.version>
38+
<jruby.plugins.version>1.0.6</jruby.plugins.version>
3939
<invoker.skip>${maven.test.skip}</invoker.skip>
40-
<jruby.version>1.7.13</jruby.version>
40+
<jruby.version>1.7.17</jruby.version>
4141
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
42-
<jruby.versions>1.7.13</jruby.versions>
42+
<jruby.versions>1.7.17</jruby.versions>
4343
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
4444
<tesla.dump.pom>pom.xml</tesla.dump.pom>
4545
<tesla.dump.readonly>true</tesla.dump.readonly>
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>org.jruby</groupId>
7575
<artifactId>jruby-core</artifactId>
76-
<version>1.7.16</version>
76+
<version>1.7.17</version>
7777
<scope>provided</scope>
7878
</dependency>
7979
<dependency>
@@ -482,7 +482,45 @@
482482
<properties>
483483
<bc.versions>1.47,1.48,1.49,1.50</bc.versions>
484484
<jruby.modes>1.8,1.9,2.0</jruby.modes>
485-
<jruby.versions>1.7.16</jruby.versions>
485+
<jruby.versions>1.7.16.2</jruby.versions>
486+
</properties>
487+
</profile>
488+
<profile>
489+
<id>test-1.7.17</id>
490+
<build>
491+
<plugins>
492+
<plugin>
493+
<artifactId>maven-invoker-plugin</artifactId>
494+
<version>1.8</version>
495+
<executions>
496+
<execution>
497+
<goals>
498+
<goal>install</goal>
499+
<goal>run</goal>
500+
</goals>
501+
<configuration>
502+
<projectsDirectory>integration</projectsDirectory>
503+
<pomIncludes>
504+
<pomInclude>*/pom.xml</pomInclude>
505+
</pomIncludes>
506+
<streamLogs>true</streamLogs>
507+
<properties>
508+
<jruby.versions>${jruby.versions}</jruby.versions>
509+
<jruby.modes>${jruby.modes}</jruby.modes>
510+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
511+
<bc.versions>${bc.versions}</bc.versions>
512+
<runit.dir>${runit.dir}</runit.dir>
513+
</properties>
514+
</configuration>
515+
</execution>
516+
</executions>
517+
</plugin>
518+
</plugins>
519+
</build>
520+
<properties>
521+
<bc.versions>1.47,1.48,1.49,1.50</bc.versions>
522+
<jruby.modes>1.8,1.9,2.0</jruby.modes>
523+
<jruby.versions>1.7.17</jruby.versions>
486524
</properties>
487525
</profile>
488526
<profile>

0 commit comments

Comments
 (0)