we should handle newer (jruby 9K included) jar_dependencies as well

jruby · Apr 20, 2016 · 60e9eb1 · kares · Apr 20, 2016 · 60e9eb1
1 parent d78fb68
commit 60e9eb1
Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/jruby-openssl.gemspec b/jruby-openssl.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.requirements << "jar org.bouncycastle:bcpkix-jdk15on, #{bc_version}"
   s.requirements << "jar org.bouncycastle:bcprov-jdk15on, #{bc_version}"
 
-  s.add_development_dependency 'jar-dependencies', '~> 0.1.0'
+  s.add_development_dependency 'jar-dependencies', '~> 0.1'
 
   s.add_development_dependency 'mocha', '~> 1.1.0'
   s.add_development_dependency 'ruby-maven', '~> 3.0'

diff --git a/pom.xml b/pom.xml
@@ -58,6 +58,7 @@ DO NOT MODIFIY - GENERATED CODE
   </distributionManagement>
   <properties>
     <bc.versions>1.54</bc.versions>
+    <mavengem.wagon.version>0.2.0</mavengem.wagon.version>
     <jruby.plugins.version>1.0.10</jruby.plugins.version>
     <invoker.skip>${maven.test.skip}</invoker.skip>
     <jruby.version>1.7.18</jruby.version>
@@ -73,7 +74,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jar-dependencies</artifactId>
-      <version>[0.1.0,0.1.99999]</version>
+      <version>[0.1,0.99999]</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>
@@ -116,8 +117,8 @@ DO NOT MODIFIY - GENERATED CODE
   </dependencies>
   <repositories>
     <repository>
-      <id>rubygems-releases</id>
-      <url>http://rubygems-proxy.torquebox.org/releases</url>
+      <id>mavengems</id>
+      <url>mavengem:https://rubygems.org</url>
     </repository>
     <repository>
       <releases>
@@ -132,6 +133,11 @@ DO NOT MODIFIY - GENERATED CODE
   </repositories>
   <build>
     <extensions>
+      <extension>
+        <groupId>org.torquebox.mojo</groupId>
+        <artifactId>mavengem-wagon</artifactId>
+        <version>${mavengem.wagon.version}</version>
+      </extension>
       <extension>
         <groupId>de.saumya.mojo</groupId>
         <artifactId>gem-with-jar-extension</artifactId>