Skip to content

Commit 60e9eb1

Browse files
committed
we should handle newer (jruby 9K included) jar_dependencies as well
1 parent d78fb68 commit 60e9eb1

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

jruby-openssl.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
2828
s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{bc_version}"
2929
s.requirements << "jar org.bouncycastle:bcprov-jdk15on, #{bc_version}"
3030

31-
s.add_development_dependency 'jar-dependencies', '~> 0.1.0'
31+
s.add_development_dependency 'jar-dependencies', '~> 0.1'
3232

3333
s.add_development_dependency 'mocha', '~> 1.1.0'
3434
s.add_development_dependency 'ruby-maven', '~> 3.0'

pom.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ DO NOT MODIFIY - GENERATED CODE
5858
</distributionManagement>
5959
<properties>
6060
<bc.versions>1.54</bc.versions>
61+
<mavengem.wagon.version>0.2.0</mavengem.wagon.version>
6162
<jruby.plugins.version>1.0.10</jruby.plugins.version>
6263
<invoker.skip>${maven.test.skip}</invoker.skip>
6364
<jruby.version>1.7.18</jruby.version>
@@ -73,7 +74,7 @@ DO NOT MODIFIY - GENERATED CODE
7374
<dependency>
7475
<groupId>rubygems</groupId>
7576
<artifactId>jar-dependencies</artifactId>
76-
<version>[0.1.0,0.1.99999]</version>
77+
<version>[0.1,0.99999]</version>
7778
<type>gem</type>
7879
<scope>test</scope>
7980
</dependency>
@@ -116,8 +117,8 @@ DO NOT MODIFIY - GENERATED CODE
116117
</dependencies>
117118
<repositories>
118119
<repository>
119-
<id>rubygems-releases</id>
120-
<url>http://rubygems-proxy.torquebox.org/releases</url>
120+
<id>mavengems</id>
121+
<url>mavengem:https://rubygems.org</url>
121122
</repository>
122123
<repository>
123124
<releases>
@@ -132,6 +133,11 @@ DO NOT MODIFIY - GENERATED CODE
132133
</repositories>
133134
<build>
134135
<extensions>
136+
<extension>
137+
<groupId>org.torquebox.mojo</groupId>
138+
<artifactId>mavengem-wagon</artifactId>
139+
<version>${mavengem.wagon.version}</version>
140+
</extension>
135141
<extension>
136142
<groupId>de.saumya.mojo</groupId>
137143
<artifactId>gem-with-jar-extension</artifactId>

0 commit comments

Comments
 (0)