Skip to content

Commit 7d4cfc5

Browse files
mkristiankares
authored andcommitted
use jar-dependencies if available for tracking the jars [skip ci]
1 parent cc63708 commit 7d4cfc5

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

Mavenfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#-*- mode: ruby -*-
22

3+
snapshot_repository :id => 'sonatype', :url => 'https://oss.sonatype.org/content/repositories/snapshots'
4+
35
gemspec :jar => 'jopenssl', :include_jars => true
46

57
if model.version.to_s.match /[a-zA-Z]/

lib/jopenssl/load.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33
end
44

55
require 'jopenssl/version'
6-
require "bcpkix-jdk15on-#{Jopenssl::Version::BOUNCY_CASTLE_VERSION}.jar"
7-
require "bcprov-jdk15on-#{Jopenssl::Version::BOUNCY_CASTLE_VERSION}.jar"
6+
begin
7+
# if we have jar-dependencies we let it track the jars
8+
require 'jar-dependencies'
9+
require_jar( 'org.bouncycastle', 'bcpkix-jdk15on', Jopenssl::Version::BOUNCY_CASTLE_VERSION )
10+
require_jar( 'org.bouncycastle', 'bcprov-jdk15on', Jopenssl::Version::BOUNCY_CASTLE_VERSION )
11+
rescue LoadError
12+
require "org/bouncycastle/bcpkix-jdk15on/#{Jopenssl::Version::BOUNCY_CASTLE_VERSION}/bcpkix-jdk15on-#{Jopenssl::Version::BOUNCY_CASTLE_VERSION}.jar"
13+
require "org/bouncycastle/bcprov-jdk15on/#{Jopenssl::Version::BOUNCY_CASTLE_VERSION}/bcprov-jdk15on-#{Jopenssl::Version::BOUNCY_CASTLE_VERSION}.jar"
14+
end
815

916
# Load extension
1017
require 'jruby'

pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<tesla.dump.readonly>true</tesla.dump.readonly>
3232
<gem.path>${gem.home}</gem.path>
3333
<gem.home>../target/rubygems</gem.home>
34-
<jruby.plugins.version>1.0.2</jruby.plugins.version>
34+
<jruby.plugins.version>1.0.3-SNAPSHOT</jruby.plugins.version>
3535
<tesla.dump.pom>pom.xml</tesla.dump.pom>
3636
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
3737
</properties>
@@ -66,6 +66,16 @@
6666
</dependency>
6767
</dependencies>
6868
<repositories>
69+
<repository>
70+
<releases>
71+
<enabled>false</enabled>
72+
</releases>
73+
<snapshots>
74+
<enabled>true</enabled>
75+
</snapshots>
76+
<id>sonatype</id>
77+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
78+
</repository>
6979
<repository>
7080
<id>rubygems-releases</id>
7181
<url>http://rubygems-proxy.torquebox.org/releases</url>
@@ -134,6 +144,7 @@
134144
<configuration>
135145
<gemspec>jruby-openssl.gemspec</gemspec>
136146
<includeDependencies>true</includeDependencies>
147+
<useRepositoryLayout>true</useRepositoryLayout>
137148
</configuration>
138149
</plugin>
139150
<plugin>

0 commit comments

Comments
 (0)