diff --git a/broker/config/git.properties b/broker/config/git.properties index c24d40cfa..d8ec57bc0 100644 --- a/broker/config/git.properties +++ b/broker/config/git.properties @@ -1,15 +1,15 @@ #Generated by Git-Commit-Id-Plugin -#Wed Apr 03 13:44:55 CST 2019 -git.commit.id.abbrev=0f15a38 +#Wed Apr 03 15:25:25 CST 2019 +git.commit.id.abbrev=cc82c5b git.commit.user.email=heavyrain.lee@gmail.com -git.commit.message.full=优化部分逻辑\n -git.commit.id=0f15a3840e277b2cb25587fee188edbca8762bef -git.commit.message.short=优化部分逻辑 +git.commit.message.full=update version to 0.1.1\n +git.commit.id=cc82c5b420061994bc0621e807bb6c961370aef2 +git.commit.message.short=update version to 0.1.1 git.commit.user.name=heavyrain2012 git.build.user.name=heavyrain2012 -git.commit.id.describe=0f15a38 +git.commit.id.describe=0.1.1-dirty git.build.user.email=heavyrain.lee@gmail.com git.branch=wildfirechat -git.commit.time=20190402225529 -git.build.time=20190403134455 +git.commit.time=20190403134707 +git.build.time=20190403152525 git.remote.origin.url=https\://github.com/wildfirechat/server.git diff --git a/broker/pom.xml b/broker/pom.xml index 2bb98dca9..ebcd91536 100755 --- a/broker/pom.xml +++ b/broker/pom.xml @@ -5,7 +5,7 @@ ../ wildfirechat-parent cn.wildfirechat - 0.10 + 0.11 moquette-broker @@ -37,12 +37,6 @@ ${project.version} - - cn.wildfirechat - wildfirechat-server - ${project.version} - - log4j diff --git a/client/pom.xml b/client/pom.xml index 8ae43ff5d..fff3e2ec3 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -3,9 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + ../ wildfirechat-parent cn.wildfirechat - 0.10 + 0.11 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index 6f053f351..fdbf10a77 100755 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -6,7 +6,7 @@ wildfirechat-parent cn.wildfirechat - 0.10 + 0.11 distribution diff --git a/distribution/src/main/resources/git.properties b/distribution/src/main/resources/git.properties index f8188922d..2b98c6707 100644 --- a/distribution/src/main/resources/git.properties +++ b/distribution/src/main/resources/git.properties @@ -1,15 +1,15 @@ #Generated by Git-Commit-Id-Plugin -#Wed Apr 03 13:44:58 CST 2019 -git.commit.id.abbrev=0f15a38 +#Wed Apr 03 15:25:29 CST 2019 +git.commit.id.abbrev=cc82c5b git.commit.user.email=heavyrain.lee@gmail.com -git.commit.message.full=优化部分逻辑\n -git.commit.id=0f15a3840e277b2cb25587fee188edbca8762bef -git.commit.message.short=优化部分逻辑 +git.commit.message.full=update version to 0.1.1\n +git.commit.id=cc82c5b420061994bc0621e807bb6c961370aef2 +git.commit.message.short=update version to 0.1.1 git.commit.user.name=heavyrain2012 git.build.user.name=heavyrain2012 -git.commit.id.describe=0f15a38-dirty +git.commit.id.describe=0.1.1-dirty git.build.user.email=heavyrain.lee@gmail.com git.branch=wildfirechat -git.commit.time=20190402225529 -git.build.time=20190403134458 +git.commit.time=20190403134707 +git.build.time=20190403152529 git.remote.origin.url=https\://github.com/wildfirechat/server.git diff --git a/pom.xml b/pom.xml index e4c8f0ec9..2620bd331 100755 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ wildfirechat-parent pom - 0.1.1 + 0.11 Wildfire Chat Wildfire Chat Server 2018 diff --git a/wildfire_jmeter/pom.xml b/wildfire_jmeter/pom.xml index 5ec61e1ad..6d156e089 100755 --- a/wildfire_jmeter/pom.xml +++ b/wildfire_jmeter/pom.xml @@ -5,7 +5,7 @@ ../ wildfirechat-parent cn.wildfirechat - 0.10 + 0.11 net.xmeter