Skip to content

Commit 54edea8

Browse files
chadlwilsonchadlwilson
committed
Correct usage of maven-tools under JRuby 10.0.3+
Added bigdecimal and ostruct as runtime dependencies due to virtus EOL, and transitive dependency requirement. See jruby/warbler#607 for additional info.
1 parent ca7e7fe commit 54edea8

File tree

9 files changed

+146
-0
lines changed

9 files changed

+146
-0
lines changed

‎maven-tools.gemspec‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ Gem::Specification.new do |s|
2929
s.test_files += Dir['spec/**/*gem']
3030

3131
s.add_runtime_dependency 'virtus', '~> 1.0'
32+
s.add_runtime_dependency 'bigdecimal' # virtus is EOL, but depends on axiom-types which has a bigdecimal dependency
33+
s.add_runtime_dependency 'ostruct' # virtus is EOL, but depends on ostruct usage
3234

3335
# get them out from here until jruby-maven-plugin installs test gems somewhere else then runtime gems
3436

‎pom.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,18 @@
5555
<version>[1.0,1.99999]</version>
5656
<type>gem</type>
5757
</dependency>
58+
<dependency>
59+
<groupId>rubygems</groupId>
60+
<artifactId>bigdecimal</artifactId>
61+
<version>[0,)</version>
62+
<type>gem</type>
63+
</dependency>
64+
<dependency>
65+
<groupId>rubygems</groupId>
66+
<artifactId>ostruct</artifactId>
67+
<version>[0,)</version>
68+
<type>gem</type>
69+
</dependency>
5870
<dependency>
5971
<groupId>rubygems</groupId>
6072
<artifactId>rake</artifactId>

‎spec/dsl/gemspec_spec/maven-tools.gemspec‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,34 @@ dependencies:
2424
- - ~>
2525
- !ruby/object:Gem::Version
2626
version: '1.0'
27+
- !ruby/object:Gem::Dependency
28+
name: bigdecimal
29+
requirement: !ruby/object:Gem::Requirement
30+
requirements:
31+
- - '>='
32+
- !ruby/object:Gem::Version
33+
version: '0'
34+
type: :runtime
35+
prerelease: false
36+
version_requirements: !ruby/object:Gem::Requirement
37+
requirements:
38+
- - '>='
39+
- !ruby/object:Gem::Version
40+
version: '0'
41+
- !ruby/object:Gem::Dependency
42+
name: ostruct
43+
requirement: !ruby/object:Gem::Requirement
44+
requirements:
45+
- - '>='
46+
- !ruby/object:Gem::Version
47+
version: '0'
48+
type: :runtime
49+
prerelease: false
50+
version_requirements: !ruby/object:Gem::Requirement
51+
requirements:
52+
- - '>='
53+
- !ruby/object:Gem::Version
54+
version: '0'
2755
- !ruby/object:Gem::Dependency
2856
name: rake
2957
requirement: !ruby/object:Gem::Requirement

‎spec/dsl/gemspec_spec/maven-tools.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,18 @@
1515
<version>[1.0,1.99999]</version>
1616
<type>gem</type>
1717
</dependency>
18+
<dependency>
19+
<groupId>rubygems</groupId>
20+
<artifactId>bigdecimal</artifactId>
21+
<version>[0,)</version>
22+
<type>gem</type>
23+
</dependency>
24+
<dependency>
25+
<groupId>rubygems</groupId>
26+
<artifactId>ostruct</artifactId>
27+
<version>[0,)</version>
28+
<type>gem</type>
29+
</dependency>
1830
<dependency>
1931
<groupId>rubygems</groupId>
2032
<artifactId>rake</artifactId>

‎spec/dsl/profile_gemspec_spec/maven-tools.gemspec‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,34 @@ dependencies:
2424
- - ~>
2525
- !ruby/object:Gem::Version
2626
version: '1.0'
27+
- !ruby/object:Gem::Dependency
28+
name: bigdecimal
29+
requirement: !ruby/object:Gem::Requirement
30+
requirements:
31+
- - '>='
32+
- !ruby/object:Gem::Version
33+
version: '0'
34+
type: :runtime
35+
prerelease: false
36+
version_requirements: !ruby/object:Gem::Requirement
37+
requirements:
38+
- - '>='
39+
- !ruby/object:Gem::Version
40+
version: '0'
41+
- !ruby/object:Gem::Dependency
42+
name: ostruct
43+
requirement: !ruby/object:Gem::Requirement
44+
requirements:
45+
- - '>='
46+
- !ruby/object:Gem::Version
47+
version: '0'
48+
type: :runtime
49+
prerelease: false
50+
version_requirements: !ruby/object:Gem::Requirement
51+
requirements:
52+
- - '>='
53+
- !ruby/object:Gem::Version
54+
version: '0'
2755
- !ruby/object:Gem::Dependency
2856
name: rake
2957
requirement: !ruby/object:Gem::Requirement

‎spec/dsl/profile_gemspec_spec/maven-tools.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@
1616
<version>[1.0,1.99999]</version>
1717
<type>gem</type>
1818
</dependency>
19+
<dependency>
20+
<groupId>rubygems</groupId>
21+
<artifactId>bigdecimal</artifactId>
22+
<version>[0,)</version>
23+
<type>gem</type>
24+
</dependency>
25+
<dependency>
26+
<groupId>rubygems</groupId>
27+
<artifactId>ostruct</artifactId>
28+
<version>[0,)</version>
29+
<type>gem</type>
30+
</dependency>
1931
<dependency>
2032
<groupId>rubygems</groupId>
2133
<artifactId>rake</artifactId>

‎spec/dsl/project_gemspec_spec/maven-tools.gemspec‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,34 @@ dependencies:
2424
- - ~>
2525
- !ruby/object:Gem::Version
2626
version: '1.0'
27+
- !ruby/object:Gem::Dependency
28+
name: bigdecimal
29+
requirement: !ruby/object:Gem::Requirement
30+
requirements:
31+
- - '>='
32+
- !ruby/object:Gem::Version
33+
version: '0'
34+
type: :runtime
35+
prerelease: false
36+
version_requirements: !ruby/object:Gem::Requirement
37+
requirements:
38+
- - '>='
39+
- !ruby/object:Gem::Version
40+
version: '0'
41+
- !ruby/object:Gem::Dependency
42+
name: ostruct
43+
requirement: !ruby/object:Gem::Requirement
44+
requirements:
45+
- - '>='
46+
- !ruby/object:Gem::Version
47+
version: '0'
48+
type: :runtime
49+
prerelease: false
50+
version_requirements: !ruby/object:Gem::Requirement
51+
requirements:
52+
- - '>='
53+
- !ruby/object:Gem::Version
54+
version: '0'
2755
- !ruby/object:Gem::Dependency
2856
name: rake
2957
requirement: !ruby/object:Gem::Requirement

‎spec/dsl/project_gemspec_spec/maven-tools.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,18 @@
3636
<version>[1.0,1.99999]</version>
3737
<type>gem</type>
3838
</dependency>
39+
<dependency>
40+
<groupId>rubygems</groupId>
41+
<artifactId>bigdecimal</artifactId>
42+
<version>[0,)</version>
43+
<type>gem</type>
44+
</dependency>
45+
<dependency>
46+
<groupId>rubygems</groupId>
47+
<artifactId>ostruct</artifactId>
48+
<version>[0,)</version>
49+
<type>gem</type>
50+
</dependency>
3951
<dependency>
4052
<groupId>rubygems</groupId>
4153
<artifactId>rake</artifactId>

‎spec/dsl/project_gemspec_spec/profile.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,18 @@
7070
<version>[1.0,1.99999]</version>
7171
<type>gem</type>
7272
</dependency>
73+
<dependency>
74+
<groupId>rubygems</groupId>
75+
<artifactId>bigdecimal</artifactId>
76+
<version>[0,)</version>
77+
<type>gem</type>
78+
</dependency>
79+
<dependency>
80+
<groupId>rubygems</groupId>
81+
<artifactId>ostruct</artifactId>
82+
<version>[0,)</version>
83+
<type>gem</type>
84+
</dependency>
7385
<dependency>
7486
<groupId>rubygems</groupId>
7587
<artifactId>rake</artifactId>

0 commit comments

Comments
 (0)