Skip to content

[deps] bump Bouncy Castle to 1.86 #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chadlwilson wants to merge 1 commit into from
Closed

[deps] bump Bouncy Castle to 1.86 #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-bc-compat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Mavenfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions lib/jopenssl/version.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
34 changes: 17 additions & 17 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ DO NOT MODIFY - GENERATED CODE
</snapshotRepository>
</distributionManagement>
<properties>
<bc.versions>1.85</bc.versions>
<bc.versions>1.86</bc.versions>
<gem.deploy.skip>false</gem.deploy.skip>
<invoker.skip>${maven.test.skip}</invoker.skip>
<invoker.test>${bc.versions}</invoker.test>
Expand All @@ -75,22 +75,22 @@ DO NOT MODIFY - GENERATED CODE
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
<version>[1.80,1.85.2]</version>
<version>[1.80,1.86]</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<version>[1.80,1.85]</version>
<version>[1.80,1.86]</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bctls-jdk18on</artifactId>
<version>[1.80,1.85]</version>
<version>[1.80,1.86.1]</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-jdk18on</artifactId>
<version>[1.80,1.85]</version>
<version>[1.80,1.86]</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
Expand Down Expand Up @@ -405,7 +405,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>9.2.19.0</jruby.version>
<jruby.versions>9.2.19.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -442,7 +442,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>9.2.20.1</jruby.version>
<jruby.versions>9.2.20.1</jruby.versions>
</properties>
Expand Down Expand Up @@ -479,7 +479,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>9.3.3.0</jruby.version>
<jruby.versions>9.3.3.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -516,7 +516,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>9.3.13.0</jruby.version>
<jruby.versions>9.3.13.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -553,7 +553,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>9.4.8.0</jruby.version>
<jruby.versions>9.4.8.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -590,7 +590,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>9.4.14.0</jruby.version>
<jruby.versions>9.4.14.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -627,7 +627,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>9.4.15.0</jruby.version>
<jruby.versions>9.4.15.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -664,7 +664,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>9.4.16.0</jruby.version>
<jruby.versions>9.4.16.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -701,7 +701,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>10.0.1.0</jruby.version>
<jruby.versions>10.0.1.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -738,7 +738,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>10.0.3.0</jruby.version>
<jruby.versions>10.0.3.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -775,7 +775,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>10.0.5.0</jruby.version>
<jruby.versions>10.0.5.0</jruby.versions>
</properties>
Expand Down Expand Up @@ -812,7 +812,7 @@ DO NOT MODIFY - GENERATED CODE
</plugins>
</build>
<properties>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85</bc.versions>
<bc.versions>1.80,1.81,1.82,1.83,1.84,1.85,1.86</bc.versions>
<jruby.version>10.0.6.0</jruby.version>
<jruby.versions>10.0.6.0</jruby.versions>
</properties>
Expand Down
48 changes: 48 additions & 0 deletions src/it/1.85/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>none</groupId>
<artifactId>base</artifactId>
<version>0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>bc-1-85</artifactId>
<version>1.85</version>
<properties>
<bc.version>${project.version}</bc.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>run-ruby-tests</id>
<phase>test</phase>
<goals><goal>exec</goal></goals>
<configuration>
<executable>jruby</executable>
<workingDirectory>${basedir}/../..</workingDirectory>
<environmentVariables>
<BC_VERSION>${project.version}</BC_VERSION>
</environmentVariables>
<arguments>
<argument>-J-Djruby.openssl.load.jars=false</argument>
<argument>-J-cp</argument>
<argument>${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</argument>
<argument>-Ilib</argument>
<argument>-Itest</argument>
<argument>-e</argument>
<argument>Dir.glob(File.join(Dir.pwd, "test/**/test_*.rb")).sort.each { |f| require f }</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
48 changes: 48 additions & 0 deletions src/it/1.86/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>none</groupId>
<artifactId>base</artifactId>
<version>0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>bc-1-86</artifactId>
<version>1.86</version>
<properties>
<bc.version>${project.version}</bc.version>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.5.0</version>
<executions>
<execution>
<id>run-ruby-tests</id>
<phase>test</phase>
<goals><goal>exec</goal></goals>
<configuration>
<executable>jruby</executable>
<workingDirectory>${basedir}/../..</workingDirectory>
<environmentVariables>
<BC_VERSION>${project.version}</BC_VERSION>
</environmentVariables>
<arguments>
<argument>-J-Djruby.openssl.load.jars=false</argument>
<argument>-J-cp</argument>
<argument>${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</argument>
<argument>-Ilib</argument>
<argument>-Itest</argument>
<argument>-e</argument>
<argument>Dir.glob(File.join(Dir.pwd, "test/**/test_*.rb")).sort.each { |f| require f }</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion src/it/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<name>integration</name>

<properties>
<bc.version>1.84</bc.version>
<bc.version>1.86</bc.version>
</properties>

<dependencies>
Expand Down
Loading