From b04a21c90555b127cc12359d4c73ec481c418968 Mon Sep 17 00:00:00 2001 From: "Mr.J" <116749895@qq.com> Date: Wed, 17 Dec 2025 15:42:16 +0800 Subject: [PATCH 1/7] =?UTF-8?q?build(maven):=20=E5=8D=87=E7=BA=A7=20Maven?= =?UTF-8?q?=20Wrapper=20=E7=89=88=E6=9C=AC=E5=B9=B6=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=A7=A3=E5=8E=8B=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 Maven Wrapper 版本从 3.3.2 更新至 3.3.4 - 更新 Maven 分发版本至 4.0.0-rc-4 - 优化 Unix 和 Windows 脚本中的目录解析逻辑 - 改进分发包解压后实际目录名的识别方式 - 使用 SHA-256 替代 MD5 用于生成 MAVEN_HOME 名称 - 增强对符号链接路径的支持 - 修复 mvnw.cmd 中命令执行的引号问题 --- .mvn/wrapper/maven-wrapper.properties | 20 +--------- demo-backend/pom.xml | 6 +-- demo-reactive/pom.xml | 6 +-- micro-auth-oidc/pom.xml | 6 +-- micro-auth-wechat/pom.xml | 6 +-- micro-auth/pom.xml | 6 +-- micro-common/pom.xml | 6 +-- micro-flyway-starter/pom.xml | 6 +-- micro-payment/pom.xml | 6 +-- micro-pic-upload-starter/pom.xml | 6 +-- micro-spring-boot-starter/pom.xml | 6 +-- micro-sql-jooq/pom.xml | 6 +-- micro-test/pom.xml | 6 +-- micro-web/pom.xml | 6 +-- mvnw | 50 ++++++++++++++++++++---- mvnw.cmd | 56 +++++++++++++++++++++++---- pom.xml | 6 +-- 17 files changed, 109 insertions(+), 101 deletions(-) diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index d58dfb70..e2764987 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,19 +1,3 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -wrapperVersion=3.3.2 +wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/4.0.0-rc-4/apache-maven-4.0.0-rc-4-bin.zip diff --git a/demo-backend/pom.xml b/demo-backend/pom.xml index 41994f1e..6cef1de7 100644 --- a/demo-backend/pom.xml +++ b/demo-backend/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + demo-backend demo-backend demo-backend diff --git a/demo-reactive/pom.xml b/demo-reactive/pom.xml index 04d704e3..4891046a 100644 --- a/demo-reactive/pom.xml +++ b/demo-reactive/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + demo-reactive demo-reactive demo-reactive diff --git a/micro-auth-oidc/pom.xml b/micro-auth-oidc/pom.xml index 9078adbc..8c99b535 100644 --- a/micro-auth-oidc/pom.xml +++ b/micro-auth-oidc/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-auth-oidc micro-auth-oidc micro-auth-oidc diff --git a/micro-auth-wechat/pom.xml b/micro-auth-wechat/pom.xml index e7c543d7..7a8fc524 100644 --- a/micro-auth-wechat/pom.xml +++ b/micro-auth-wechat/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-auth-wechat micro-auth-wechat micro-auth-wechat diff --git a/micro-auth/pom.xml b/micro-auth/pom.xml index 83697c81..cd14135e 100644 --- a/micro-auth/pom.xml +++ b/micro-auth/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-auth micro-auth auth-server diff --git a/micro-common/pom.xml b/micro-common/pom.xml index bc6d6fb4..6cc7ad7b 100644 --- a/micro-common/pom.xml +++ b/micro-common/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-common micro-common micro-common diff --git a/micro-flyway-starter/pom.xml b/micro-flyway-starter/pom.xml index 5da56526..a47318cc 100644 --- a/micro-flyway-starter/pom.xml +++ b/micro-flyway-starter/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-flyway-starter micro-flyway-starter micro-flyway-starter diff --git a/micro-payment/pom.xml b/micro-payment/pom.xml index 0b26cb0c..2c523750 100644 --- a/micro-payment/pom.xml +++ b/micro-payment/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-payment micro-payment Payment module for JMicro framework, supporting balance, WeChat and Alipay payments diff --git a/micro-pic-upload-starter/pom.xml b/micro-pic-upload-starter/pom.xml index 1a56ae5f..8a14aaa1 100644 --- a/micro-pic-upload-starter/pom.xml +++ b/micro-pic-upload-starter/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-pic-upload-starter micro-pic-upload-starter Make it easy to upload picture into oss diff --git a/micro-spring-boot-starter/pom.xml b/micro-spring-boot-starter/pom.xml index 78340c1c..835e3da6 100644 --- a/micro-spring-boot-starter/pom.xml +++ b/micro-spring-boot-starter/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-spring-boot-starter micro-spring-boot-starter micro-spring-boot-starter diff --git a/micro-sql-jooq/pom.xml b/micro-sql-jooq/pom.xml index 72f24bd8..5f595ace 100644 --- a/micro-sql-jooq/pom.xml +++ b/micro-sql-jooq/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-sql-jooq micro-sql-jooq JOOQ sql tools, for page query. diff --git a/micro-test/pom.xml b/micro-test/pom.xml index 0c6dfa7f..88b04e83 100644 --- a/micro-test/pom.xml +++ b/micro-test/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-test micro-test SQL Tools diff --git a/micro-web/pom.xml b/micro-web/pom.xml index 7ee7919f..1e23188d 100644 --- a/micro-web/pom.xml +++ b/micro-web/pom.xml @@ -2,11 +2,7 @@ 4.0.0 - - com.jiangtj.micro - jmicro-aggregator - 0.2.2 - + micro-web micro-web micro-web diff --git a/mvnw b/mvnw index 19529ddf..bd8896bf 100644 --- a/mvnw +++ b/mvnw @@ -19,7 +19,7 @@ # ---------------------------------------------------------------------------- # ---------------------------------------------------------------------------- -# Apache Maven Wrapper startup batch script, version 3.3.2 +# Apache Maven Wrapper startup batch script, version 3.3.4 # # Optional ENV vars # ----------------- @@ -105,14 +105,17 @@ trim() { printf "%s" "${1}" | tr -d '[:space:]' } +scriptDir="$(dirname "$0")" +scriptName="$(basename "$0")" + # parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties while IFS="=" read -r key value; do case "${key-}" in distributionUrl) distributionUrl=$(trim "${value-}") ;; distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; esac -done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" -[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" +done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" case "${distributionUrl##*/}" in maven-mvnd-*bin.*) @@ -130,7 +133,7 @@ maven-mvnd-*bin.*) distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" ;; maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; -*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; esac # apply MVNW_REPOURL and calculate MAVEN_HOME @@ -227,7 +230,7 @@ if [ -n "${distributionSha256Sum-}" ]; then echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 exit 1 elif command -v sha256sum >/dev/null; then - if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then distributionSha256Result=true fi elif command -v shasum >/dev/null; then @@ -252,8 +255,41 @@ if command -v unzip >/dev/null; then else tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" fi -printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" -mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +actualDistributionDir="" + +# First try the expected directory name (for regular distributions) +if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then + if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then + actualDistributionDir="$distributionUrlNameMain" + fi +fi + +# If not found, search for any directory with the Maven executable (for snapshots) +if [ -z "$actualDistributionDir" ]; then + # enable globbing to iterate over items + set +f + for dir in "$TMP_DOWNLOAD_DIR"/*; do + if [ -d "$dir" ]; then + if [ -f "$dir/bin/$MVN_CMD" ]; then + actualDistributionDir="$(basename "$dir")" + break + fi + fi + done + set -f +fi + +if [ -z "$actualDistributionDir" ]; then + verbose "Contents of $TMP_DOWNLOAD_DIR:" + verbose "$(ls -la "$TMP_DOWNLOAD_DIR")" + die "Could not find Maven distribution directory in extracted archive" +fi + +verbose "Found extracted Maven distribution directory: $actualDistributionDir" +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" clean || : exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd index 249bdf38..92450f93 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -19,7 +19,7 @@ @REM ---------------------------------------------------------------------------- @REM ---------------------------------------------------------------------------- -@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM Apache Maven Wrapper startup batch script, version 3.3.4 @REM @REM Optional ENV vars @REM MVNW_REPOURL - repo url base for downloading maven distribution @@ -40,7 +40,7 @@ @SET __MVNW_ARG0_NAME__= @SET MVNW_USERNAME= @SET MVNW_PASSWORD= -@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*) @echo Cannot start maven from wrapper >&2 && exit /b 1 @GOTO :EOF : end batch / begin powershell #> @@ -73,16 +73,30 @@ switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { # apply MVNW_REPOURL and calculate MAVEN_HOME # maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ if ($env:MVNW_REPOURL) { - $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } - $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" + $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')" } $distributionUrlName = $distributionUrl -replace '^.*/','' $distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' -$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" + +$MAVEN_M2_PATH = "$HOME/.m2" if ($env:MAVEN_USER_HOME) { - $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" + $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME" +} + +if (-not (Test-Path -Path $MAVEN_M2_PATH)) { + New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null +} + +$MAVEN_WRAPPER_DISTS = $null +if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) { + $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists" +} else { + $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists" } -$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' + +$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain" +$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' $MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { @@ -134,7 +148,33 @@ if ($distributionSha256Sum) { # unzip and move Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null -Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null + +# Find the actual extracted directory name (handles snapshots where filename != directory name) +$actualDistributionDir = "" + +# First try the expected directory name (for regular distributions) +$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain" +$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD" +if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) { + $actualDistributionDir = $distributionUrlNameMain +} + +# If not found, search for any directory with the Maven executable (for snapshots) +if (!$actualDistributionDir) { + Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object { + $testPath = Join-Path $_.FullName "bin/$MVN_CMD" + if (Test-Path -Path $testPath -PathType Leaf) { + $actualDistributionDir = $_.Name + } + } +} + +if (!$actualDistributionDir) { + Write-Error "Could not find Maven distribution directory in extracted archive" +} + +Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir" +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null try { Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null } catch { diff --git a/pom.xml b/pom.xml index e7deb504..69ad3310 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 com.jiangtj.micro jmicro-aggregator From 6a7f68be90a37967046ba7269844bdec67798755 Mon Sep 17 00:00:00 2001 From: "Mr.J" <116749895@qq.com> Date: Wed, 17 Dec 2025 16:28:21 +0800 Subject: [PATCH 2/7] =?UTF-8?q?build(pom):=20=E5=8D=87=E7=BA=A7=20Maven=20?= =?UTF-8?q?POM=20=E7=89=88=E6=9C=AC=E8=87=B3=204.1.0=20=E5=B9=B6=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E6=97=A7=E4=BE=9D=E8=B5=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将所有模块的 POM XML namespace 从 4.0.0 更新为 4.1.0 - 更新对应的 XSD schema location 至 4.1.0 版本 - 移除 micro-dependencies 模块中的旧版本依赖声明 - 修改 micro-dependencies 的 packaging 类型为 bom - 删除 central 发布相关的 profile 配置 - 统一项目模型版本号至 4.1.0 标准 --- demo-backend/pom.xml | 6 ++-- demo-reactive/pom.xml | 6 ++-- micro-auth-oidc/pom.xml | 6 ++-- micro-auth-wechat/pom.xml | 6 ++-- micro-auth/pom.xml | 6 ++-- micro-common/pom.xml | 6 ++-- micro-dependencies/pom.xml | 51 +++---------------------------- micro-flyway-starter/pom.xml | 6 ++-- micro-payment/pom.xml | 6 ++-- micro-pic-upload-starter/pom.xml | 6 ++-- micro-spring-boot-starter/pom.xml | 6 ++-- micro-sql-jooq/pom.xml | 6 ++-- micro-test/pom.xml | 6 ++-- micro-web/pom.xml | 6 ++-- pom.xml | 7 ----- 15 files changed, 44 insertions(+), 92 deletions(-) diff --git a/demo-backend/pom.xml b/demo-backend/pom.xml index 6cef1de7..bc455dd8 100644 --- a/demo-backend/pom.xml +++ b/demo-backend/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 demo-backend demo-backend diff --git a/demo-reactive/pom.xml b/demo-reactive/pom.xml index 4891046a..e7847f5b 100644 --- a/demo-reactive/pom.xml +++ b/demo-reactive/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 demo-reactive demo-reactive diff --git a/micro-auth-oidc/pom.xml b/micro-auth-oidc/pom.xml index 8c99b535..0d6d707b 100644 --- a/micro-auth-oidc/pom.xml +++ b/micro-auth-oidc/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-auth-oidc micro-auth-oidc diff --git a/micro-auth-wechat/pom.xml b/micro-auth-wechat/pom.xml index 7a8fc524..fcf37939 100644 --- a/micro-auth-wechat/pom.xml +++ b/micro-auth-wechat/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-auth-wechat micro-auth-wechat diff --git a/micro-auth/pom.xml b/micro-auth/pom.xml index cd14135e..eaff0c02 100644 --- a/micro-auth/pom.xml +++ b/micro-auth/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-auth micro-auth diff --git a/micro-common/pom.xml b/micro-common/pom.xml index 6cc7ad7b..79d5146f 100644 --- a/micro-common/pom.xml +++ b/micro-common/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-common micro-common diff --git a/micro-dependencies/pom.xml b/micro-dependencies/pom.xml index beadb087..461e9cb3 100644 --- a/micro-dependencies/pom.xml +++ b/micro-dependencies/pom.xml @@ -1,12 +1,12 @@ - - 4.0.0 + + 4.1.0 + com.jiangtj.micro micro-dependencies - pom - 0.2.2 + bom https://github.com/jiangtj/jmicro micro-dependencies JMicro dependencies pom @@ -90,45 +90,4 @@ - - - - central - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.2.8 - - - sign-artifacts - verify - - sign - - - - - - - --pinentry-mode - loopback - - - - - org.sonatype.central - central-publishing-maven-plugin - 0.9.0 - true - - central - true - - - - - - \ No newline at end of file diff --git a/micro-flyway-starter/pom.xml b/micro-flyway-starter/pom.xml index a47318cc..515ac3b4 100644 --- a/micro-flyway-starter/pom.xml +++ b/micro-flyway-starter/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-flyway-starter micro-flyway-starter diff --git a/micro-payment/pom.xml b/micro-payment/pom.xml index 2c523750..ff5a2c70 100644 --- a/micro-payment/pom.xml +++ b/micro-payment/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-payment micro-payment diff --git a/micro-pic-upload-starter/pom.xml b/micro-pic-upload-starter/pom.xml index 8a14aaa1..6658e1e7 100644 --- a/micro-pic-upload-starter/pom.xml +++ b/micro-pic-upload-starter/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-pic-upload-starter micro-pic-upload-starter diff --git a/micro-spring-boot-starter/pom.xml b/micro-spring-boot-starter/pom.xml index 835e3da6..3c6d3cc7 100644 --- a/micro-spring-boot-starter/pom.xml +++ b/micro-spring-boot-starter/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-spring-boot-starter micro-spring-boot-starter diff --git a/micro-sql-jooq/pom.xml b/micro-sql-jooq/pom.xml index 5f595ace..512ae7dd 100644 --- a/micro-sql-jooq/pom.xml +++ b/micro-sql-jooq/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-sql-jooq micro-sql-jooq diff --git a/micro-test/pom.xml b/micro-test/pom.xml index 88b04e83..b63e508a 100644 --- a/micro-test/pom.xml +++ b/micro-test/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-test micro-test diff --git a/micro-web/pom.xml b/micro-web/pom.xml index 1e23188d..30119b11 100644 --- a/micro-web/pom.xml +++ b/micro-web/pom.xml @@ -1,7 +1,7 @@ - - 4.0.0 + + 4.1.0 micro-web micro-web diff --git a/pom.xml b/pom.xml index 69ad3310..25da6b30 100644 --- a/pom.xml +++ b/pom.xml @@ -169,13 +169,6 @@ - - com.jiangtj.micro - micro-dependencies - 0.2.2 - pom - import - org.jspecify jspecify From 5e661e60daf7ab6395005a6177eb5cd2aac7a237 Mon Sep 17 00:00:00 2001 From: "Mr.J" <116749895@qq.com> Date: Wed, 17 Dec 2025 16:48:16 +0800 Subject: [PATCH 3/7] =?UTF-8?q?chore(deps):=20=E6=9B=B4=E6=96=B0=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除项目URL、许可证、开发者及SCM信息配置 - 统一将所有模块依赖版本号替换为引用父项目版本号 - 简化依赖管理配置结构，提高可维护性 --- micro-dependencies/pom.xml | 44 ++++++++++---------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/micro-dependencies/pom.xml b/micro-dependencies/pom.xml index 461e9cb3..3b12673f 100644 --- a/micro-dependencies/pom.xml +++ b/micro-dependencies/pom.xml @@ -4,89 +4,67 @@ 4.1.0 - com.jiangtj.micro micro-dependencies bom - https://github.com/jiangtj/jmicro micro-dependencies JMicro dependencies pom - - - GNU Lesser General Public License v2.1 - https://raw.githubusercontent.com/jiangtj/jmicro/master/LICENSE - - - - - - Mr.J - 116749895@qq.com - - - - - scm:git:git://github.com/jiangtj/jmicro.git - scm:git:ssh://github.com:jiangtj/jmicro.git - https://github.com/jiangtj/jmicro/tree/master - - com.jiangtj.micro micro-auth - 0.2.2 + ${project.version} com.jiangtj.micro micro-auth-wechat - 0.2.2 + ${project.version} com.jiangtj.micro micro-auth-oidc - 0.2.2 + ${project.version} com.jiangtj.micro micro-common - 0.2.2 + ${project.version} com.jiangtj.micro micro-web - 0.2.2 + ${project.version} com.jiangtj.micro micro-spring-boot-starter - 0.2.2 + ${project.version} com.jiangtj.micro micro-sql-jooq - 0.2.2 + ${project.version} com.jiangtj.micro micro-test - 0.2.2 + ${project.version} com.jiangtj.micro micro-pic-upload-starter - 0.2.2 + ${project.version} com.jiangtj.micro micro-flyway-starter - 0.2.2 + ${project.version} com.jiangtj.micro micro-payment - 0.2.2 + ${project.version} From 868a37bfc81222cfa045719343300e4065479992 Mon Sep 17 00:00:00 2001 From: "Mr.J" <116749895@qq.com> Date: Wed, 17 Dec 2025 17:09:45 +0800 Subject: [PATCH 4/7] =?UTF-8?q?chore(ci):=20=E6=9B=B4=E6=96=B0Maven?= =?UTF-8?q?=E6=89=93=E5=8C=85=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将GitHub Actions工作流中的`mvn package`命令替换为`./mvnw package` - 确保使用项目本地的Maven包装器进行构建 - 跳过测试执行以加快CI流程 --- .github/workflows/mvn-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mvn-test.yml b/.github/workflows/mvn-test.yml index 73d1490a..3cefd5dc 100644 --- a/.github/workflows/mvn-test.yml +++ b/.github/workflows/mvn-test.yml @@ -59,4 +59,4 @@ jobs: distribution: 'temurin' cache: maven - name: Package with Maven - run: mvn package -Dmaven.test.skip=true + run: ./mvnw package -Dmaven.test.skip=true From 2617554b8e16569c028ca36135e839074a6eb45a Mon Sep 17 00:00:00 2001 From: "Mr.J" <116749895@qq.com> Date: Wed, 17 Dec 2025 17:10:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?ci(mvn-test):=20=E6=9B=B4=E6=96=B0Maven?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将mvn test更改为./mvnw test以使用Maven Wrapper - 确保构建环境一致性 - 避免因系统Maven版本差异导致的问题 --- .github/workflows/mvn-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mvn-test.yml b/.github/workflows/mvn-test.yml index 3cefd5dc..2cbb35b7 100644 --- a/.github/workflows/mvn-test.yml +++ b/.github/workflows/mvn-test.yml @@ -33,7 +33,7 @@ jobs: distribution: 'temurin' cache: maven - name: Test with Maven - run: mvn test + run: ./mvnw test - name: Publish Test Results uses: EnricoMi/publish-unit-test-result-action@v2 if: always() From 4cbd2b8ea77b3be102c5038d4f0b9c6e6353bcd6 Mon Sep 17 00:00:00 2001 From: "Mr.J" <116749895@qq.com> Date: Wed, 17 Dec 2025 17:18:52 +0800 Subject: [PATCH 6/7] =?UTF-8?q?chore(ci):=20=E4=B8=BAMaven=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=84=9A=E6=9C=AC=E6=B7=BB=E5=8A=A0=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在GitHub Actions工作流中为mvnw脚本添加chmod +x命令 - 确保Maven包装器脚本具有可执行权限后再运行测试 - 修复可能因权限不足导致的测试执行失败问题 --- .github/workflows/mvn-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/mvn-test.yml b/.github/workflows/mvn-test.yml index 2cbb35b7..e79a3dac 100644 --- a/.github/workflows/mvn-test.yml +++ b/.github/workflows/mvn-test.yml @@ -33,7 +33,9 @@ jobs: distribution: 'temurin' cache: maven - name: Test with Maven - run: ./mvnw test + run: | + chmod +x ./mvnw + ./mvnw test - name: Publish Test Results uses: EnricoMi/publish-unit-test-result-action@v2 if: always() From 34260defcc5d17b1fec419e97055a9e57054c1ab Mon Sep 17 00:00:00 2001 From: "Mr.J" <116749895@qq.com> Date: Tue, 30 Dec 2025 11:00:34 +0800 Subject: [PATCH 7/7] =?UTF-8?q?build(workflow):=20=E4=BF=AE=E5=A4=8DMaven?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E4=B8=AD=E7=9A=84=E6=9D=83=E9=99=90?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在所有工作流中添加chmod +x ./mvnw命令确保执行权限 - 修复jekyll-gh-pages工作流中的Maven命令执行方式 - 修复mvn-deploy工作流中的Maven命令执行方式 - 修复mvn-deploy-central-test工作流中的Maven命令执行方式 - 修复mvn-test工作流中的Maven命令执行方式 - 统一所有工作流中的Maven命令为多行执行格式 --- .github/workflows/jekyll-gh-pages.yml | 8 ++++++-- .github/workflows/mvn-deploy-central-test.yml | 4 +++- .github/workflows/mvn-deploy.yml | 8 ++++++-- .github/workflows/mvn-test.yml | 4 +++- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index 2658fe49..6b147300 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -46,9 +46,13 @@ jobs: distribution: 'temurin' cache: maven - name: Install Dependencies Local - run: mvn install -P lib + run: | + chmod +x ./mvnw + ./mvnw install -P lib - name: Build Maven Site - run: mvn site + run: | + chmod +x ./mvnw + ./mvnw site - name: Move site to pages artifact dir run: | mv ./micro-common/target/site ./temp_site/micro-common diff --git a/.github/workflows/mvn-deploy-central-test.yml b/.github/workflows/mvn-deploy-central-test.yml index 829cc7a9..27050149 100644 --- a/.github/workflows/mvn-deploy-central-test.yml +++ b/.github/workflows/mvn-deploy-central-test.yml @@ -23,7 +23,9 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Publish to Apache Maven Central - run: mvn deploy -P central,lib + run: | + chmod +x ./mvnw + ./mvnw deploy -P central,lib env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} diff --git a/.github/workflows/mvn-deploy.yml b/.github/workflows/mvn-deploy.yml index 5671b502..49d991d4 100644 --- a/.github/workflows/mvn-deploy.yml +++ b/.github/workflows/mvn-deploy.yml @@ -24,9 +24,13 @@ jobs: gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase - name: Test with Maven - run: mvn test + run: | + chmod +x ./mvnw + ./mvnw test - name: Publish to Apache Maven Central - run: mvn deploy -P central,lib + run: | + chmod +x ./mvnw + ./mvnw deploy -P central,lib env: MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }} diff --git a/.github/workflows/mvn-test.yml b/.github/workflows/mvn-test.yml index e79a3dac..cb608abc 100644 --- a/.github/workflows/mvn-test.yml +++ b/.github/workflows/mvn-test.yml @@ -61,4 +61,6 @@ jobs: distribution: 'temurin' cache: maven - name: Package with Maven - run: ./mvnw package -Dmaven.test.skip=true + run: | + chmod +x ./mvnw + ./mvnw package -Dmaven.test.skip=true