Skip to content

Commit 197d21b

Browse files
kareskares
committed
[build] more 9K profiles + make sure polyglot dumps pom.xml
1 parent 5eab728 commit 197d21b

File tree

2 files changed

+113
-38
lines changed

2 files changed

+113
-38
lines changed

‎Mavenfile

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,15 @@ plugin( :compiler, '3.1',
7070
# NOTE: maybe '-J-Xbootclasspath/p:${unsafe.jar}' ... as well ?!
7171
end
7272

73-
plugin! :clean, :filesets => [
73+
plugin :clean do
74+
execute_goals( 'clean', :id => 'default-clean', :phase => 'clean',
75+
'filesets' => [
7476
{ :directory => 'lib', :includes => [ 'jopenssl.jar' ] },
7577
{ :directory => 'lib/org' },
76-
{ :directory => 'target', :includes => [ '*' ] },
77-
]
78+
{ :directory => 'target', :includes => [ '*' ] }
79+
],
80+
'failOnError' => 'false' )
81+
end
7882

7983
# NOTE: unfortunately we can not use 1.6.8 to generate invokers ...
8084
# although we'd like to compile against 1.6 to make sure all is well
@@ -110,6 +114,8 @@ properties( 'jruby.plugins.version' => '1.0.10',
110114
# use this version of jruby for ALL the jruby-maven-plugins
111115
'jruby.version' => '1.7.18',
112116
# dump pom.xml as readonly when running 'rmvn'
117+
'polyglot.dump.pom' => 'pom.xml',
118+
'polyglot.dump.readonly' => true,
113119
'tesla.dump.pom' => 'pom.xml',
114120
'tesla.dump.readonly' => true )
115121

@@ -150,7 +156,7 @@ profile :id => 'test-1.7.4' do
150156
'bc.versions' => supported_bc_versions.join(',')
151157
end
152158

153-
%w{ 1.7.13 1.7.15 1.7.16 1.7.18 1.7.19 1.7.20 1.7.21 }.each { |version|
159+
%w{ 1.7.13 1.7.15 1.7.16 1.7.18 1.7.20 1.7.21 1.7.22 }.each { |version|
154160

155161
profile :id => "test-#{version}" do
156162
plugin :invoker, '1.8' do
@@ -162,16 +168,28 @@ end
162168

163169
}
164170

165-
profile :id => 'test-9000' do
171+
%w{ 9.0.1.0 9.0.4.0 }.each { |version|
172+
profile :id => "test-#{version}" do
166173
plugin :invoker, '1.8' do
167174
execute_goals( :install, :run, invoker_run_options )
168175
end
169176
# NOTE: we're work-around 9K maven-runit version bug (due minitest changes) !
170177
# ... still can not build with 9K : https://github.com/jruby/jruby/issues/3184
171-
properties 'jruby.version' => '9.0.0.0',
172-
'jruby.versions' => '9.0.0.0',
178+
properties 'jruby.version' => version, 'jruby.versions' => version,
173179
'bc.versions' => supported_bc_versions.join(',')
174180
end
181+
}
182+
183+
#profile :id => 'test-9000' do
184+
# plugin :invoker, '1.8' do
185+
# execute_goals( :install, :run, invoker_run_options )
186+
# end
187+
# # NOTE: we're work-around 9K maven-runit version bug (due minitest changes) !
188+
# # ... still can not build with 9K : https://github.com/jruby/jruby/issues/3184
189+
# properties 'jruby.version' => '9.0.0.0',
190+
# 'jruby.versions' => '9.0.0.0',
191+
# 'bc.versions' => supported_bc_versions.join(',')
192+
#end
175193

176194
profile :id => 'release' do
177195
plugin :gpg, '1.5' do

‎pom.xml

Lines changed: 88 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
5+
DO NOT MODIFIY - GENERATED CODE
6+
7+
8+
-->
29
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
310
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
411
<modelVersion>4.0.0</modelVersion>
512
<groupId>rubygems</groupId>
613
<artifactId>jruby-openssl</artifactId>
7-
<version>0.9.11</version>
14+
<version>0.9.12</version>
815
<packaging>gem</packaging>
916
<name>JRuby OpenSSL</name>
1017
<description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>
@@ -56,7 +63,9 @@
5663
<jruby.version>1.7.18</jruby.version>
5764
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
5865
<jruby.versions>1.7.18</jruby.versions>
66+
<polyglot.dump.readonly>true</polyglot.dump.readonly>
5967
<tesla.dump.pom>pom.xml</tesla.dump.pom>
68+
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
6069
<tesla.dump.readonly>true</tesla.dump.readonly>
6170
<invoker.test>${bc.versions}</invoker.test>
6271
</properties>
@@ -285,25 +294,35 @@
285294
</plugin>
286295
<plugin>
287296
<artifactId>maven-clean-plugin</artifactId>
288-
<configuration>
289-
<filesets>
290-
<fileset>
291-
<directory>lib</directory>
292-
<includes>
293-
<include>jopenssl.jar</include>
294-
</includes>
295-
</fileset>
296-
<fileset>
297-
<directory>lib/org</directory>
298-
</fileset>
299-
<fileset>
300-
<directory>target</directory>
301-
<includes>
302-
<include>*</include>
303-
</includes>
304-
</fileset>
305-
</filesets>
306-
</configuration>
297+
<executions>
298+
<execution>
299+
<id>default-clean</id>
300+
<phase>clean</phase>
301+
<goals>
302+
<goal>clean</goal>
303+
</goals>
304+
<configuration>
305+
<filesets>
306+
<fileset>
307+
<directory>lib</directory>
308+
<includes>
309+
<include>jopenssl.jar</include>
310+
</includes>
311+
</fileset>
312+
<fileset>
313+
<directory>lib/org</directory>
314+
</fileset>
315+
<fileset>
316+
<directory>target</directory>
317+
<includes>
318+
<include>*</include>
319+
</includes>
320+
</fileset>
321+
</filesets>
322+
<failOnError>false</failOnError>
323+
</configuration>
324+
</execution>
325+
</executions>
307326
</plugin>
308327
<plugin>
309328
<artifactId>maven-deploy-plugin</artifactId>
@@ -545,7 +564,7 @@
545564
</properties>
546565
</profile>
547566
<profile>
548-
<id>test-1.7.17</id>
567+
<id>test-1.7.18</id>
549568
<build>
550569
<plugins>
551570
<plugin>
@@ -579,11 +598,11 @@
579598
<properties>
580599
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
581600
<jruby.modes>1.8,1.9,2.0</jruby.modes>
582-
<jruby.versions>1.7.17</jruby.versions>
601+
<jruby.versions>1.7.18</jruby.versions>
583602
</properties>
584603
</profile>
585604
<profile>
586-
<id>test-1.7.18</id>
605+
<id>test-1.7.20</id>
587606
<build>
588607
<plugins>
589608
<plugin>
@@ -617,11 +636,11 @@
617636
<properties>
618637
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
619638
<jruby.modes>1.8,1.9,2.0</jruby.modes>
620-
<jruby.versions>1.7.18</jruby.versions>
639+
<jruby.versions>1.7.20</jruby.versions>
621640
</properties>
622641
</profile>
623642
<profile>
624-
<id>test-1.7.19</id>
643+
<id>test-1.7.21</id>
625644
<build>
626645
<plugins>
627646
<plugin>
@@ -655,11 +674,11 @@
655674
<properties>
656675
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
657676
<jruby.modes>1.8,1.9,2.0</jruby.modes>
658-
<jruby.versions>1.7.19</jruby.versions>
677+
<jruby.versions>1.7.21</jruby.versions>
659678
</properties>
660679
</profile>
661680
<profile>
662-
<id>test-1.7.20</id>
681+
<id>test-1.7.22</id>
663682
<build>
664683
<plugins>
665684
<plugin>
@@ -693,11 +712,49 @@
693712
<properties>
694713
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
695714
<jruby.modes>1.8,1.9,2.0</jruby.modes>
696-
<jruby.versions>1.7.20</jruby.versions>
715+
<jruby.versions>1.7.22</jruby.versions>
716+
</properties>
717+
</profile>
718+
<profile>
719+
<id>test-9.0.1.0</id>
720+
<build>
721+
<plugins>
722+
<plugin>
723+
<artifactId>maven-invoker-plugin</artifactId>
724+
<version>1.8</version>
725+
<executions>
726+
<execution>
727+
<goals>
728+
<goal>install</goal>
729+
<goal>run</goal>
730+
</goals>
731+
<configuration>
732+
<projectsDirectory>integration</projectsDirectory>
733+
<pomIncludes>
734+
<pomInclude>*/pom.xml</pomInclude>
735+
</pomIncludes>
736+
<streamLogs>true</streamLogs>
737+
<properties>
738+
<jruby.versions>${jruby.versions}</jruby.versions>
739+
<jruby.modes>${jruby.modes}</jruby.modes>
740+
<jruby.openssl.version>${project.version}</jruby.openssl.version>
741+
<bc.versions>${bc.versions}</bc.versions>
742+
<runit.dir>${runit.dir}</runit.dir>
743+
</properties>
744+
</configuration>
745+
</execution>
746+
</executions>
747+
</plugin>
748+
</plugins>
749+
</build>
750+
<properties>
751+
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
752+
<jruby.version>9.0.1.0</jruby.version>
753+
<jruby.versions>9.0.1.0</jruby.versions>
697754
</properties>
698755
</profile>
699756
<profile>
700-
<id>test-9000</id>
757+
<id>test-9.0.4.0</id>
701758
<build>
702759
<plugins>
703760
<plugin>
@@ -730,8 +787,8 @@
730787
</build>
731788
<properties>
732789
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
733-
<jruby.version>9.0.0.0</jruby.version>
734-
<jruby.versions>9.0.0.0</jruby.versions>
790+
<jruby.version>9.0.4.0</jruby.version>
791+
<jruby.versions>9.0.4.0</jruby.versions>
735792
</properties>
736793
</profile>
737794
<profile>

0 commit comments

Comments
 (0)