Skip to content
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

Prepare/1.5.1 #330

Merged
merged 2 commits into from
Dec 20, 2023
Merged

Prepare/1.5.1 #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
823db3f
update changelog
jadamcrain Dec 20, 2023
ed235a2
change version to 1.5.1
jadamcrain Dec 20, 2023
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
### 1.5.1-rc2 ###
### 1.5.1 ###
* :wrench: Update to oo-bindgen 0.8.6 to improve Java native library loading. See [oo-bindgen #124](https://github.com/stepfunc/oo_bindgen/pull/124).
* :bell: **This release only affects the Java distribution**. It is equivalent to 1.5.0 for other distributions.

### 1.5.0 ###
* :star: Add configuration option that allows outstation to respond to any master. See [#316](https://github.com/stepfunc/dnp3/pull/316).
Expand Down
10 changes: 5 additions & 5 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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.5.1-rc2</dnp3.version>
<dnp3.version>1.5.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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dnp3"
version = "1.5.1-rc2"
version = "1.5.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
View file
Open in desktop
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.5.1-rc2</version>
<version>1.5.1</version>
<packaging>jar</packaging>

<name>dnp3-rs model</name>
Expand Down
2 changes: 1 addition & 1 deletion ffi/bindings/c/CMakeLists.txt
View file
Open in desktop
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.5.1-rc2)
set(DNP3_BACKUP_VERSION 1.5.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="dnp3" Version="1.5.1-rc2" />
<PackageReference Include="dnp3" Version="1.5.1" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
2 changes: 1 addition & 1 deletion ffi/bindings/dotnet/examples/outstation/Outstation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="dnp3" Version="1.5.1-rc2" />
<PackageReference Include="dnp3" Version="1.5.1" />
</ItemGroup>
</Otherwise>
</Choose>
Expand Down
4 changes: 2 additions & 2 deletions ffi/bindings/java/examples/pom.xml
View file
Open in desktop
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.5.1-rc2</version>
<version>1.5.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.5.1-rc2</version>
<version>1.5.1</version>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion ffi/bindings/java/pom.xml
View file
Open in desktop
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.5.1-rc2</version>
<version>1.5.1</version>
<packaging>pom</packaging>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion ffi/dnp3-bindings/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dnp3-bindings"
version = "1.5.1-rc2"
version = "1.5.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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dnp3-ffi-java"
version = "1.5.1-rc2"
version = "1.5.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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dnp3-ffi"
version = "1.5.1-rc2"
version = "1.5.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
View file
Open in desktop
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.5.1-rc2"
version = "1.5.1"
authors = ["Step Function I/O LLC <info@stepfunc.io>"]
edition = "2021"

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