Skip to content

Commit

Permalink
upgrade BC to 1.59 + include new BC/JRuby mvn profile targets
Browse files Browse the repository at this point in the history
  • Loading branch information
@kares
kares committed May 15, 2018
1 parent bcbb73c commit 788bb8e
Show file tree
Hide file tree
Showing 3 changed files with 97 additions and 21 deletions.
4 changes: 2 additions & 2 deletions Mavenfile
View file
Expand Up @@ -100,7 +100,7 @@ plugin :deploy, '2.8.1' do
execute_goals( :deploy, :skip => false )
end

supported_bc_versions = %w{ 1.54 1.55 1.56 1.57 1.58 } # due EC support dropped <= 1.50
supported_bc_versions = %w{ 1.54 1.55 1.56 1.57 1.58 1.59 }

default_bc_version = File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__))
default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1]
Expand Down Expand Up @@ -171,7 +171,7 @@ end

}

jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.5.0 9.1.8.0 9.1.12.0 9.1.13.0 }
jruby_9_K_versions = %w{ 9.0.1.0 9.0.5.0 9.1.2.0 9.1.5.0 9.1.8.0 9.1.12.0 9.1.13.0 9.1.16.0 9.1.17.0 }

jruby_9_K_versions.each { |version|
profile :id => "test-#{version}" do
Expand Down
2 changes: 1 addition & 1 deletion lib/jopenssl/version.rb
View file
@@ -1,4 +1,4 @@
module Jopenssl
VERSION = '0.10.0.dev'
BOUNCY_CASTLE_VERSION = '1.57'
BOUNCY_CASTLE_VERSION = '1.59'
end
112 changes: 94 additions & 18 deletions pom.xml
View file
Expand Up @@ -95,17 +95,17 @@ DO NOT MODIFIY - GENERATED CODE
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.57</version>
<version>1.59</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
<version>1.57</version>
<version>1.59</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bctls-jdk15on</artifactId>
<version>1.57</version>
<version>1.59</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
Expand Down Expand Up @@ -417,7 +417,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.18</jruby.versions>
</properties>
Expand Down Expand Up @@ -455,7 +455,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.20</jruby.versions>
</properties>
Expand Down Expand Up @@ -493,7 +493,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.22</jruby.versions>
</properties>
Expand Down Expand Up @@ -531,7 +531,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.23</jruby.versions>
</properties>
Expand Down Expand Up @@ -569,7 +569,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.24</jruby.versions>
</properties>
Expand Down Expand Up @@ -607,7 +607,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.25</jruby.versions>
</properties>
Expand Down Expand Up @@ -645,7 +645,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.26</jruby.versions>
</properties>
Expand Down Expand Up @@ -683,7 +683,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.modes>1.9,2.0</jruby.modes>
<jruby.versions>1.7.27</jruby.versions>
</properties>
Expand Down Expand Up @@ -721,7 +721,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.version>9.0.1.0</jruby.version>
<jruby.versions>9.0.1.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -759,7 +759,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.version>9.0.5.0</jruby.version>
<jruby.versions>9.0.5.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -797,7 +797,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.version>9.1.2.0</jruby.version>
<jruby.versions>9.1.2.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -835,7 +835,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.version>9.1.5.0</jruby.version>
<jruby.versions>9.1.5.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -873,7 +873,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.version>9.1.8.0</jruby.version>
<jruby.versions>9.1.8.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -911,7 +911,7 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.version>9.1.12.0</jruby.version>
<jruby.versions>9.1.12.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -949,11 +949,87 @@ DO NOT MODIFIY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58</bc.versions>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.version>9.1.13.0</jruby.version>
<jruby.versions>9.1.13.0</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.1.16.0</id>
<build>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
<configuration>
<projectsDirectory>integration</projectsDirectory>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
<properties>
<jruby.versions>${jruby.versions}</jruby.versions>
<jruby.modes>${jruby.modes}</jruby.modes>
<jruby.openssl.version>${project.version}</jruby.openssl.version>
<bc.versions>${bc.versions}</bc.versions>
<runit.dir>${runit.dir}</runit.dir>
</properties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.version>9.1.16.0</jruby.version>
<jruby.versions>9.1.16.0</jruby.versions>
</properties>
</profile>
<profile>
<id>test-9.1.17.0</id>
<build>
<plugins>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<goals>
<goal>install</goal>
<goal>run</goal>
</goals>
<configuration>
<projectsDirectory>integration</projectsDirectory>
<pomIncludes>
<pomInclude>*/pom.xml</pomInclude>
</pomIncludes>
<streamLogs>true</streamLogs>
<properties>
<jruby.versions>${jruby.versions}</jruby.versions>
<jruby.modes>${jruby.modes}</jruby.modes>
<jruby.openssl.version>${project.version}</jruby.openssl.version>
<bc.versions>${bc.versions}</bc.versions>
<runit.dir>${runit.dir}</runit.dir>
</properties>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<properties>
<bc.versions>1.54,1.55,1.56,1.57,1.58,1.59</bc.versions>
<jruby.version>9.1.17.0</jruby.version>
<jruby.versions>9.1.17.0</jruby.versions>
</properties>
</profile>
<profile>
<id>release</id>
<build>
Expand Down

0 comments on commit 788bb8e

Please sign in to comment.