Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[mvn] source 1.7 target (still) 1.6 + also include latest JRuby profiles
Browse files Browse the repository at this point in the history
@kares
kares committed Jul 24, 2017
1 parent 9370ebd commit 50f0bea
Showing 2 changed files with 62 additions and 18 deletions.
6 changes: 3 additions & 3 deletions Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ plugin( 'org.codehaus.mojo:build-helper-maven-plugin', '1.9' ) do
end

plugin( :compiler, '3.1',
:source => java_target, :target => java_target,
:source => '1.7', :target => java_target,
:encoding => 'UTF-8', :debug => true,
:showWarnings => true, :showDeprecation => true,

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

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 }
jruby_1_7_versions += %w{ 1.7.24 1.7.25 1.7.26 }
jruby_1_7_versions += %w{ 1.7.24 1.7.25 1.7.26 1.7.27 }

jruby_1_7_versions.each { |version|

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

}

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 }
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 }

jruby_9_K_versions.each { |version|
profile :id => "test-#{version}" do
74 changes: 59 additions & 15 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -58,6 +58,7 @@ DO NOT MODIFIY - GENERATED CODE
</distributionManagement>
<properties>
<bc.versions></bc.versions>
<mavengem.wagon.version>0.2.0</mavengem.wagon.version>
<jruby.plugins.version>1.0.10</jruby.plugins.version>
<invoker.skip>${maven.test.skip}</invoker.skip>
<jruby.version>1.7.18</jruby.version>
@@ -116,8 +117,8 @@ DO NOT MODIFIY - GENERATED CODE
</dependencies>
<repositories>
<repository>
<id>rubygems-releases</id>
<url>http://rubygems-proxy.torquebox.org/releases</url>
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
</repository>
<repository>
<releases>
@@ -132,6 +133,11 @@ DO NOT MODIFIY - GENERATED CODE
</repositories>
<build>
<extensions>
<extension>
<groupId>org.torquebox.mojo</groupId>
<artifactId>mavengem-wagon</artifactId>
<version>${mavengem.wagon.version}</version>
</extension>
<extension>
<groupId>de.saumya.mojo</groupId>
<artifactId>gem-with-jar-extension</artifactId>
@@ -277,7 +283,7 @@ DO NOT MODIFIY - GENERATED CODE
</execution>
</executions>
<configuration>
<source>1.6</source>
<source>1.7</source>
<target>1.6</target>
<encoding>UTF-8</encoding>
<debug>true</debug>
@@ -829,6 +835,44 @@ DO NOT MODIFIY - GENERATED CODE
<jruby.versions>1.7.26</jruby.versions>
</properties>
</profile>
<profile>
<id>test-1.7.27</id>
<build>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
<configuration>
<projectsDirectory>integration</projectsDirectory>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
<properties>
<jruby.versions>${jruby.versions}</jruby.versions>
<jruby.modes>${jruby.modes}</jruby.modes>
<jruby.openssl.version>${project.version}</jruby.openssl.version>
<bc.versions>${bc.versions}</bc.versions>
<runit.dir>${runit.dir}</runit.dir>
</properties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.27</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.0.1.0</id>
<build>
@@ -906,7 +950,7 @@ DO NOT MODIFIY - GENERATED CODE
</properties>
</profile>
<profile>
<id>test-9.1.0.0</id>
<id>test-9.1.2.0</id>
<build>
<plugins>
<plugin>
@@ -939,12 +983,12 @@ DO NOT MODIFIY - GENERATED CODE
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.1.0.0</jruby.version>
<jruby.versions>9.1.0.0</jruby.versions>
<jruby.version>9.1.2.0</jruby.version>
<jruby.versions>9.1.2.0</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.1.1.0</id>
<id>test-9.1.5.0</id>
<build>
<plugins>
<plugin>
@@ -977,12 +1021,12 @@ DO NOT MODIFIY - GENERATED CODE
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.1.1.0</jruby.version>
<jruby.versions>9.1.1.0</jruby.versions>
<jruby.version>9.1.5.0</jruby.version>
<jruby.versions>9.1.5.0</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.1.2.0</id>
<id>test-9.1.8.0</id>
<build>
<plugins>
<plugin>
@@ -1015,12 +1059,12 @@ DO NOT MODIFIY - GENERATED CODE
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.1.2.0</jruby.version>
<jruby.versions>9.1.2.0</jruby.versions>
<jruby.version>9.1.8.0</jruby.version>
<jruby.versions>9.1.8.0</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.1.5.0</id>
<id>test-9.1.12.0</id>
<build>
<plugins>
<plugin>
@@ -1053,8 +1097,8 @@ DO NOT MODIFIY - GENERATED CODE
</build>
<properties>
<bc.versions>1.51,1.52,1.53,1.54</bc.versions>
<jruby.version>9.1.5.0</jruby.version>
<jruby.versions>9.1.5.0</jruby.versions>
<jruby.version>9.1.12.0</jruby.version>
<jruby.versions>9.1.12.0</jruby.versions>
</properties>
</profile>
<profile>

0 comments on commit 50f0bea

Please sign in to comment.