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

Commits on Jun 10, 2016

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

default_gems =
[
ImportedGem.new( 'jruby-openssl', '0.9.15' ),
ImportedGem.new( 'jruby-openssl', '0.9.17' ),
ImportedGem.new( 'jruby-readline', '1.0', false ),
ImportedGem.new( 'rake', '${rake.version}' ),
ImportedGem.new( 'rdoc', '${rdoc.version}' ),
@@ -26,7 +26,7 @@ def initialize( name, version, default_spec = true )
]

project 'JRuby Lib Setup' do

version = ENV['JRUBY_VERSION'] ||
File.read( File.join( basedir, '..', 'VERSION' ) ).strip

@@ -50,6 +50,12 @@ def initialize( name, version, default_spec = true )

repository :id => :mavengems, :url => 'mavengem:https://rubygems.org'

# 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' )

plugin( :clean,
:filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',
:includes => [ '*' ] },
6 changes: 3 additions & 3 deletions lib/pom.xml
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.15</version>
<version>0.9.17</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
@@ -312,7 +312,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.16</version>
<executions>
<execution>
<id>install_gems</id>
@@ -363,7 +363,7 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>io.takari.polyglot</groupId>
<artifactId>polyglot-ruby</artifactId>
<version>0.1.15</version>
<version>0.1.16</version>
</dependency>
</dependencies>
</plugin>