jruby-jars 1.7.27 → 9.0.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b1c9777d9805b3cfdd8da04112f2f2306973bf7
-  data.tar.gz: 279a3e5900eb9eeca7c29030a479a899520805c3
+  metadata.gz: fe410e954252f91524ab4e5f252aec10b6fd8ab9
+  data.tar.gz: 5d819217c7181e6f5a8346e98591bcaab8e52d0a
 SHA512:
-  metadata.gz: ac76e5b572ee0c2a9314044f4468739ba352c13c9c203071666b645f6c0b000140f1cb8d2cd7545ce30088f1cb707f56dd97677f8bb977ad445076386369a40c
-  data.tar.gz: 2a803531316225e8236e1472c2f6cb4a0fc9c46133bc241c696109d9bff8f9e66ac1e14e375d6d5f27a0f617552e6962a8f67c629b13d95bab1b2e13b7fa003a
+  metadata.gz: 5f04dc444f3b1beb684f646acd34c6854c36463f1b0b639d0bb643ce0bcac2da1e4bf82c6fcbb9e183bb4b91b17c5639409efe4f59fc4bb330312a60d8c820d3
+  data.tar.gz: f2628da3c1028ed11f737c1bb11768da28b4be54b1d33e6775e3c83e9d88315a5ecda11d5c9bad5e5e23e542d8f61de26bc3c8f50a41c4f0bd7b2715b3b8fd19

data/Mavenfile

@@ -5,11 +5,11 @@ gemspec
 
 version = File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip
 
-inherit "org.jruby:jruby-artifacts:#{version}"
-
-ruby_version = model.version
+# maven does treats prereleased version as snapshot - undo it here
+ruby_version = model.version.sub( /-SNAPSHOT/, '' )
+self.version nil
 
-model.version = nil
+inherit "org.jruby:jruby-artifacts:#{version}"
 
 name "JRuby Jars Gem"
 
@@ -29,13 +29,19 @@ properties( 'tesla.dump.pom' => 'pom.xml',
             'jruby.plugins.version' => '1.0.7',
             # we share the already installed gems
             'gem.home' => '${jruby.home}/lib/ruby/gems/shared',
-            'jruby.home' => '${basedir}/../../' )
+            # need jruby_home but not jruby.home as name otherwise
+            # tesla-plugin will pick the jruby from jruby.home
+            'jruby_home' => '${basedir}/../../' )
+
+  unless version =~ /-SNAPSHOT/
+    properties 'jruby.home' => '${basedir}/../..'
+  end
 
 execute 'copy jruby.jar', 'prepare-package' do |ctx|
-  FileUtils.cp( File.join( ctx.project.properties[ 'jruby.home' ],
-                           'lib',
-                           'jruby.jar' ),
-                File.join( ctx.project.basedir.to_s, 
+  source = File.expand_path( ctx.project.properties[ 'jruby_home' ].to_pathname )
+  # TODO somehow the lib/jruby.jar gets moved away to avoid conflicts
+  FileUtils.cp( Dir[ File.join( source, 'lib/jruby*.jar' ) ].first,
+                File.join( ctx.project.basedir.to_pathname, 
                            'lib',
                            "jruby-core-#{ctx.project.version}.jar" ) )
 end

data/jruby-jars.gemspec

@@ -5,7 +5,7 @@ require 'fileutils'
 version = File.read( File.join( File.dirname(File.expand_path(__FILE__)), '..', '..', 'VERSION' ) ).strip
 
 # this regexp can be refined to work with pre, rc1, rc2 and such cases
-ruby_version = version.sub( /-SNAPSHOT$/, '.dev' )
+ruby_version = version.sub( /-SNAPSHOT$/, '.SNAPSHOT' )
 
 FileUtils.mkdir_p( 'lib/jruby-jars' )
 File.open( 'lib/jruby-jars/version.rb', 'w' ) do |f|

data/lib/jruby-jars/version.rb

@@ -1,4 +1,4 @@
 module JRubyJars
-  VERSION = '1.7.27'
-  MAVEN_VERSION = '1.7.27'
+  VERSION = '9.0.0.0.pre1'
+  MAVEN_VERSION = '9.0.0.0.pre1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jruby-jars
 version: !ruby/object:Gem::Version
-  version: 1.7.27
+  version: 9.0.0.0.pre1
 platform: ruby
 authors:
 - Charles Oliver Nutter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2015-01-20 00:00:00.000000000 Z
 dependencies: []
 description: |-
   This gem includes the core JRuby code and the JRuby 1.8/1.9 stdlib as jar files.
@@ -19,13 +19,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.txt
 - DEV_INSTRUCTIONS
 - Mavenfile
+- README.txt
 - lib/jruby-jars.rb
 - lib/jruby-jars/version.rb
-- lib/jruby-core-1.7.27.jar
-- lib/jruby-stdlib-1.7.27.jar
+- lib/jruby-core-9.0.0.0.pre1.jar
+- lib/jruby-stdlib-9.0.0.0.pre1.jar
 - jruby-jars.gemspec
 homepage: http://github.com/jruby/jruby/tree/master/gem/jruby-jars
 licenses:
@@ -44,9 +44,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: jruby/jruby
 rubygems_version: 2.1.9