Skip to content

Fix version 521 #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 58 commits into from
Aug 2, 2019
Merged

Fix version 521 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
75964e0
fix temp push
Apr 3, 2019
6e87537
merge alipay master
Synex-wh Apr 12, 2019
ebce157
update version 5.2.1-SNAPSHOT
Apr 12, 2019
78ac837
Merge pull request #2 from Synex-wh/fix_version
Synex-wh Apr 12, 2019
6627a4e
merge master
Apr 12, 2019
c21270d
Merge pull request #3 from Synex-wh/fix_temporary_push_bug
Synex-wh Apr 22, 2019
4a60420
Merge remote-tracking branch 'upstream/master'
Apr 22, 2019
5241284
fix test case
Apr 24, 2019
d4b76dc
Merge branch 'master' of github.com:alipay/sofa-registry
Apr 29, 2019
69d18e3
fix jetty version,and fix rest api for dataInfoIds
Apr 29, 2019
2bd6ee5
fix hashcode test
Apr 29, 2019
4142761
Merge pull request #4 from Synex-wh/upgrade_jetty_version
Synex-wh Apr 29, 2019
3c509f1
Merge branch 'master' of github.com:alipay/sofa-registry
May 10, 2019
cebae41
fix working to init bug
May 10, 2019
85b42a3
fix start task log
May 10, 2019
c055282
fix Watcher can't get providate data,retry and finally return new
May 14, 2019
b187bd7
add data server list api
May 14, 2019
b3714e5
add server list api
May 19, 2019
566fd1b
remove log
May 20, 2019
a312558
fix isssue 21
May 20, 2019
079399d
add query by id function
May 20, 2019
2c06a39
fix issue 22
May 20, 2019
f03183b
delay client off process and sync data process to working status
May 21, 2019
ab3e21d
fix data connet meta error
May 21, 2019
5e616d6
Merge branch 'fix_issue19' into fix_issue20
May 21, 2019
cd50033
Merge branch 'fix_issue20' into fix_issue21
May 21, 2019
bbdf60a
Merge branch 'fix_issue21' into fix_issue22
May 21, 2019
6f7565b
Merge branch 'fix_issue22' into fix_issue23
May 21, 2019
8ec146a
Merge branch 'fix_issue23' into fix_issue24
May 21, 2019
6944621
fix inject NotifyDataSyncHandler
May 22, 2019
93fa77d
fix start log
May 23, 2019
1b9f0e6
add send sub log
May 28, 2019
6c829ef
fix subscriber to send log
May 28, 2019
c3d9a3e
fix word cache clientid
Jun 3, 2019
a51d204
add clientoff delay time
Jun 26, 2019
061b612
fix clientOffDelayMs
Jul 3, 2019
eac93e1
fix jetty version
Jul 30, 2019
e967bf6
fix version to 5.2.1 release
Jul 30, 2019
e4b948b
fix version to 5.2.1 for release
Jul 30, 2019
4e42610
fix version
Jul 30, 2019
584b945
fix .travis.yml
Jul 30, 2019
7311f76
fix test case
Jul 30, 2019
d3b4ff1
fix
Jul 30, 2019
fd0a8e6
fix test sync case
Jul 30, 2019
ff07c4b
fix test case
Jul 31, 2019
f8652c4
fix test case
Jul 31, 2019
f460da6
fix case
Jul 31, 2019
764be64
fix notify online no connect break,and add connect log
Jul 31, 2019
31af7c7
add test case
Aug 1, 2019
dd94ace
add test case
Aug 1, 2019
eddebb9
fix test case
Aug 1, 2019
be930f9
fix format
Aug 1, 2019
d518595
fix resource test case
Aug 1, 2019
f703650
fix
Aug 1, 2019
ee6da97
Merge branch 'fix_issue24' into fix_version_521
Aug 1, 2019
def0e84
Merge remote-tracking branch 'upstream/master' into fix_version_521
Aug 2, 2019
b1398e8
remove data numberOfReplicas
Aug 2, 2019
8833468
fix jraft version 1.2.5
Aug 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/all/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.alipay.sofa</groupId>
<artifactId>registry-client-all</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>

<name>${project.groupId}:${project.artifactId}</name>
<url>http://github.com/alipay/sofa-registry</url>
Expand Down
2 changes: 1 addition & 1 deletion client/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-client-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion client/impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-client-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion client/log/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-client-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<packaging>pom</packaging>

<name>${project.groupId}:${project.artifactId}</name>
Expand Down Expand Up @@ -75,7 +75,7 @@
<lookout.version>1.5.2</lookout.version>
<mockito.version>1.10.19</mockito.version>
<powermock.version>1.6.6</powermock.version>
<jraft.version>1.2.4</jraft.version>
<jraft.version>1.2.5</jraft.version>
<metrics.version>4.0.2</metrics.version>
<commons-io.version>2.4</commons-io.version>
<jetty.version>[9.4.17.v20190418,9.4.19.v20190610]</jetty.version>
Expand Down
2 changes: 1 addition & 1 deletion server/common/model/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-common</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/common/util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-common</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/consistency/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
3 changes: 1 addition & 2 deletions server/distribution/data/conf/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
nodes.metaNode=DefaultDataCenter:localhost
nodes.localDataCenter=DefaultDataCenter
data.server.numberOfReplicas=1
nodes.localDataCenter=DefaultDataCenter
2 changes: 1 addition & 1 deletion server/distribution/data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-distribution</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/distribution/integration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-distribution</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/distribution/meta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-distribution</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/distribution/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/distribution/session/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-distribution</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion server/remoting/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-remoting</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/remoting/bolt/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-remoting</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/remoting/http/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-remoting</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/remoting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/server/data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/server/integration/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/server/meta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/server/session/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/store/api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-store</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion server/store/jraft/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-store</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion server/store/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-server-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.alipay.sofa</groupId>
<artifactId>registry-parent</artifactId>
<version>5.2.1-SNAPSHOT</version>
<version>5.2.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down