jruby-jars 1.7.16.2 → 1.7.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a109f95a32740baca08b5894aeeaba3be9ea69d7
4
- data.tar.gz: 4cff49ebef6bfabd1a31c3dd165e8bb4e08f633a
3
+ metadata.gz: 897c3a89232f237b0457d16e8d0ac4fecbfa0ab5
4
+ data.tar.gz: f5e2f7f9074a5ea74ab7f5e7d7f7637da240725e
5
5
  SHA512:
6
- metadata.gz: b36d9050b8c4b69c0a01fda1596fa3e868ea7b3b6bb3b4e2cb0f345d9ad7cd57a02b8796103d05993be615d68e0fb772f3247c22501470e46a694b3ff6a74d8c
7
- data.tar.gz: 0c5d6b77458210f7ae10cd3d4d30408b57c408453ab01fe17f39760930c57c7ea9e6bf67b743cd48b42b0ab93f3f771d8a0453231cab9d960437171ef582116a
6
+ metadata.gz: 43c8e4069ed9a45dc5d30eac16e3e35626ca2c42e456de310f1431bfa7c58a6e3fd980ab3e7cc84da068951bf622f43c29fb4e3c383cca3c0d3a69948867e151
7
+ data.tar.gz: bae4d0619ff57fa86831b8a95918f182d762562b3fffffc388e714584d065e156975fc733920a7623c3c3431ea39dc0b4d1fe04953a8c641930f3d2c1ef6b05a
data/Mavenfile CHANGED
@@ -1,16 +1,19 @@
1
1
  #-*- mode: ruby -*-
2
+ require 'fileutils'
3
+
2
4
  gemspec
3
5
 
4
- ruby_version = model.version
6
+ version = File.read( File.join( basedir, '..', '..', 'VERSION' ) ).strip
5
7
 
6
- inherit "org.jruby:jruby-artifacts:#{ruby_version.sub( /.dev$/, '-SNAPSHOT' )}"
8
+ inherit "org.jruby:jruby-artifacts:#{version}"
9
+
10
+ ruby_version = model.version
7
11
 
8
12
  model.version = nil
9
13
 
10
14
  name "JRuby Jars Gem"
11
15
 
12
- jar 'org.jruby:jruby-core-complete', '${project.parent.version}'
13
- jar 'org.jruby:jruby-stdlib-complete', '${project.parent.version}'
16
+ jar 'org.jruby:jruby-stdlib', '${project.parent.version}'
14
17
 
15
18
  plugin( :clean, '2.5' ) do
16
19
  execute_goals( :clean,
@@ -22,11 +25,27 @@ plugin( :clean, '2.5' ) do
22
25
  end
23
26
 
24
27
  properties( 'tesla.dump.pom' => 'pom.xml',
25
- 'tesla.dump.readOnly' => true,
28
+ 'tesla.dump.readonly' => true,
29
+ 'jruby.plugins.version' => '1.0.7',
30
+ # we share the already installed gems
31
+ 'gem.home' => '${jruby.home}/lib/ruby/gems/shared',
26
32
  'jruby.home' => '${basedir}/../../' )
27
33
 
34
+ execute 'copy jruby.jar', 'prepare-package' do |ctx|
35
+ FileUtils.cp( File.join( ctx.project.properties[ 'jruby.home' ],
36
+ 'lib',
37
+ 'jruby.jar' ),
38
+ File.join( ctx.project.basedir.to_s,
39
+ 'lib',
40
+ "jruby-core-#{ctx.project.version}.jar" ) )
41
+ end
42
+
43
+ # do not push the gem during deploy phase
44
+ # the bang reuses the plugin declaration which is already in place and
45
+ # adds the extra execute_goal to it
28
46
  jruby_plugin!( :gem,
29
47
  :gemspec => 'jruby-jars.gemspec',
48
+ # tell maven to include the jar files into gem
30
49
  :includeDependencies => true ) do
31
50
  execute_goals :id => 'default-push', :skip => true
32
51
  end
@@ -35,21 +54,6 @@ build do
35
54
  final_name "${project.artifactId}-#{ruby_version}"
36
55
  end
37
56
 
38
- # TODO remove once gem-maven-plugin honors the final_name
39
- plugin :install, :skip => true
40
- execute 'rename gem file', :verify do |ctx|
41
- require 'fileutils'
42
- FileUtils.rm_rf(Dir["#{ctx.project.build.directory}/*.gem"])
43
- FileUtils.mv(Dir["#{ctx.project.basedir}/*.gem"], ctx.project.build.directory)
44
- end
57
+ plugin :invoker, :properties => { 'ruby.version' => ruby_version, 'gem.home' => '${project.build.directory}/rubygems', 'gem.path' => '${project.build.directory}/rubygems' }
45
58
 
46
- plugin( :invoker,
47
- :projectsDirectory => 'src/it',
48
- :cloneProjectsTo => '${project.build.directory}/it',
49
- :postBuildHookScript => 'verify.bsh',
50
- :streamLogs => true ) do
51
- execute_goals( :install, :run )
52
- # :settingsFile => '${basedir}/src/it/settings.xml',
53
- # :localRepositoryPath => '${project.build.directory}/local-repo' )
54
- end
55
59
  # vim: syntax=Ruby
@@ -0,0 +1,34 @@
1
+ #-*- mode: ruby -*-
2
+
3
+ require 'rake'
4
+ require 'rexml/document'
5
+ require 'rexml/xpath'
6
+
7
+ version = File.read( File.join( File.dirname(File.expand_path(__FILE__)), '..', '..', 'VERSION' ) ).strip
8
+
9
+ # this regexp can be refined to work with pre, rc1, rc2 and such cases
10
+ ruby_version = version.sub( /-SNAPSHOT$/, '.dev' )
11
+
12
+ File.open( 'lib/jruby-jars/version.rb', 'w' ) do |f|
13
+ f.print <<EOF
14
+ module JRubyJars
15
+ VERSION = '#{ruby_version}'
16
+ MAVEN_VERSION = '#{version}'
17
+ end
18
+ EOF
19
+ end
20
+
21
+ Gem::Specification.new do |s|
22
+ s.name = 'jruby-jars'
23
+ s.version = ruby_version
24
+ s.authors = ['Charles Oliver Nutter']
25
+ s.email = 'headius@headius.com'
26
+ s.summary = 'The core JRuby code and the JRuby stdlib as jar files.'
27
+ s.homepage = 'http://github.com/jruby/jruby/tree/master/gem/jruby-jars'
28
+ s.description = File.read('README.txt', encoding: 'UTF-8').split(/\n{2,}/)[3]
29
+ s.rubyforge_project = 'jruby/jruby'
30
+ s.licenses = %w(EPL-1.0 GPL-2.0 LGPL-2.1)
31
+ s.files = Dir['[A-Z]*'] + Dir['lib/**/*.rb'] + Dir[ "lib/jruby-*-#{version}*.jar" ] + Dir[ 'test/**/*'] + [ 'jruby-jars.gemspec' ]
32
+ end
33
+
34
+ # vim: syntax=Ruby
@@ -4,10 +4,10 @@ module JRubyJars
4
4
  PATH = File.expand_path(File.dirname(__FILE__))
5
5
 
6
6
  def self.core_jar_path
7
- "#{PATH}/jruby-core-complete-#{JRubyJars::MAVEN_VERSION}.jar"
7
+ "#{PATH}/jruby-core-#{JRubyJars::MAVEN_VERSION}.jar"
8
8
  end
9
9
 
10
10
  def self.stdlib_jar_path
11
- "#{PATH }/jruby-stdlib-complete-#{JRubyJars::MAVEN_VERSION}.jar"
11
+ "#{PATH }/jruby-stdlib-#{JRubyJars::MAVEN_VERSION}.jar"
12
12
  end
13
13
  end
@@ -1,5 +1,4 @@
1
1
  module JRubyJars
2
- MAVEN_VERSION = Dir[File.expand_path(File.dirname(File.dirname(__FILE__))) + '/jruby-core-complete-*jar' ].
3
- first.gsub(/^.*jruby-core-complete-|.jar$/, '')
4
- VERSION = MAVEN_VERSION.sub('-SNAPSHOT', '.dev').gsub('-', '.')
2
+ VERSION = '1.7.17'
3
+ MAVEN_VERSION = '1.7.17'
5
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jruby-jars
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.16.2
4
+ version: 1.7.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Charles Oliver Nutter
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-08 00:00:00.000000000 Z
11
+ date: 2014-12-09 00:00:00.000000000 Z
12
12
  dependencies: []
13
13
  description: |-
14
14
  This gem includes the core JRuby code and the JRuby 1.8/1.9 stdlib as jar files.
@@ -24,8 +24,9 @@ files:
24
24
  - README.txt
25
25
  - lib/jruby-jars.rb
26
26
  - lib/jruby-jars/version.rb
27
- - lib/jruby-core-complete-1.7.16.2.jar
28
- - lib/jruby-stdlib-complete-1.7.16.2.jar
27
+ - lib/jruby-core-1.7.17.jar
28
+ - lib/jruby-stdlib-1.7.17.jar
29
+ - jruby-jars.gemspec
29
30
  homepage: http://github.com/jruby/jruby/tree/master/gem/jruby-jars
30
31
  licenses:
31
32
  - EPL-1.0