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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c14e4b8098ce^
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f3e0dffb736c
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 2, 2017

  1. update to jruby-openssl 0.10.0 (staging) - for Java 9 compatibility

    @kares
    kares committed Nov 2, 2017
    Copy the full SHA
    c14e4b8 View commit details

  2. [travis-ci] let's increase max Java memory a bit due jossl update

    @kares
    kares committed Nov 2, 2017
    Copy the full SHA
    8a73d3a View commit details

Commits on Nov 3, 2017

  1. Revert "[travis-ci] let's increase max Java memory a bit due jossl up… 

    …date"

This reverts commit 8a73d3a.
    @kares
    kares committed Nov 3, 2017
    Copy the full SHA
    f3e0dff View commit details
Showing with 10 additions and 6 deletions.
  1. +3 −3 lib/pom.rb
  2. +7 −3 lib/pom.xml
6 changes: 3 additions & 3 deletions lib/pom.rb
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ def initialize( name, version, default_spec = true )

default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.21' ),
ImportedGem.new( 'jruby-openssl', '0.10.0' ),
ImportedGem.new( 'jruby-readline', '1.1.1' ),
ImportedGem.new( 'rake', '${rake.version}' ),
ImportedGem.new( 'rdoc', '${rdoc.version}' ),
@@ -68,8 +68,8 @@ def initialize( name, version, default_spec = true )
# for testing out jruby-ossl before final release :
#repository( :url => 'https://oss.sonatype.org/content/repositories/snapshots',
# :id => 'gem-snaphots' )
#repository( :url => 'http://oss.sonatype.org/content/repositories/staging',
# :id => 'gem-staging' )
repository( :url => 'http://oss.sonatype.org/content/repositories/staging',
:id => 'gem-staging' )

plugin( :clean,
:filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',
10 changes: 7 additions & 3 deletions lib/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.21</version>
<version>0.10.0</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -193,6 +193,10 @@ DO NOT MODIFIY - GENERATED CODE
<id>mavengems</id>
<url>mavengem:https://rubygems.org</url>
</repository>
<repository>
<id>gem-staging</id>
<url>http://oss.sonatype.org/content/repositories/staging</url>
</repository>
</repositories>
<build>
<extensions>
@@ -299,7 +303,7 @@ DO NOT MODIFIY - GENERATED CODE
<plugin>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-maven-plugin</artifactId>
<version>0.1.15</version>
<version>0.1.13</version>
<executions>
<execution>
<id>install_gems</id>
@@ -350,7 +354,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.15</version>
<version>0.1.13</version>
</dependency>
</dependencies>
</plugin>