Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5eab72864003
Choose a base ref
...
head repository: jruby/jruby-openssl
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d32b99119a52
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Nov 21, 2015

  1. [build] more 9K profiles + make sure polyglot dumps pom.xml

    @kares
    kares committed Nov 21, 2015
    Copy the full SHA
    197d21b View commit details

  2. [travis-ci] use added (more recent) JRuby 9K targets (+ also with it … 

    …tests)
    @kares
    kares committed Nov 21, 2015
    Copy the full SHA
    d32b991 View commit details
Showing with 122 additions and 43 deletions.
  1. +9 −5 .travis.yml
  2. +25 −7 Mavenfile
  3. +88 −31 pom.xml
14 changes: 9 additions & 5 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -11,8 +11,9 @@ env:
- TEST_PROFILE=test-1.7.4
- TEST_PROFILE=test-1.7.13
- TEST_PROFILE=test-1.7.18
- TEST_PROFILE=test-1.7.21
- TEST_PROFILE=test-9000
- TEST_PROFILE=test-1.7.22
- TEST_PROFILE=test-9.0.1.0
- TEST_PROFILE=test-9.0.4.0

install: echo 'no bundle install atm!'
# script: mvn verify -P $TEST_PROFILE
@@ -21,14 +22,17 @@ script: if [[ -v TEST_COMMAND ]]; then $TEST_COMMAND; else mvn verify -P $TEST_P
matrix:
exclude:
- jdk: openjdk6
env: TEST_PROFILE=test-9000
env: TEST_PROFILE=test-9.0.1.0
exclude:
- jdk: openjdk6
env: TEST_PROFILE=test-9.0.4.0
include:
- jdk: oraclejdk7
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby
rvm: jruby-1.7.22
- jdk: oraclejdk8
env: TEST_COMMAND="jruby -S rake integration:install integration:test"
rvm: jruby
rvm: jruby-9.0.4.0
notifications:
irc:
channels:
32 changes: 25 additions & 7 deletions Mavenfile
View file
Original file line number Diff line number Diff line change
@@ -70,11 +70,15 @@ plugin( :compiler, '3.1',
# NOTE: maybe '-J-Xbootclasspath/p:${unsafe.jar}' ... as well ?!
end

plugin! :clean, :filesets => [
plugin :clean do
execute_goals( 'clean', :id => 'default-clean', :phase => 'clean',
'filesets' => [
{ :directory => 'lib', :includes => [ 'jopenssl.jar' ] },
{ :directory => 'lib/org' },
{ :directory => 'target', :includes => [ '*' ] },
]
{ :directory => 'target', :includes => [ '*' ] }
],
'failOnError' => 'false' )
end

# NOTE: unfortunately we can not use 1.6.8 to generate invokers ...
# 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',
# use this version of jruby for ALL the jruby-maven-plugins
'jruby.version' => '1.7.18',
# dump pom.xml as readonly when running 'rmvn'
'polyglot.dump.pom' => 'pom.xml',
'polyglot.dump.readonly' => true,
'tesla.dump.pom' => 'pom.xml',
'tesla.dump.readonly' => true )

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

%w{ 1.7.13 1.7.15 1.7.16 1.7.18 1.7.19 1.7.20 1.7.21 }.each { |version|
%w{ 1.7.13 1.7.15 1.7.16 1.7.18 1.7.20 1.7.21 1.7.22 }.each { |version|

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

}

profile :id => 'test-9000' do
%w{ 9.0.1.0 9.0.4.0 }.each { |version|
profile :id => "test-#{version}" do
plugin :invoker, '1.8' do
execute_goals( :install, :run, invoker_run_options )
end
# NOTE: we're work-around 9K maven-runit version bug (due minitest changes) !
# ... still can not build with 9K : https://github.com/jruby/jruby/issues/3184
properties 'jruby.version' => '9.0.0.0',
'jruby.versions' => '9.0.0.0',
properties 'jruby.version' => version, 'jruby.versions' => version,
'bc.versions' => supported_bc_versions.join(',')
end
}

#profile :id => 'test-9000' do
# plugin :invoker, '1.8' do
# execute_goals( :install, :run, invoker_run_options )
# end
# # NOTE: we're work-around 9K maven-runit version bug (due minitest changes) !
# # ... still can not build with 9K : https://github.com/jruby/jruby/issues/3184
# properties 'jruby.version' => '9.0.0.0',
# 'jruby.versions' => '9.0.0.0',
# 'bc.versions' => supported_bc_versions.join(',')
#end

profile :id => 'release' do
plugin :gpg, '1.5' do
119 changes: 88 additions & 31 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
DO NOT MODIFIY - GENERATED CODE
-->
<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"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.11</version>
<version>0.9.12</version>
<packaging>gem</packaging>
<name>JRuby OpenSSL</name>
<description>JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.</description>
@@ -56,7 +63,9 @@
<jruby.version>1.7.18</jruby.version>
<runit.dir>src/test/ruby/**/test_*.rb</runit.dir>
<jruby.versions>1.7.18</jruby.versions>
<polyglot.dump.readonly>true</polyglot.dump.readonly>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<polyglot.dump.pom>pom.xml</polyglot.dump.pom>
<tesla.dump.readonly>true</tesla.dump.readonly>
<invoker.test>${bc.versions}</invoker.test>
</properties>
@@ -285,25 +294,35 @@
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
<fileset>
<directory>lib</directory>
<includes>
<include>jopenssl.jar</include>
</includes>
</fileset>
<fileset>
<directory>lib/org</directory>
</fileset>
<fileset>
<directory>target</directory>
<includes>
<include>*</include>
</includes>
</fileset>
</filesets>
</configuration>
<executions>
<execution>
<id>default-clean</id>
<phase>clean</phase>
<goals>
<goal>clean</goal>
</goals>
<configuration>
<filesets>
<fileset>
<directory>lib</directory>
<includes>
<include>jopenssl.jar</include>
</includes>
</fileset>
<fileset>
<directory>lib/org</directory>
</fileset>
<fileset>
<directory>target</directory>
<includes>
<include>*</include>
</includes>
</fileset>
</filesets>
<failOnError>false</failOnError>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
@@ -545,7 +564,7 @@
</properties>
</profile>
<profile>
<id>test-1.7.17</id>
<id>test-1.7.18</id>
<build>
<plugins>
<plugin>
@@ -579,11 +598,11 @@
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.17</jruby.versions>
<jruby.versions>1.7.18</jruby.versions>
</properties>
</profile>
<profile>
<id>test-1.7.18</id>
<id>test-1.7.20</id>
<build>
<plugins>
<plugin>
@@ -617,11 +636,11 @@
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.18</jruby.versions>
<jruby.versions>1.7.20</jruby.versions>
</properties>
</profile>
<profile>
<id>test-1.7.19</id>
<id>test-1.7.21</id>
<build>
<plugins>
<plugin>
@@ -655,11 +674,11 @@
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.19</jruby.versions>
<jruby.versions>1.7.21</jruby.versions>
</properties>
</profile>
<profile>
<id>test-1.7.20</id>
<id>test-1.7.22</id>
<build>
<plugins>
<plugin>
@@ -693,11 +712,49 @@
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<jruby.modes>1.8,1.9,2.0</jruby.modes>
<jruby.versions>1.7.20</jruby.versions>
<jruby.versions>1.7.22</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.0.1.0</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.47,1.48,1.49,1.50,1.51</bc.versions>
<jruby.version>9.0.1.0</jruby.version>
<jruby.versions>9.0.1.0</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9000</id>
<id>test-9.0.4.0</id>
<build>
<plugins>
<plugin>
@@ -730,8 +787,8 @@
</build>
<properties>
<bc.versions>1.47,1.48,1.49,1.50,1.51</bc.versions>
<jruby.version>9.0.0.0</jruby.version>
<jruby.versions>9.0.0.0</jruby.versions>
<jruby.version>9.0.4.0</jruby.version>
<jruby.versions>9.0.4.0</jruby.versions>
</properties>
</profile>
<profile>