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

Commits on Dec 2, 2016

  1. update jruby-openssl to 0.9.19

    kares committed Dec 2, 2016
    Copy the full SHA
    5ac3a35 View commit details

Commits on Dec 5, 2016

  1. Copy the full SHA
    96f7273 View commit details
Showing with 8 additions and 14 deletions.
  1. +3 −3 lib/pom.rb
  2. +5 −11 lib/pom.xml
6 changes: 3 additions & 3 deletions lib/pom.rb
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ def initialize( name, version )

default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.17' ),
ImportedGem.new( 'jruby-openssl', '0.9.19' ),
ImportedGem.new( 'rake', '${rake.version}' ),
ImportedGem.new( 'rdoc', '${rdoc.version}' ),
ImportedGem.new( 'json', '1.8.0' ),
@@ -35,8 +35,8 @@ def initialize( name, version )
jar "org.jruby:jruby-core:#{version}"

# for testing out jruby-ossl before final release :
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',
16 changes: 5 additions & 11 deletions lib/pom.xml
Original file line number Diff line number Diff line change
@@ -19,9 +19,9 @@ DO NOT MODIFIY - GENERATED CODE
<name>JRuby Lib Setup</name>
<properties>
<tesla.dump.readonly>true</tesla.dump.readonly>
<jruby.plugins.version>1.1.2</jruby.plugins.version>
<tesla.dump.pom>pom.xml</tesla.dump.pom>
<tesla.version>0.1.1</tesla.version>
<jruby.plugins.version>1.1.2</jruby.plugins.version>
</properties>
<dependencies>
<dependency>
@@ -32,19 +32,19 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>rubygems</groupId>
<artifactId>jruby-openssl</artifactId>
<version>0.9.17</version>
<version>0.9.19</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rake</artifactId>
<version>10.1.0</version>
<version>${rake.version}</version>
<type>gem</type>
</dependency>
<dependency>
<groupId>rubygems</groupId>
<artifactId>rdoc</artifactId>
<version>4.1.2</version>
<version>${rdoc.version}</version>
<type>gem</type>
</dependency>
<dependency>
@@ -56,16 +56,10 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>rubygems</groupId>
<artifactId>jar-dependencies</artifactId>
<version>0.2.6</version>
<version>${jar-dependencies.version}</version>
<type>gem</type>
</dependency>
</dependencies>
<repositories>
<repository>
<id>gem-staging</id>
<url>http://oss.sonatype.org/content/repositories/staging</url>
</repository>
</repositories>
<build>
<plugins>
<plugin>