Merge branch 'jruby-1_7'

* jruby-1_7: remove staging repo for jruby-openssl 0.9.11 (use released version) [build] test-out jruby-openssl 0.9.11 from staging Conflicts: lib/pom.rb
jruby · Aug 31, 2015 · 34791ce · 34791ce
2 parents abf1edf + 30f1f4c
commit 34791ce
Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/pom.rb b/lib/pom.rb
@@ -19,7 +19,7 @@ def version
 
 default_gems =
   [
-   ImportedGem.new( 'jruby-openssl', '0.9.10', true ),
+   ImportedGem.new( 'jruby-openssl', '0.9.11', true ),
    ImportedGem.new( 'jruby-readline', '1.0', false ),
    ImportedGem.new( 'rake', 'rake.version', true ),
    ImportedGem.new( 'rdoc', 'rdoc.version', true ),
@@ -72,6 +72,9 @@ def to_pathname
               :id => 'rubygems-releases' )
   repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
               :id => 'tb-rubygems-releases' )
+  # for testing out jruby-ossl before final release :
+  #repository( :url => 'http://oss.sonatype.org/content/repositories/staging',
+  #            :id => 'gem-staging' )
 
   plugin( :clean,
           :filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -34,7 +34,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-openssl</artifactId>
-      <version>0.9.10</version>
+      <version>0.9.11</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>