From a29f674f6042583e4af1684d15ab64a71090a98c Mon Sep 17 00:00:00 2001 From: sanshengshui Date: Sat, 7 Sep 2024 21:13:09 +0800 Subject: [PATCH 1/9] :arrow_up: upgrade picocli to 4.7.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ac84a5a..33ef974 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 17 17 UTF-8 - 4.7.5 + 4.7.6 4.1.94.Final 1.7.36 2.14.0-rc1 From 07d931c2e4ebddc7014b9bd931592d37051e2fba Mon Sep 17 00:00:00 2001 From: sanshengshui Date: Mon, 6 Jan 2025 21:18:23 +0800 Subject: [PATCH 2/9] :arrow_up: upgrade year to 2025 --- README_CN.md | 2 +- bin/add-zsh-completion-osx.sh | 2 +- checkstyle/checkstyle.xml | 2 +- etc/license/license-header-template.txt | 2 +- pom.xml | 2 +- toolkit-app/pom.xml | 2 +- toolkit-app/src/main/assembly/assembly-java.xml | 2 +- .../src/main/assembly/assembly-native-osx.xml | 2 +- toolkit-app/src/main/assembly/assembly-native.xml | 2 +- .../client/toolkit/app/ToolKitCommand.java | 4 ++-- .../toolkit/app/settings/ConfigCommand.java | 4 ++-- .../toolkit/app/settings/info/MainInfo.java | 2 +- .../toolkit/app/settings/lang/LangService.java | 2 +- toolkit-coap/pom.xml | 2 +- .../client/toolkit/coap/command/CoapCommand.java | 4 ++-- .../coap/command/sub/AbstractCoapContext.java | 15 +++++++++++++++ .../coap/command/sub/CoapDeleteCommand.java | 4 ++-- .../coap/command/sub/CoapDescribeCommand.java | 4 ++-- .../coap/command/sub/CoapDiscoverCommand.java | 4 ++-- .../toolkit/coap/command/sub/CoapGetCommand.java | 4 ++-- .../coap/command/sub/CoapIdentitySection.java | 15 +++++++++++++++ .../coap/command/sub/CoapMediaTypesCommand.java | 4 ++-- .../toolkit/coap/command/sub/CoapPostCommand.java | 4 ++-- .../toolkit/coap/command/sub/CoapPutCommand.java | 4 ++-- .../toolkit/coap/domain/AvailableResource.java | 2 +- .../toolkit/coap/domain/CoapSupportType.java | 2 +- .../toolkit/coap/service/CoapClientService.java | 2 +- .../client/toolkit/coap/service/DtlsClient.java | 15 +++++++++++++++ .../coap/validator/CoapCommandParamValidator.java | 2 +- toolkit-common/pom.xml | 2 +- .../commandline/CommandErrorMessageHandler.java | 2 +- .../common/commandline/CommandLineConfig.java | 2 +- .../commandline/CommonErrorMessageHandler.java | 2 +- .../commandline/ExceptionMessageHandler.java | 2 +- .../toolkit/common/config/LogLevelConfig.java | 2 +- .../toolkit/common/constants/CertTypeEnum.java | 2 +- .../toolkit/common/constants/CertUsageEnum.java | 2 +- .../toolkit/common/constants/CoapCodeEnum.java | 2 +- .../toolkit/common/constants/ConfirmCodeEnum.java | 2 +- .../toolkit/common/constants/EmojiEnum.java | 2 +- .../toolkit/common/constants/ExitCodeEnum.java | 2 +- .../toolkit/common/constants/GlobalConstants.java | 2 +- .../common/constants/HelpVersionGroup.java | 2 +- .../toolkit/common/constants/HttpConfig.java | 2 +- .../toolkit/common/constants/HttpStatus.java | 2 +- .../client/toolkit/common/constants/LangEnum.java | 2 +- .../client/toolkit/common/constants/MimeType.java | 2 +- .../toolkit/common/constants/MobileSettings.java | 2 +- .../toolkit/common/constants/MqttActionEnum.java | 2 +- .../toolkit/common/constants/MqttBizEnum.java | 2 +- .../common/constants/MqttSettingsCodeEnum.java | 2 +- .../toolkit/common/constants/MqttVersionEnum.java | 2 +- .../toolkit/common/constants/NBTypeEnum.java | 2 +- .../toolkit/common/constants/NbActionEnum.java | 2 +- .../common/constants/NbIoTHttpConfigEnum.java | 2 +- .../common/constants/NbSettingsCodeEnum.java | 2 +- .../toolkit/common/constants/NodeTypeEnum.java | 2 +- .../client/toolkit/common/constants/OSEnum.java | 2 +- .../client/toolkit/common/constants/PubData.java | 2 +- .../common/constants/SecurityAlgorithm.java | 2 +- .../common/constants/StorageConstants.java | 2 +- .../client/toolkit/common/constants/SubData.java | 2 +- .../common/constants/SystemConfigConst.java | 2 +- .../common/constants/TelAutoObserverEnum.java | 2 +- .../common/constants/TelDeviceStatusEnum.java | 2 +- .../common/constants/TelNetStatusEnum.java | 2 +- .../toolkit/common/constants/TelecomSettings.java | 2 +- .../toolkit/common/constants/TopicAndQos.java | 2 +- .../toolkit/common/constants/VersionInfo.java | 2 +- .../toolkit/common/http/HttpRequestEntity.java | 2 +- .../toolkit/common/http/HttpRequestExecutor.java | 2 +- .../toolkit/common/http/HttpResponseEntity.java | 2 +- .../client/toolkit/common/rule/NodeContext.java | 2 +- .../toolkit/common/rule/ProcessContext.java | 2 +- .../toolkit/common/rule/TkAbstractProcessor.java | 2 +- .../client/toolkit/common/rule/TkNode.java | 2 +- .../client/toolkit/common/rule/TkProcessor.java | 2 +- .../client/toolkit/common/utils/Assert.java | 2 +- .../toolkit/common/utils/CollectionUtils.java | 2 +- .../client/toolkit/common/utils/ColorUtils.java | 2 +- .../client/toolkit/common/utils/DateUtils.java | 2 +- .../client/toolkit/common/utils/FileUtils.java | 2 +- .../client/toolkit/common/utils/JsonUtils.java | 2 +- .../toolkit/common/utils/MimeTypeUtils.java | 2 +- .../client/toolkit/common/utils/OSUtil.java | 2 +- .../client/toolkit/common/utils/ObjectUtils.java | 2 +- .../client/toolkit/common/utils/SignUtils.java | 2 +- .../client/toolkit/common/utils/StringUtils.java | 2 +- .../client/toolkit/common/utils/SysLog.java | 2 +- .../common/utils/security/CredentialsReader.java | 2 +- .../common/utils/security/CredentialsUtil.java | 15 +++++++++++++++ .../common/utils/security/SecurityUtil.java | 2 +- .../toolkit/common/validator/BaseValidator.java | 2 +- toolkit-mqtt/pom.xml | 2 +- .../client/toolkit/mqtt/command/MqttCommand.java | 4 ++-- .../mqtt/command/sub/MqttDescribeCommand.java | 4 ++-- .../mqtt/command/sub/MqttSettingsCommand.java | 4 ++-- .../mqtt/command/sub/MqttShellCommand.java | 4 ++-- .../client/toolkit/mqtt/config/MqttSettings.java | 2 +- .../toolkit/mqtt/config/MqttSettingsInfo.java | 2 +- .../toolkit/mqtt/config/MqttShellModeDomain.java | 2 +- .../toolkit/mqtt/service/MqttBizService.java | 2 +- .../toolkit/mqtt/service/MqttClientCallback.java | 2 +- .../toolkit/mqtt/service/MqttClientConfig.java | 2 +- .../toolkit/mqtt/service/MqttSettingService.java | 2 +- .../service/MqttSettingsRuleChainProcessor.java | 2 +- .../mqtt/service/MqttShellModeService.java | 2 +- .../toolkit/mqtt/service/PendingOperation.java | 2 +- .../mqtt/service/core/MqttClientService.java | 2 +- .../service/domain/ChannelClosedException.java | 2 +- .../toolkit/mqtt/service/domain/DisReason.java | 2 +- .../mqtt/service/domain/MqttCallDomain.java | 2 +- .../service/domain/MqttConfigSettingsDomain.java | 2 +- .../mqtt/service/domain/MqttConnectResult.java | 2 +- .../service/domain/MqttIncomingQos2Publish.java | 2 +- .../toolkit/mqtt/service/domain/MqttLastWill.java | 2 +- .../mqtt/service/domain/MqttPendingPublish.java | 2 +- .../service/domain/MqttPendingSubscription.java | 2 +- .../service/domain/MqttPendingUnsubscription.java | 2 +- .../service/domain/MqttSettingsListDomain.java | 2 +- .../mqtt/service/domain/MqttSubscription.java | 2 +- .../service/handler/MqttBase64MessageHandler.java | 15 +++++++++++++++ .../mqtt/service/handler/MqttChannelHandler.java | 2 +- .../toolkit/mqtt/service/handler/MqttHandler.java | 2 +- .../service/handler/MqttHexMessageHandler.java | 15 +++++++++++++++ .../handler/MqttJsonFormatMessageHandler.java | 15 +++++++++++++++ .../mqtt/service/handler/MqttPingHandler.java | 2 +- .../service/handler/MqttPubMessageHandler.java | 2 +- .../service/handler/MqttSubMessageHandler.java | 2 +- .../service/handler/RetransmissionHandler.java | 2 +- .../mqtt/service/processor/AddProcessor.java | 2 +- .../mqtt/service/processor/DelProcessor.java | 2 +- .../mqtt/service/processor/HelpProcessor.java | 2 +- .../mqtt/service/processor/ListProcessor.java | 2 +- .../mqtt/service/processor/ShowProcessor.java | 2 +- .../processor/shellmode/DisconnectProcessor.java | 2 +- .../processor/shellmode/HelpProcessor.java | 2 +- .../processor/shellmode/ListProcessor.java | 2 +- .../processor/shellmode/MqttProcessContext.java | 2 +- .../processor/shellmode/PublishProcessor.java | 2 +- .../processor/shellmode/SubscribeProcessor.java | 2 +- .../processor/shellmode/UnSubscribeProcessor.java | 2 +- toolkit-nbiot/pom.xml | 2 +- .../client/toolkit/nb/command/NbCommand.java | 4 ++-- .../toolkit/nb/command/sub/NbDescribeCommand.java | 4 ++-- .../toolkit/nb/command/sub/NbSettingsCommand.java | 4 ++-- .../nb/command/sub/NbShellModeCommand.java | 4 ++-- .../client/toolkit/nb/service/NbBizService.java | 2 +- .../nb/service/NbConfigSettingsDomain.java | 2 +- .../toolkit/nb/service/NbRuleChainProcessor.java | 2 +- .../nb/service/lwm2m/Lwm2mDeviceService.java | 2 +- .../service/lwm2m/domain/DtlsSessionLogger.java | 3 +-- .../service/lwm2m/domain/Lwm2mConfigSetting.java | 2 +- .../lwm2m/domain/Lwm2mConfigSettingsDomain.java | 2 +- .../toolkit/nb/service/lwm2m/domain/MyDevice.java | 3 +-- .../lwm2m/domain/RandomTemperatureSensor.java | 3 +-- .../nb/service/mobile/AbstractMobileService.java | 2 +- .../service/mobile/MobileDeviceDataService.java | 2 +- .../nb/service/mobile/MobileDeviceService.java | 2 +- .../service/mobile/domain/BaseMobileResponse.java | 2 +- .../service/mobile/domain/MobileConfigDomain.java | 2 +- .../domain/action/data/MobCachedCommandBody.java | 2 +- .../domain/action/data/MobCachedCommandItem.java | 2 +- .../action/data/MobCachedCommandResponse.java | 2 +- .../domain/action/data/MobDeviceHisDataBody.java | 2 +- .../action/data/MobDeviceHisDataPointsBody.java | 2 +- .../action/data/MobDeviceHisDataResponse.java | 2 +- .../action/data/MobDeviceHisDataStreamsBody.java | 2 +- .../action/data/MobDeviceLatestDataBody.java | 2 +- .../data/MobDeviceLatestDataDevicesBody.java | 2 +- .../action/data/MobDeviceLatestDataResponse.java | 2 +- .../data/MobDeviceLatestDataStreamsBody.java | 2 +- .../domain/action/device/AddDeviceBody.java | 2 +- .../action/device/MobAddDeviceResponse.java | 2 +- .../domain/action/device/MobQueryDeviceBody.java | 2 +- .../action/device/MobQueryDeviceByImeiBody.java | 2 +- .../device/MobQueryDeviceByImeiResponse.java | 2 +- .../action/device/MobQueryDeviceListBody.java | 2 +- .../action/device/MobQueryDeviceListResponse.java | 2 +- .../domain/settings/MobProjectSettings.java | 2 +- .../nb/service/processor/Lwm2mBizService.java | 2 +- .../nb/service/processor/Lwm2mProcessContext.java | 2 +- .../nb/service/processor/MobProcessContext.java | 2 +- .../nb/service/processor/MobileBizService.java | 2 +- .../nb/service/processor/NbSettingsContext.java | 2 +- .../nb/service/processor/TelProcessContext.java | 2 +- .../nb/service/processor/TelecomBizService.java | 2 +- .../processor/lwm2m/LwM2MCreateProcessor.java | 2 +- .../processor/lwm2m/LwM2MDeleteProcessor.java | 2 +- .../processor/lwm2m/LwM2MHelpProcessor.java | 2 +- .../processor/lwm2m/LwM2MListProcessor.java | 2 +- .../processor/lwm2m/LwM2MSendProcessor.java | 2 +- .../processor/lwm2m/LwM2MUpdateProcessor.java | 2 +- .../processor/mobile/MobAddDeviceProcessor.java | 2 +- .../mobile/MobCommandDataDeviceProcessor.java | 2 +- .../mobile/MobDelDeviceByImeiProcessor.java | 2 +- .../processor/mobile/MobHelpProcessor.java | 2 +- .../processor/mobile/MobListDeviceProcessor.java | 2 +- .../mobile/MobLogDeviceDataProcessor.java | 2 +- .../mobile/MobShowDeviceByImeiProcessor.java | 2 +- .../mobile/MobUpdateDeviceProcessor.java | 2 +- .../settings/NbSettingsAddProcessor.java | 2 +- .../settings/NbSettingsDelProcessor.java | 2 +- .../settings/NbSettingsHelpProcessor.java | 2 +- .../settings/NbSettingsListProcessor.java | 2 +- .../settings/NbSettingsShowProcessor.java | 2 +- .../processor/telecom/TelAddDeviceProcessor.java | 2 +- .../telecom/TelCommandDataDeviceProcessor.java | 2 +- .../telecom/TelDelDeviceByImeiProcessor.java | 2 +- .../processor/telecom/TelHelpProcessor.java | 2 +- .../processor/telecom/TelListDeviceProcessor.java | 2 +- .../telecom/TelLogDeviceDataProcessor.java | 2 +- .../telecom/TelShowDeviceByImeiProcessor.java | 2 +- .../telecom/TelUpdateDeviceProcessor.java | 2 +- .../service/telecom/AbstractTelecomService.java | 2 +- .../service/telecom/TelecomDeviceDataService.java | 2 +- .../nb/service/telecom/TelecomDeviceService.java | 2 +- .../nb/service/telecom/TelecomProductService.java | 2 +- .../service/telecom/domain/BaseTelResponse.java | 2 +- .../telecom/domain/TelecomConfigDomain.java | 2 +- .../action/data/TelQueryDeviceCommandBody.java | 2 +- .../data/TelQueryDeviceCommandListBody.java | 2 +- .../data/TelQueryDeviceCommandListResponse.java | 2 +- .../data/TelQueryDeviceDataListResponse.java | 2 +- .../data/TelQueryDeviceDataTotalResponse.java | 2 +- .../domain/action/device/TelAddDeviceRequest.java | 2 +- .../action/device/TelBatchAddDeviceBody.java | 2 +- .../action/device/TelBatchAddDeviceRequest.java | 2 +- .../action/device/TelBatchAddDeviceResponse.java | 2 +- .../action/device/TelDelDeviceByImeiRequest.java | 2 +- .../action/device/TelDelDeviceByImeiResponse.java | 2 +- .../domain/action/device/TelDeviceBody.java | 2 +- .../action/device/TelQueryDeviceByImeiBody.java | 2 +- .../device/TelQueryDeviceByImeiResponse.java | 2 +- .../action/device/TelQueryDeviceListBody.java | 2 +- .../action/device/TelQueryDeviceListResponse.java | 2 +- .../device/TelUpdateDeviceOtherRequest.java | 2 +- .../action/device/TelUpdateDeviceRequest.java | 2 +- .../action/device/TelUpdateDeviceResponse.java | 2 +- .../action/product/TelDeleteProductResponse.java | 2 +- .../action/product/TelQueryProductResponse.java | 2 +- .../product/TelQueryProductResponseBody.java | 2 +- .../domain/settings/TelProjectSettings.java | 2 +- 243 files changed, 359 insertions(+), 257 deletions(-) diff --git a/README_CN.md b/README_CN.md index cd36811..6c66e5a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -170,7 +170,7 @@ Commands: publish, pub 向代理发布消息 subscribe, sub 从MQTT Broker(代理)订阅更新 -Copyright (c) 2019-2023, 物联网技术指南 +Copyright (c) 2019-2025, 物联网技术指南 Developed by mushuwei ``` diff --git a/bin/add-zsh-completion-osx.sh b/bin/add-zsh-completion-osx.sh index 5c6fb1d..bd73685 100755 --- a/bin/add-zsh-completion-osx.sh +++ b/bin/add-zsh-completion-osx.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # -# Copyright © 2019-2023 The Toolkit Authors +# Copyright © 2019-2025 The Toolkit Authors # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index 0a357a9..f7e9f82 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -1,7 +1,7 @@ + + + + + + + + + + + + + + + + + + + org.apache.maven.plugins maven-assembly-plugin @@ -294,26 +294,6 @@ - - org.codehaus.mojo - exec-maven-plugin - - - compress-binary - - exec - - package - - upx - true - - ${project.build.directory}/toolkit${executable-suffix} - - - - - org.codehaus.mojo exec-maven-plugin