diff --git a/.gitignore b/.gitignore index e6968b8..5fdc48a 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ build/ /jap-mfa/pom.xml.versionsBackup /docs/bin/codecov.sh /jap-ids/pom.xml.versionsBackup +/jap-bom/pom.xml.versionsBackup diff --git a/README.md b/README.md index 02224cc..c604ff8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@

- + diff --git a/docs/bin/repVersion.sh b/docs/bin/repVersion.sh index c4b3951..1fe2dda 100644 --- a/docs/bin/repVersion.sh +++ b/docs/bin/repVersion.sh @@ -10,7 +10,7 @@ echo "当前路径:$pwd" if [ -n "$1" ];then new_version="$1" old_version=`cat $pwd/docs/bin/version.txt` - echo "$old_version 替换为新版本 $new_version" + echo "将项目版本 v$old_version 修改为 v$new_version" else # 参数错误,退出 echo "ERROR: 请指定新版本!" @@ -22,9 +22,14 @@ if [ ! -n "$old_version" ]; then exit fi -# 替换README.md等文件中的版本 +echo "替换 $pwd/README.md" sed -i "s/${old_version}/${new_version}/g" $pwd/README.md +echo "替换 $pwd/README.en.md" sed -i "s/${old_version}/${new_version}/g" $pwd/README.en.md +echo "替换 $pwd/jap-bom/pom.xml" +sed -i "s/${old_version}/${new_version}/g" $pwd/jap-bom/pom.xml +echo "替换 $pwd/pom.xml" +sed -i "s/${old_version}/${new_version}/g" $pwd/pom.xml # 保留新版本号 echo "$new_version" > $pwd/docs/bin/version.txt diff --git a/docs/bin/updVersion.sh b/docs/bin/updVersion.sh index 95144f2..79e60bd 100644 --- a/docs/bin/updVersion.sh +++ b/docs/bin/updVersion.sh @@ -13,7 +13,7 @@ if [ ! -n "$1" ]; then fi # 替换所有模块pom.xml中的版本 -mvn versions:set -DnewVersion=$1 +#mvn versions:set -DnewVersion=$1 # 替换其它地方的版本 source $(pwd)/docs/bin/repVersion.sh "$1" diff --git a/docs/bin/version.txt b/docs/bin/version.txt index 7dea76e..6d7de6e 100644 --- a/docs/bin/version.txt +++ b/docs/bin/version.txt @@ -1 +1 @@ -1.0.1 +1.0.2 diff --git a/jap-bom/pom.xml b/jap-bom/pom.xml index 76ef4c4..5d8e1ea 100644 --- a/jap-bom/pom.xml +++ b/jap-bom/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.fujieid jap-bom - ${revision} + ${jap.version} ${project.artifactId} pom @@ -14,7 +14,7 @@ - 1.0.1 + 1.0.2-SNAPSHOT 4.13.1 2.23.4 @@ -37,42 +37,42 @@ com.fujieid jap-core - ${revision} + ${jap.version} com.fujieid jap-simple - ${revision} + ${jap.version} com.fujieid jap-social - ${revision} + ${jap.version} com.fujieid jap-oauth2 - ${revision} + ${jap.version} com.fujieid jap-sso - ${revision} + ${jap.version} com.fujieid jap-oidc - ${revision} + ${jap.version} com.fujieid jap-mfa - ${revision} + ${jap.version} com.fujieid jap-ids - ${revision} + ${jap.version} diff --git a/jap-core/pom.xml b/jap-core/pom.xml index eea49ff..8bdb044 100644 --- a/jap-core/pom.xml +++ b/jap-core/pom.xml @@ -5,7 +5,7 @@ com.fujieid jap - ${revision} + ${jap.version} 4.0.0 diff --git a/jap-ids/pom.xml b/jap-ids/pom.xml index 75d7cf7..3b1ade0 100644 --- a/jap-ids/pom.xml +++ b/jap-ids/pom.xml @@ -5,7 +5,7 @@ com.fujieid jap - ${revision} + ${jap.version} 4.0.0 diff --git a/jap-mfa/pom.xml b/jap-mfa/pom.xml index a7b9b32..8abbbe2 100644 --- a/jap-mfa/pom.xml +++ b/jap-mfa/pom.xml @@ -5,7 +5,7 @@ com.fujieid jap - ${revision} + ${jap.version} 4.0.0 diff --git a/jap-oauth2/pom.xml b/jap-oauth2/pom.xml index a074eab..ac8a6cd 100644 --- a/jap-oauth2/pom.xml +++ b/jap-oauth2/pom.xml @@ -5,7 +5,7 @@ com.fujieid jap - ${revision} + ${jap.version} 4.0.0 diff --git a/jap-oidc/pom.xml b/jap-oidc/pom.xml index fdf5240..a8a5e45 100644 --- a/jap-oidc/pom.xml +++ b/jap-oidc/pom.xml @@ -5,7 +5,7 @@ com.fujieid jap - ${revision} + ${jap.version} 4.0.0 diff --git a/jap-simple/pom.xml b/jap-simple/pom.xml index e429122..bd1cd9b 100644 --- a/jap-simple/pom.xml +++ b/jap-simple/pom.xml @@ -5,7 +5,7 @@ com.fujieid jap - ${revision} + ${jap.version} 4.0.0 diff --git a/jap-social/pom.xml b/jap-social/pom.xml index 6d4cc6f..d3c7278 100644 --- a/jap-social/pom.xml +++ b/jap-social/pom.xml @@ -5,7 +5,7 @@ com.fujieid jap - ${revision} + ${jap.version} 4.0.0 diff --git a/jap-sso/pom.xml b/jap-sso/pom.xml index 3f92038..c481c77 100644 --- a/jap-sso/pom.xml +++ b/jap-sso/pom.xml @@ -5,7 +5,7 @@ com.fujieid jap - ${revision} + ${jap.version} 4.0.0 diff --git a/pom.xml b/pom.xml index cd52344..d401cc1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.fujieid jap - ${revision} + ${jap.version} pom jap @@ -52,7 +52,7 @@ - 1.0.1 + 1.0.2-SNAPSHOT UTF-8 1.8 1.8 @@ -134,7 +134,7 @@ com.fujieid jap-bom - ${revision} + ${jap.version} pom import