Skip to content

Commit 86132e0

Browse files
committed
[mvn] target (still) 1.6 + also include latest JRuby profiles
1 parent 4d6a01c commit 86132e0

File tree

2 files changed

+53
-15
lines changed

2 files changed

+53
-15
lines changed

Mavenfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ plugin( 'org.codehaus.mojo:build-helper-maven-plugin', '1.9' ) do
4949
end
5050

5151
plugin( :compiler, '3.1',
52-
:source => java_target, :target => java_target,
52+
:source => '1.6', :target => java_target,
5353
:encoding => 'UTF-8', :debug => true,
5454
:showWarnings => true, :showDeprecation => true,
5555

@@ -158,7 +158,7 @@ profile :id => 'test-1.7.4' do
158158
end
159159

160160
jruby_1_7_versions = %w{ 1.7.13 1.7.15 1.7.16 1.7.18 1.7.20 1.7.22 1.7.23 }
161-
jruby_1_7_versions += %w{ 1.7.24 1.7.25 1.7.26 }
161+
jruby_1_7_versions += %w{ 1.7.24 1.7.25 1.7.26 1.7.27 }
162162

163163
jruby_1_7_versions.each { |version|
164164

@@ -172,7 +172,7 @@ end
172172

173173
}
174174

175-
jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.0.0 9.1.1.0 9.1.2.0 9.1.5.0 }
175+
jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.5.0 9.1.8.0 9.1.12.0 }
176176

177177
jruby_9_K_versions.each { |version|
178178
profile :id => "test-#{version}" do

pom.xml

Lines changed: 50 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,44 @@ DO NOT MODIFIY - GENERATED CODE
829829
<jruby.versions>1.7.26</jruby.versions>
830830
</properties>
831831
</profile>
832+
<profile>
833+
<id>test-1.7.27</id>
834+
<build>
835+
<plugins>
836+
<plugin>
837+
<artifactId>maven-invoker-plugin</artifactId>
838+
<version>1.8</version>
839+
<executions>
840+
<execution>
841+
<goals>
842+
<goal>install</goal>
843+
<goal>run</goal>
844+
</goals>
845+
<configuration>
846+
<projectsDirectory>integration</projectsDirectory>
847+
<pomIncludes>
848+
<pomInclude>*/pom.xml</pomInclude>
849+
</pomIncludes>
850+
<streamLogs>true</streamLogs>
851+
<properties>
852+
<jruby.versions>${jruby.versions}</jruby.versions>
853+
<jruby.modes>${jruby.modes}</jruby.modes>
854+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
855+
<bc.versions>${bc.versions}</bc.versions>
856+
<runit.dir>${runit.dir}</runit.dir>
857+
</properties>
858+
</configuration>
859+
</execution>
860+
</executions>
861+
</plugin>
862+
</plugins>
863+
</build>
864+
<properties>
865+
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
866+
<jruby.modes>1.8,1.9,2.0</jruby.modes>
867+
<jruby.versions>1.7.27</jruby.versions>
868+
</properties>
869+
</profile>
832870
<profile>
833871
<id>test-9.0.1.0</id>
834872
<build>
@@ -906,7 +944,7 @@ DO NOT MODIFIY - GENERATED CODE
906944
</properties>
907945
</profile>
908946
<profile>
909-
<id>test-9.1.0.0</id>
947+
<id>test-9.1.2.0</id>
910948
<build>
911949
<plugins>
912950
<plugin>
@@ -939,12 +977,12 @@ DO NOT MODIFIY - GENERATED CODE
939977
</build>
940978
<properties>
941979
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
942-
<jruby.version>9.1.0.0</jruby.version>
943-
<jruby.versions>9.1.0.0</jruby.versions>
980+
<jruby.version>9.1.2.0</jruby.version>
981+
<jruby.versions>9.1.2.0</jruby.versions>
944982
</properties>
945983
</profile>
946984
<profile>
947-
<id>test-9.1.1.0</id>
985+
<id>test-9.1.5.0</id>
948986
<build>
949987
<plugins>
950988
<plugin>
@@ -977,12 +1015,12 @@ DO NOT MODIFIY - GENERATED CODE
9771015
</build>
9781016
<properties>
9791017
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
980-
<jruby.version>9.1.1.0</jruby.version>
981-
<jruby.versions>9.1.1.0</jruby.versions>
1018+
<jruby.version>9.1.5.0</jruby.version>
1019+
<jruby.versions>9.1.5.0</jruby.versions>
9821020
</properties>
9831021
</profile>
9841022
<profile>
985-
<id>test-9.1.2.0</id>
1023+
<id>test-9.1.8.0</id>
9861024
<build>
9871025
<plugins>
9881026
<plugin>
@@ -1015,12 +1053,12 @@ DO NOT MODIFIY - GENERATED CODE
10151053
</build>
10161054
<properties>
10171055
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
1018-
<jruby.version>9.1.2.0</jruby.version>
1019-
<jruby.versions>9.1.2.0</jruby.versions>
1056+
<jruby.version>9.1.8.0</jruby.version>
1057+
<jruby.versions>9.1.8.0</jruby.versions>
10201058
</properties>
10211059
</profile>
10221060
<profile>
1023-
<id>test-9.1.5.0</id>
1061+
<id>test-9.1.12.0</id>
10241062
<build>
10251063
<plugins>
10261064
<plugin>
@@ -1053,8 +1091,8 @@ DO NOT MODIFIY - GENERATED CODE
10531091
</build>
10541092
<properties>
10551093
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
1056-
<jruby.version>9.1.5.0</jruby.version>
1057-
<jruby.versions>9.1.5.0</jruby.versions>
1094+
<jruby.version>9.1.12.0</jruby.version>
1095+
<jruby.versions>9.1.12.0</jruby.versions>
10581096
</properties>
10591097
</profile>
10601098
<profile>

0 commit comments

Comments
 (0)