Skip to content

Commit 67820b9

Browse files
kareskares
committed
[build] we're fine with less jruby (1.7.x) profiles
1 parent 6e213fd commit 67820b9

File tree

2 files changed

+10
-119
lines changed

2 files changed

+10
-119
lines changed

‎Mavenfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,7 @@ invoker_run_options = {
157157
# 'bc.versions' => supported_bc_versions.join(',')
158158
# end
159159

160-
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 1.7.27 }
160+
jruby_1_7_versions = %w{ 1.7.18 1.7.20 1.7.22 1.7.23 1.7.24 1.7.25 1.7.26 1.7.27 }
162161

163162
jruby_1_7_versions.each { |version|
164163

‎pom.xml

Lines changed: 9 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ DO NOT MODIFIY - GENERATED CODE
5858
</distributionManagement>
5959
<properties>
6060
<bc.versions></bc.versions>
61+
<mavengem.wagon.version>0.2.0</mavengem.wagon.version>
6162
<jruby.plugins.version>1.0.10</jruby.plugins.version>
6263
<invoker.skip>${maven.test.skip}</invoker.skip>
6364
<jruby.version>1.7.20</jruby.version>
@@ -121,8 +122,8 @@ DO NOT MODIFIY - GENERATED CODE
121122
</dependencies>
122123
<repositories>
123124
<repository>
124-
<id>rubygems-releases</id>
125-
<url>http://rubygems-proxy.torquebox.org/releases</url>
125+
<id>mavengems</id>
126+
<url>mavengem:https://rubygems.org</url>
126127
</repository>
127128
<repository>
128129
<releases>
@@ -137,6 +138,11 @@ DO NOT MODIFIY - GENERATED CODE
137138
</repositories>
138139
<build>
139140
<extensions>
141+
<extension>
142+
<groupId>org.torquebox.mojo</groupId>
143+
<artifactId>mavengem-wagon</artifactId>
144+
<version>${mavengem.wagon.version}</version>
145+
</extension>
140146
<extension>
141147
<groupId>de.saumya.mojo</groupId>
142148
<artifactId>gem-with-jar-extension</artifactId>
@@ -377,121 +383,6 @@ DO NOT MODIFIY - GENERATED CODE
377383
</plugins>
378384
</build>
379385
<profiles>
380-
<profile>
381-
<id>test-1.7.13</id>
382-
<build>
383-
<plugins>
384-
<plugin>
385-
<artifactId>maven-invoker-plugin</artifactId>
386-
<version>1.8</version>
387-
<executions>
388-
<execution>
389-
<id>tests-with-different-bc-versions</id>
390-
<goals>
391-
<goal>install</goal>
392-
<goal>run</goal>
393-
</goals>
394-
<configuration>
395-
<projectsDirectory>integration</projectsDirectory>
396-
<pomIncludes>
397-
<pomInclude>*/pom.xml</pomInclude>
398-
</pomIncludes>
399-
<streamLogs>true</streamLogs>
400-
<properties>
401-
<jruby.versions>${jruby.versions}</jruby.versions>
402-
<jruby.modes>${jruby.modes}</jruby.modes>
403-
<jruby.openssl.version>${project.version}</jruby.openssl.version>
404-
<bc.versions>${bc.versions}</bc.versions>
405-
<runit.dir>${runit.dir}</runit.dir>
406-
</properties>
407-
</configuration>
408-
</execution>
409-
</executions>
410-
</plugin>
411-
</plugins>
412-
</build>
413-
<properties>
414-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
415-
<jruby.modes>1.9,2.0</jruby.modes>
416-
<jruby.versions>1.7.13</jruby.versions>
417-
</properties>
418-
</profile>
419-
<profile>
420-
<id>test-1.7.15</id>
421-
<build>
422-
<plugins>
423-
<plugin>
424-
<artifactId>maven-invoker-plugin</artifactId>
425-
<version>1.8</version>
426-
<executions>
427-
<execution>
428-
<goals>
429-
<goal>install</goal>
430-
<goal>run</goal>
431-
</goals>
432-
<configuration>
433-
<projectsDirectory>integration</projectsDirectory>
434-
<pomIncludes>
435-
<pomInclude>*/pom.xml</pomInclude>
436-
</pomIncludes>
437-
<streamLogs>true</streamLogs>
438-
<properties>
439-
<jruby.versions>${jruby.versions}</jruby.versions>
440-
<jruby.modes>${jruby.modes}</jruby.modes>
441-
<jruby.openssl.version>${project.version}</jruby.openssl.version>
442-
<bc.versions>${bc.versions}</bc.versions>
443-
<runit.dir>${runit.dir}</runit.dir>
444-
</properties>
445-
</configuration>
446-
</execution>
447-
</executions>
448-
</plugin>
449-
</plugins>
450-
</build>
451-
<properties>
452-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
453-
<jruby.modes>1.9,2.0</jruby.modes>
454-
<jruby.versions>1.7.15</jruby.versions>
455-
</properties>
456-
</profile>
457-
<profile>
458-
<id>test-1.7.16</id>
459-
<build>
460-
<plugins>
461-
<plugin>
462-
<artifactId>maven-invoker-plugin</artifactId>
463-
<version>1.8</version>
464-
<executions>
465-
<execution>
466-
<goals>
467-
<goal>install</goal>
468-
<goal>run</goal>
469-
</goals>
470-
<configuration>
471-
<projectsDirectory>integration</projectsDirectory>
472-
<pomIncludes>
473-
<pomInclude>*/pom.xml</pomInclude>
474-
</pomIncludes>
475-
<streamLogs>true</streamLogs>
476-
<properties>
477-
<jruby.versions>${jruby.versions}</jruby.versions>
478-
<jruby.modes>${jruby.modes}</jruby.modes>
479-
<jruby.openssl.version>${project.version}</jruby.openssl.version>
480-
<bc.versions>${bc.versions}</bc.versions>
481-
<runit.dir>${runit.dir}</runit.dir>
482-
</properties>
483-
</configuration>
484-
</execution>
485-
</executions>
486-
</plugin>
487-
</plugins>
488-
</build>
489-
<properties>
490-
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
491-
<jruby.modes>1.9,2.0</jruby.modes>
492-
<jruby.versions>1.7.16</jruby.versions>
493-
</properties>
494-
</profile>
495386
<profile>
496387
<id>test-1.7.18</id>
497388
<build>
@@ -501,6 +392,7 @@ DO NOT MODIFIY - GENERATED CODE
501392
<version>1.8</version>
502393
<executions>
503394
<execution>
395+
<id>tests-with-different-bc-versions</id>
504396
<goals>
505397
<goal>install</goal>
506398
<goal>run</goal>

0 commit comments

Comments
 (0)