diff --git a/.github/workflows/ci-bc-compat.yml b/.github/workflows/ci-bc-compat.yml index 548e4c3a..4e94fb1a 100644 --- a/.github/workflows/ci-bc-compat.yml +++ b/.github/workflows/ci-bc-compat.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: ruby-version: [ jruby-9.4.14.0, jruby-10.0.6.0 ] - bc-version: [ '1.80', '1.81', '1.82', '1.83', '1.84' ] + bc-version: [ '1.80', '1.81', '1.82', '1.83', '1.84', '1.85', '1.86' ] include: - ruby-version: jruby-10.0.6.0 java-version: 21 diff --git a/Mavenfile b/Mavenfile index 2ed8a601..d48fcd13 100644 --- a/Mavenfile +++ b/Mavenfile @@ -101,7 +101,7 @@ plugin :deploy, '3.1.4' do execute_goals( :deploy, skip: '${gem.deploy.skip}' ) end -supported_bc_versions = %w{ 1.80 1.81 1.82 1.83 1.84 1.85 } +supported_bc_versions = %w{ 1.80 1.81 1.82 1.83 1.84 1.85 1.86 } default_bc_version = File.read File.expand_path('lib/jopenssl/version.rb', File.dirname(__FILE__)) default_bc_version = default_bc_version[/BOUNCY_CASTLE_VERSION\s?=\s?'(.*?)'/, 1] diff --git a/README.md b/README.md index 344219a4..ef23ffa4 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ For older versions of the gem compatibility wasn't reported: | ~>0.13.x | 9.1.x-9.4.x | Java 8-17 | 1.68-1.69 | | ~>0.14.x | 9.1.x-9.4.x | Java 8-21 | 1.71-1.74 | | ~>0.15.x | 9.2.x-10.0.x | Java 8-25 | 1.78-1.83 | -| ~>0.16.x | 9.3.x-10.0.x | Java 8-25 | 1.83-1.85 | +| ~>0.16.x | 9.3.x-10.1.x | Java 8-25 | 1.83-1.86 | ## Security diff --git a/lib/jopenssl/version.rb b/lib/jopenssl/version.rb index af9c8848..16be0faf 100644 --- a/lib/jopenssl/version.rb +++ b/lib/jopenssl/version.rb @@ -1,11 +1,11 @@ # frozen_string_literal: true module JOpenSSL VERSION = '0.19.2.dev' - BOUNCY_CASTLE_VERSION = '1.85' + BOUNCY_CASTLE_VERSION = '1.86' # @private BOUNCY_CASTLE_PATCH_VERSIONS = { - 'bcprov-jdk18on' => "#{BOUNCY_CASTLE_VERSION}.2" + 'bctls-jdk18on' => "#{BOUNCY_CASTLE_VERSION}.1", }.freeze private_constant :BOUNCY_CASTLE_PATCH_VERSIONS diff --git a/pom.xml b/pom.xml index 1bb55df1..d886709b 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ DO NOT MODIFY - GENERATED CODE - 1.85 + 1.86 false ${maven.test.skip} ${bc.versions} @@ -75,22 +75,22 @@ DO NOT MODIFY - GENERATED CODE org.bouncycastle bcprov-jdk18on - [1.80,1.85.2] + [1.80,1.86] org.bouncycastle bcpkix-jdk18on - [1.80,1.85] + [1.80,1.86] org.bouncycastle bctls-jdk18on - [1.80,1.85] + [1.80,1.86.1] org.bouncycastle bcutil-jdk18on - [1.80,1.85] + [1.80,1.86] org.jruby @@ -405,7 +405,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 9.2.19.0 9.2.19.0 @@ -442,7 +442,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 9.2.20.1 9.2.20.1 @@ -479,7 +479,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 9.3.3.0 9.3.3.0 @@ -516,7 +516,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 9.3.13.0 9.3.13.0 @@ -553,7 +553,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 9.4.8.0 9.4.8.0 @@ -590,7 +590,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 9.4.14.0 9.4.14.0 @@ -627,7 +627,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 9.4.15.0 9.4.15.0 @@ -664,7 +664,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 9.4.16.0 9.4.16.0 @@ -701,7 +701,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 10.0.1.0 10.0.1.0 @@ -738,7 +738,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 10.0.3.0 10.0.3.0 @@ -775,7 +775,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 10.0.5.0 10.0.5.0 @@ -812,7 +812,7 @@ DO NOT MODIFY - GENERATED CODE - 1.80,1.81,1.82,1.83,1.84,1.85 + 1.80,1.81,1.82,1.83,1.84,1.85,1.86 10.0.6.0 10.0.6.0 diff --git a/src/it/1.85/pom.xml b/src/it/1.85/pom.xml new file mode 100644 index 00000000..eb46d667 --- /dev/null +++ b/src/it/1.85/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + none + base + 0 + ../pom.xml + + bc-1-85 + 1.85 + + ${project.version} + + + + + org.codehaus.mojo + exec-maven-plugin + 3.5.0 + + + run-ruby-tests + test + exec + + jruby + ${basedir}/../.. + + ${project.version} + + + -J-Djruby.openssl.load.jars=false + -J-cp + ${project.build.directory}/dependency/bcprov-jdk18on-${bc.version}.jar:${project.build.directory}/dependency/bcpkix-jdk18on-${bc.version}.jar:${project.build.directory}/dependency/bcutil-jdk18on-${bc.version}.jar:${project.build.directory}/dependency/bctls-jdk18on-${bc.version}.jar:${basedir}/../../lib/jopenssl.jar + -Ilib + -Itest + -e + Dir.glob(File.join(Dir.pwd, "test/**/test_*.rb")).sort.each { |f| require f } + + + + + + + + diff --git a/src/it/1.86/pom.xml b/src/it/1.86/pom.xml new file mode 100644 index 00000000..24ed5fbc --- /dev/null +++ b/src/it/1.86/pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + none + base + 0 + ../pom.xml + + bc-1-86 + 1.86 + + ${project.version} + + + + + org.codehaus.mojo + exec-maven-plugin + 3.5.0 + + + run-ruby-tests + test + exec + + jruby + ${basedir}/../.. + + ${project.version} + + + -J-Djruby.openssl.load.jars=false + -J-cp + ${project.build.directory}/dependency/bcprov-jdk18on-${bc.version}.jar:${project.build.directory}/dependency/bcpkix-jdk18on-${bc.version}.jar:${project.build.directory}/dependency/bcutil-jdk18on-${bc.version}.jar:${project.build.directory}/dependency/bctls-jdk18on-${bc.version}.jar:${basedir}/../../lib/jopenssl.jar + -Ilib + -Itest + -e + Dir.glob(File.join(Dir.pwd, "test/**/test_*.rb")).sort.each { |f| require f } + + + + + + + + diff --git a/src/it/pom.xml b/src/it/pom.xml index 02fd62b2..624e5fd9 100644 --- a/src/it/pom.xml +++ b/src/it/pom.xml @@ -9,7 +9,7 @@ integration - 1.84 + 1.86