Skip to content

Commit

Permalink
Prepare 1.4.1 (#301)
Browse files Browse the repository at this point in the history
* bump rustls to 0.21.1 for regression patch

* update changelog

* bump patch version
  • Loading branch information
jadamcrain authored May 1, 2023
1 parent f983779 commit c3987dc
Show file tree
Hide file tree
Showing 17 changed files with 26 additions and 23 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### 1.4.1 ###
* :bug: Bump rustls to 0.21.1 to resolve [#300](https://github.com/stepfunc/dnp3/issues/300).

### 1.4.0 ###
* :wrench: Update to rustls 0.21.0 which allows peer names with IP addresses in the SAN extension.
* :wrench: Move common TLS configuration to its own crate shared with our Modbus library.
Expand Down
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion conformance/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<scala.version>2.13.4</scala.version>
<dnp3.version>1.4.0</dnp3.version>
<dnp3.version>1.4.1</dnp3.version>
<dnp4s.version>0.1.0-SNAPSHOT</dnp4s.version>
<scala-maven-plugin.version>4.4.0</scala-maven-plugin.version>
</properties>
Expand Down
2 changes: 1 addition & 1 deletion dnp3/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dnp3"
version = "1.4.0"
version = "1.4.1"
authors = ["Step Function I/O LLC <info@stepfunc.io>"]
edition = "2021"
license-file = "../LICENSE.txt"
Expand Down
2 changes: 1 addition & 1 deletion dnp3/codegen/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>dev.gridio.dnp3</groupId>
<artifactId>dnp3-model</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<packaging>jar</packaging>

<name>dnp3-rs model</name>
Expand Down
2 changes: 1 addition & 1 deletion dnp3/src/tcp/tls/master.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ pub fn spawn_master_tls_client_2(
impl TlsClientConfig {
/// Legacy method for creating a client TLS configuration
#[deprecated(
since = "1.4.0",
since = "1.4.1",
note = "Please use `full_pki` or `self_signed` instead"
)]
pub fn new(
Expand Down
2 changes: 1 addition & 1 deletion dnp3/src/tcp/tls/outstation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub struct TlsServerConfig {
impl TlsServerConfig {
/// Legacy method of creating a TLS server configuration
#[deprecated(
since = "1.4.0",
since = "1.4.1",
note = "Please use `full_pki` or `self_signed` instead"
)]
pub fn new(
Expand Down
2 changes: 1 addition & 1 deletion ffi/bindings/c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.12)

project(dnp3_c LANGUAGES C CXX)

set(DNP3_BACKUP_VERSION 1.4.0)
set(DNP3_BACKUP_VERSION 1.4.1)

# Determine the architecture
if(WIN32 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64" AND CMAKE_SIZEOF_VOID_P EQUAL 8)
Expand Down
2 changes: 1 addition & 1 deletion ffi/bindings/dotnet/examples/master/Master.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="dnp3" Version="1.4.0" />
<PackageReference Include="dnp3" Version="1.4.1" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
2 changes: 1 addition & 1 deletion ffi/bindings/dotnet/examples/outstation/Outstation.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="dnp3" Version="1.4.0" />
<PackageReference Include="dnp3" Version="1.4.1" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
4 changes: 2 additions & 2 deletions ffi/bindings/java/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.stepfunc.dnp3</groupId>
<artifactId>examples</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>

<properties>
<maven.compiler.source>1.8</maven.compiler.source>
Expand All @@ -16,7 +16,7 @@
<dependency>
<groupId>io.stepfunc</groupId>
<artifactId>dnp3</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion ffi/bindings/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>io.stepfunc</groupId>
<artifactId>dnp3-parent</artifactId>
<version>1.4.0</version>
<version>1.4.1</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion ffi/dnp3-bindings/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dnp3-bindings"
version = "1.4.0"
version = "1.4.1"
authors = ["Step Function I/O LLC <info@stepfunc.io>"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion ffi/dnp3-ffi-java/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dnp3-ffi-java"
version = "1.4.0"
version = "1.4.1"
authors = ["Step Function I/O LLC <info@stepfunc.io>"]
edition = "2018"
build = "build.rs"
Expand Down
2 changes: 1 addition & 1 deletion ffi/dnp3-ffi/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dnp3-ffi"
version = "1.4.0"
version = "1.4.1"
authors = ["Step Function I/O LLC <info@stepfunc.io>"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion ffi/dnp3-schema/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "dnp3-schema"
# this version is what gets applied to the FFI libraries
version = "1.4.0"
version = "1.4.1"
authors = ["Step Function I/O LLC <info@stepfunc.io>"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion guide/sitedata.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"version": "1.4.0",
"version": "1.4.1",
"github_url": "https://github.com/stepfunc/dnp3"
}

0 comments on commit c3987dc

Please sign in to comment.