From 22a57115e708639193ead673da2a60b0ee749d62 Mon Sep 17 00:00:00 2001 From: Zhang Peng Date: Fri, 19 Jan 2018 18:26:35 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=B7=BB=E5=8A=A0=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E7=9A=84=E8=84=9A=E6=9C=AC=EF=BC=9B=E6=95=B4=E7=90=86=E6=9C=AC?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=9B?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86=20springframwork=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + codes/core/pom.xml | 2 +- codes/data/jdbc/pom.xml | 2 +- codes/data/orm/pom.xml | 2 +- codes/data/pom.xml | 2 +- codes/example/helloworld/pom.xml | 2 +- codes/example/pom.xml | 2 +- codes/integration/api/pom.xml | 2 +- codes/integration/cache/pom.xml | 2 +- codes/integration/libs/pom.xml | 2 +- codes/integration/pom.xml | 2 +- codes/integration/rmi/client/pom.xml | 2 +- codes/integration/rmi/pom.xml | 2 +- codes/integration/rmi/server/pom.xml | 2 +- codes/integration/rpc/api/pom.xml | 2 +- codes/integration/rpc/consumer/pom.xml | 2 +- codes/integration/rpc/pom.xml | 4 +- codes/integration/rpc/provider/pom.xml | 2 +- codes/integration/scheduler/pom.xml | 2 +- codes/parent/pom.xml | 100 ++----------------------- codes/pom.xml | 2 +- codes/security/pom.xml | 2 +- codes/security/shiro/pom.xml | 2 +- codes/web/mvc/pom.xml | 2 +- codes/web/pom.xml | 2 +- codes/web/websocket/pom.xml | 2 +- scripts/version.bat | 7 ++ 27 files changed, 41 insertions(+), 117 deletions(-) create mode 100644 scripts/version.bat diff --git a/.gitignore b/.gitignore index 76e97fd1..455cd2c1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ logs *.class *.jar *.war +*.versionsBackup ################ JAVASCRIPT ################ diff --git a/codes/core/pom.xml b/codes/core/pom.xml index 5055fdff..8932a35a 100644 --- a/codes/core/pom.xml +++ b/codes/core/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../parent diff --git a/codes/data/jdbc/pom.xml b/codes/data/jdbc/pom.xml index 8005d4ee..b7c1fe63 100644 --- a/codes/data/jdbc/pom.xml +++ b/codes/data/jdbc/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/data/orm/pom.xml b/codes/data/orm/pom.xml index 2f26ebda..ed41da18 100644 --- a/codes/data/orm/pom.xml +++ b/codes/data/orm/pom.xml @@ -14,7 +14,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/data/pom.xml b/codes/data/pom.xml index 7d976061..d02217cd 100644 --- a/codes/data/pom.xml +++ b/codes/data/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../parent diff --git a/codes/example/helloworld/pom.xml b/codes/example/helloworld/pom.xml index 55cc3bc7..409c9b9d 100644 --- a/codes/example/helloworld/pom.xml +++ b/codes/example/helloworld/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/example/pom.xml b/codes/example/pom.xml index 09fbe220..b96137e0 100644 --- a/codes/example/pom.xml +++ b/codes/example/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../parent diff --git a/codes/integration/api/pom.xml b/codes/integration/api/pom.xml index 4cc0110c..65d33a3c 100644 --- a/codes/integration/api/pom.xml +++ b/codes/integration/api/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/integration/cache/pom.xml b/codes/integration/cache/pom.xml index 58abc265..e1d772d3 100644 --- a/codes/integration/cache/pom.xml +++ b/codes/integration/cache/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/integration/libs/pom.xml b/codes/integration/libs/pom.xml index 78cc0e4e..0f84f1c8 100644 --- a/codes/integration/libs/pom.xml +++ b/codes/integration/libs/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/integration/pom.xml b/codes/integration/pom.xml index 07a1e5d5..6db74925 100644 --- a/codes/integration/pom.xml +++ b/codes/integration/pom.xml @@ -9,7 +9,7 @@ io.github.dunwu spring-notes-integration - ${spring.notes.version} + 1.0.2 pom diff --git a/codes/integration/rmi/client/pom.xml b/codes/integration/rmi/client/pom.xml index 69e2ea4a..52c53c80 100644 --- a/codes/integration/rmi/client/pom.xml +++ b/codes/integration/rmi/client/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/integration/rmi/pom.xml b/codes/integration/rmi/pom.xml index 77c86595..66227632 100644 --- a/codes/integration/rmi/pom.xml +++ b/codes/integration/rmi/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/integration/rmi/server/pom.xml b/codes/integration/rmi/server/pom.xml index 10dc0f3a..5d28c593 100644 --- a/codes/integration/rmi/server/pom.xml +++ b/codes/integration/rmi/server/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../../parent diff --git a/codes/integration/rpc/api/pom.xml b/codes/integration/rpc/api/pom.xml index 074356f9..77430d99 100644 --- a/codes/integration/rpc/api/pom.xml +++ b/codes/integration/rpc/api/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../../parent diff --git a/codes/integration/rpc/consumer/pom.xml b/codes/integration/rpc/consumer/pom.xml index dffc9497..0b09b635 100644 --- a/codes/integration/rpc/consumer/pom.xml +++ b/codes/integration/rpc/consumer/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../../parent diff --git a/codes/integration/rpc/pom.xml b/codes/integration/rpc/pom.xml index 9f573b5e..88b77f7b 100644 --- a/codes/integration/rpc/pom.xml +++ b/codes/integration/rpc/pom.xml @@ -9,7 +9,7 @@ io.github.dunwu spring-notes-integration-rpc - ${spring.notes.version} + 1.0.3 pom @@ -17,7 +17,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/integration/rpc/provider/pom.xml b/codes/integration/rpc/provider/pom.xml index 16da50b6..c106445e 100644 --- a/codes/integration/rpc/provider/pom.xml +++ b/codes/integration/rpc/provider/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../../parent diff --git a/codes/integration/scheduler/pom.xml b/codes/integration/scheduler/pom.xml index 7448e7a0..c88d5125 100644 --- a/codes/integration/scheduler/pom.xml +++ b/codes/integration/scheduler/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/parent/pom.xml b/codes/parent/pom.xml index 404f6c58..7dc8b237 100644 --- a/codes/parent/pom.xml +++ b/codes/parent/pom.xml @@ -9,7 +9,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 pom @@ -26,6 +26,13 @@ + + org.springframework + spring-framework-bom + ${spring.version} + pom + import + net.sf.ehcache @@ -266,95 +273,6 @@ - - - org.springframework - spring-aop - ${spring.version} - - - org.springframework - spring-aspects - ${spring.version} - - - org.springframework - spring-beans - ${spring.version} - - - org.springframework - spring-context - ${spring.version} - - - org.springframework - spring-context-support - ${spring.version} - - - org.springframework - spring-core - ${spring.version} - - - org.springframework - spring-expression - ${spring.version} - - - org.springframework - spring-jdbc - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.springframework - spring-messaging - ${spring.version} - - - org.springframework - spring-orm - ${spring.version} - - - org.springframework - spring-oxm - ${spring.version} - - - org.springframework - spring-tx - ${spring.version} - - - org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-webmvc - ${spring.version} - - - org.springframework - spring-websocket - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - test - - - org.springframework.data @@ -430,8 +348,6 @@ ${java.version} ${java.version} - 1.0.2 - 9.3.2.v20150730 5.0.2.RELEASE diff --git a/codes/pom.xml b/codes/pom.xml index 8da18ab5..5f9befd5 100644 --- a/codes/pom.xml +++ b/codes/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 parent diff --git a/codes/security/pom.xml b/codes/security/pom.xml index f57365f8..d3e2249e 100644 --- a/codes/security/pom.xml +++ b/codes/security/pom.xml @@ -16,7 +16,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../parent diff --git a/codes/security/shiro/pom.xml b/codes/security/shiro/pom.xml index 4a4c9cef..ca88012d 100644 --- a/codes/security/shiro/pom.xml +++ b/codes/security/shiro/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/web/mvc/pom.xml b/codes/web/mvc/pom.xml index 19858cd5..ab80b01d 100644 --- a/codes/web/mvc/pom.xml +++ b/codes/web/mvc/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/codes/web/pom.xml b/codes/web/pom.xml index 7cb85b9c..286039e8 100644 --- a/codes/web/pom.xml +++ b/codes/web/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../parent diff --git a/codes/web/websocket/pom.xml b/codes/web/websocket/pom.xml index 752a4522..48e2661c 100644 --- a/codes/web/websocket/pom.xml +++ b/codes/web/websocket/pom.xml @@ -15,7 +15,7 @@ io.github.dunwu spring-notes-parent - ${spring.notes.version} + 1.0.3 ../../parent diff --git a/scripts/version.bat b/scripts/version.bat new file mode 100644 index 00000000..361e94d7 --- /dev/null +++ b/scripts/version.bat @@ -0,0 +1,7 @@ +@echo off + +echo 修改项目版本号 +cd ../codes/parent +mvn versions:set -DnewVersion=1.0.3 +cd ../../scripts +pause