Merge pull request #349 from stepfunc/development

1.6.0 development

.github/workflows/ci.yml

@@ -162,12 +162,15 @@ jobs:
         run: cargo run --bin dnp3-bindings -- --java -r ${{ matrix.target }} -a ./target/${{ matrix.target }}/release
   # Build bindings on MacOS [64-bit macOS (10.7+, Lion+) (x86_64-apple-darwin)]
   bindings-macos:
-    runs-on: macos-latest
     strategy:
       fail-fast: false
       matrix:
-        target:
-          - x86_64-apple-darwin # 64-bit macOS (10.7+, Lion+)
+        include:
+          - runner: macos-14
+            target: aarch64-apple-darwin
+          - runner: macos-13
+            target: x86_64-apple-darwin
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -292,9 +295,9 @@ jobs:
             mv ./ffi/dnp3-ffi-java/dnp3-ffi-java.cdx.json ffi-modules/$target
           done
       - name: Create FFI third-party-licenses.txt
-        run: allow-list gen-licenses-dir -l ffi-modules -b dnp3-ffi.cdx.json -c dep_config.json > third-party-licenses.txt
+        run: allow-list gen-licenses-dir -l ffi-modules -b dnp3-ffi.cdx.json -c allowed.json > third-party-licenses.txt
       - name: Create FFI third-party-licenses-java.txt
-        run: allow-list gen-licenses-dir -l ffi-modules -b dnp3-ffi-java.cdx.json -c dep_config.json > third-party-licenses-java.txt
+        run: allow-list gen-licenses-dir -l ffi-modules -b dnp3-ffi-java.cdx.json -c allowed.json > third-party-licenses-java.txt
       - name: Package C/C++ bindings
         run: cargo run --bin dnp3-bindings -- --c --package ./ffi-modules --options ./packaging.json -f third-party-licenses.txt
       - name: Package .NET bindings
@@ -371,7 +374,7 @@ jobs:
         run: |
           mkdir release
           cd artifacts/c-bindings
-          zip -r ../../release/dnp3-${GITHUB_REF##*/}.zip .
+          zip -r ../../release/dnp3-${{github.ref_name}}.zip .
           cd ../conformance-results
           zip -r ../../release/conformance-results.zip .
       - name: Checkout stepfunc/docs
@@ -385,11 +388,11 @@ jobs:
         run: |
           git config user.name github-actions
           git config user.email [email protected]
-          rm -rf ./dnp3/${GITHUB_REF##*/}
-          mkdir -p ./dnp3/${GITHUB_REF##*/}
-          cp -a ../artifacts/doc/* ./dnp3/${GITHUB_REF##*/}
+          rm -rf ./dnp3/${{github.ref_name}}
+          mkdir -p ./dnp3/${{github.ref_name}}
+          cp -a ../artifacts/doc/* ./dnp3/${{github.ref_name}}
           git add -A
-          git commit -m "[dnp3] Release ${GITHUB_REF##*/}"
+          git commit -m "[dnp3] release ${{github.ref_name}}"
           git push
       - name: Import PGP key
         uses: crazy-max/ghaction-import-gpg@v3
@@ -405,9 +408,9 @@ jobs:
         working-directory: artifacts/java-bindings
         run: >
           shopt -s extglob &&
-          mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2 -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=$(find dnp3-+([0-9]).+([0-9]).+([0-9])*(-rc+([0-9])).jar) &&
-          mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2 -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=$(find dnp3-+([0-9]).+([0-9]).+([0-9])*(-rc+([0-9]))-sources.jar) -Dclassifier=sources &&
-          mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2 -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=$(find dnp3-+([0-9]).+([0-9]).+([0-9])*(-rc+([0-9]))-javadoc.jar) -Dclassifier=javadoc
+          mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2 -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=dnp3-${{github.ref_name}}.jar &&
+          mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2 -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=dnp3-${{github.ref_name}}-sources.jar -Dclassifier=sources &&
+          mvn gpg:sign-and-deploy-file -Durl=https://oss.sonatype.org/service/local/staging/deploy/maven2 -DrepositoryId=ossrh -DpomFile=pom.xml -Dfile=dnp3-${{github.ref_name}}-javadoc.jar -Dclassifier=javadoc
       - name: Publish NuGet package
         shell: bash
         run: dotnet nuget push $(find artifacts/dotnet-bindings/dnp3*.nupkg) -s https://api.nuget.org/v3/index.json -k ${{ secrets.SFIO_NUGET_KEY }}

CHANGELOG.md

@@ -1,3 +1,13 @@
+
+### 1.6.0 ###
+* :star: Add master station support for writing files to the outstation. See [#338](https://github.com/stepfunc/dnp3/pull/338).
+* :star: Add master station support for command events (groups 13 and 43). See [#332](https://github.com/stepfunc/dnp3/pull/332).
+* :star: Add master station support for group 102. See [#335](https://github.com/stepfunc/dnp3/pull/335).
+* :star: Add master and outstation support for UDP. See [#353](https://github.com/stepfunc/dnp3/pull/353).
+* :star: Add master station support for acting as a TCP server. See [#358](https://github.com/stepfunc/dnp3/pull/358).
+* :star: Add ability to update flags and timestamp without knowing the current value. See [#365](https://github.com/stepfunc/dnp3/pull/365).
+* :star: Obtain TCP port from server in Rust API. [#331](https://github.com/stepfunc/dnp3/pull/331).
+
 ### 1.5.2 ###
 * :bug: Fix bug where the outstation would sleep before all unsolicited data was transmitted. See [#341](https://github.com/stepfunc/dnp3/pull/341).