Skip to content

Commit

Permalink
Upgrade to 2.0.0-ALPHA.1 (alibaba#4410)
Browse files Browse the repository at this point in the history 
* Add some new server config parameters

* Upgrade to 2.0.0-ALPHA.1
  • Loading branch information
@KomachiSion
KomachiSion authored Dec 4, 2020
1 parent 123d5f0 commit 93a3ac7
Show file tree
Hide file tree
Showing 18 changed files with 30 additions and 18 deletions.
2 changes: 1 addition & 1 deletion address/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>nacos-all</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion auth/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.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
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion cmdb/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<artifactId>nacos-all</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion config/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion consistency/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<relativePath>../pom.xml</relativePath>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion console/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
</parent>
<artifactId>nacos-console</artifactId>
<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
12 changes: 12 additions & 0 deletions distribution/conf/application.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,18 @@ nacos.naming.empty-service.auto-clean=true
nacos.naming.empty-service.clean.initial-delay-ms=50000
nacos.naming.empty-service.clean.period-time-ms=30000

### Add in 2.0.0
### The interval to clean empty service
# nacos.naming.clean.empty-service.interval=60000

### The expired time to clean empty service
# nacos.naming.clean.empty-service.expired-time=60000

### The interval to clean expired metadata
# nacos.naming.clean.expired-metadata.interval=5000

### The expired time to clean metadata
# nacos.naming.clean.expired-metadata.expired-time=60000

#*************** CMDB Module Related Configurations ***************#
### The interval to dump external CMDB in seconds:
Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion example/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion istio/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<parent>
<artifactId>nacos-all</artifactId>
<groupId>com.alibaba.nacos</groupId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion naming/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<inceptionYear>2018</inceptionYear>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
<packaging>pom</packaging>

<name>Alibaba NACOS ${project.version}</name>
Expand All @@ -36,7 +36,7 @@
<url>[email protected]:alibaba/nacos.git</url>
<connection>scm:[email protected]:alibaba/nacos.git</connection>
<developerConnection>scm:[email protected]:alibaba/nacos.git</developerConnection>
<tag>nacos-all-2.0.0-SNAPSHOT</tag>
<tag>nacos-all-2.0.0-ALPHA.1</tag>
</scm>

<mailingLists>
Expand Down
2 changes: 1 addition & 1 deletion sys/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.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
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-all</artifactId>
<version>2.0.0-SNAPSHOT</version>
<version>2.0.0-ALPHA.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down

0 comments on commit 93a3ac7

Please sign in to comment.