Merge pull request #44 from sanshengshui/develop-0.7.3

Develop 0.7.3

Author: sanshengshui

.github/workflows/release.yml

@@ -211,19 +211,19 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           pattern: artifacts-*
-          path: all-artifacts
+          path: toolkit-app/target
 
-      - name: 'Merge all artifacts'
-        shell: bash
-        run: |
-          mkdir -p merged-artifact
-          cp -r all-artifacts/*/* merged-artifact/  
-
-      - name: Upload merged artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: release-artifact  # 合并后的工件名称
-          path: merged-artifact\
+#      - name: 'Merge all artifacts'
+#        shell: bash
+#        run: |
+#          mkdir -p merged-artifact
+#          cp -r all-artifacts/*/* merged-artifact/
+#
+#      - name: Upload merged artifact
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: release-artifact  # 合并后的工件名称
+#          path: merged-artifact\
 
       - name: 'Restore Maven packages'
         uses: actions/cache@v4
@@ -247,7 +247,7 @@ jobs:
           JRELEASER_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           JRELEASER_CHOCOLATEY_API_KEY: ${{ secrets.JRELEASER_CHOCOLATEY_API_KEY }}
           JRELEASER_CHOCOLATEY_GITHUB_TOKEN: ${{ secrets.JRELEASER_CHOCOLATEY_GITHUB_TOKEN }}
-        run: ./mvnw --no-transfer-progress -Prelease -pl :iot-toolkit -DartifactsDir=all-artifacts jreleaser:full-release
+        run: ./mvnw --no-transfer-progress -Prelease -pl :iot-toolkit jreleaser:full-release
 
       - name: JReleaser output
         if: always()

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>
@@ -66,8 +66,10 @@
         <main.dir>${user.dir}</main.dir>
         <artifactsDir>toolkit-app/target</artifactsDir>
         <appName>toolkit</appName>
+        <java.version>17</java.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>${java.version}</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <picocli.version>4.7.6</picocli.version>
         <netty.version>4.1.94.Final</netty.version>
@@ -306,7 +308,7 @@
                                 </packagers>
                                 <distributions>
                                     <toolkit>
-                                        <type>NATIVE_IMAGE</type>
+                                        <type>BINARY</type>
                                         <artifacts>
                                             <artifact>
                                                 <path>{{artifactsDir}}/{{appName}}-{{projectVersion}}-linux-x86_64.zip</path>
@@ -317,11 +319,23 @@
                                                 <platform>windows-x86_64</platform>
                                             </artifact>
                                             <artifact>
-                                                <path>{{artifactsDir}}/{{appName}}-{{projectVersion}}-osx-x86_64.zip</path>
-                                                <platform>osx-x86_64</platform>
+                                                <path>{{artifactsDir}}/{{appName}}-{{projectVersion}}-osx-aarch_64.zip</path>
+                                                <platform>osx-aarch_64</platform>
                                             </artifact>
                                         </artifacts>
                                     </toolkit>
+                                    <toolkit-no-arch>
+                                        <type>JAVA_BINARY</type>
+                                        <artifacts>
+                                            <artifact>
+                                                <path>{{artifactsDir}}/{{appName}}-{{projectVersion}}.zip</path>
+                                            </artifact>
+                                        </artifacts>
+                                        <java>
+                                            <version>${java.version}</version>
+                                            <mainClass>iot.technology.client.toolkit.app.ToolKitCommand</mainClass>
+                                        </java>
+                                    </toolkit-no-arch>
                                 </distributions>
                             </jreleaser>
                         </configuration>

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>
 
 

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>
 
 

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>

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>

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>