From a44c7175d9736d0aee2ced6c5ec7ba3e00434063 Mon Sep 17 00:00:00 2001 From: sanshengshui <lovewsic@gmail.com> Date: Fri, 17 Jan 2025 11:17:20 +0800 Subject: [PATCH] convert toolkit-coap to 0.7.2 --- .github/workflows/release.yml | 11 +++++------ pom.xml | 2 +- toolkit-app/pom.xml | 2 +- toolkit-coap/pom.xml | 2 +- toolkit-common/pom.xml | 2 +- toolkit-mqtt/pom.xml | 2 +- toolkit-nbiot/pom.xml | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2e00574..b18dea0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -185,8 +185,8 @@ jobs: with: name: artifacts-${{ matrix.os }} path: | - toolkit-app/target/toolkit-app*.zip - !toolkit-app/target/toolkit-app-${{ env.refName }}.jar + toolkit-app/target/*.zip + !toolkit-app/target/toolkit-${{ env.refName }}.zip # Collect all executables and release release: @@ -211,11 +211,10 @@ jobs: path: all-artifacts - name: 'Merge all artifacts' + shell: bash run: | - mkdir merged-artifact - for /d %%D in (all-artifacts\*) do ( - xcopy /E /I "%%D" merged-artifact\ - ) + mkdir -p merged-artifact + cp -r all-artifacts/*/* merged-artifact/ - name: Upload merged artifact uses: actions/upload-artifact@v4 diff --git a/pom.xml b/pom.xml index acb02ea..73a6d6b 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <groupId>iot.technology</groupId> <artifactId>iot-toolkit</artifactId> - <version>0.7.3</version> + <version>0.7.2</version> <modules> <module>toolkit-mqtt</module> <module>toolkit-coap</module> diff --git a/toolkit-app/pom.xml b/toolkit-app/pom.xml index dfc5c09..4fc2a99 100644 --- a/toolkit-app/pom.xml +++ b/toolkit-app/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>iot-toolkit</artifactId> <groupId>iot.technology</groupId> - <version>0.7.3</version> + <version>0.7.2</version> </parent> diff --git a/toolkit-coap/pom.xml b/toolkit-coap/pom.xml index 81761ae..3c8f2ff 100644 --- a/toolkit-coap/pom.xml +++ b/toolkit-coap/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>iot-toolkit</artifactId> <groupId>iot.technology</groupId> - <version>0.7.3</version> + <version>0.7.2</version> </parent> diff --git a/toolkit-common/pom.xml b/toolkit-common/pom.xml index 7f69062..429433c 100644 --- a/toolkit-common/pom.xml +++ b/toolkit-common/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>iot-toolkit</artifactId> <groupId>iot.technology</groupId> - <version>0.7.3</version> + <version>0.7.2</version> </parent> <name>IoT Technology ToolKit Common</name> diff --git a/toolkit-mqtt/pom.xml b/toolkit-mqtt/pom.xml index 9b348e9..2c2bd6a 100644 --- a/toolkit-mqtt/pom.xml +++ b/toolkit-mqtt/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>iot-toolkit</artifactId> <groupId>iot.technology</groupId> - <version>0.7.3</version> + <version>0.7.2</version> </parent> <artifactId>toolkit-mqtt</artifactId> diff --git a/toolkit-nbiot/pom.xml b/toolkit-nbiot/pom.xml index e125953..a26e8dc 100644 --- a/toolkit-nbiot/pom.xml +++ b/toolkit-nbiot/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>iot-toolkit</artifactId> <groupId>iot.technology</groupId> - <version>0.7.3</version> + <version>0.7.2</version> </parent> <modelVersion>4.0.0</modelVersion>