bump to 2.0.0 and drop java 1.7 support

.github/workflows/build.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [7, 8, 11]
+        jdk: [8, 11]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK
@@ -42,9 +42,6 @@ jobs:
         path: ~/.m2
         key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-m2
-    - name: Build SDK with JDK 7
-      if: matrix.jdk == '7'
-      run: mvn clean compile -pl apollo-client,apollo-mockserver,apollo-openapi -am -Dmaven.gitcommitid.skip=true
     - name: JDK 8
       if: matrix.jdk == '8'
       run: mvn -B clean package -P travis jacoco:report -Dmaven.gitcommitid.skip=true

.github/workflows/release.yml

@@ -34,14 +34,14 @@ jobs:
     - name: Set up Maven Central Repository
       uses: actions/setup-java@v1
       with:
-        java-version: 7
+        java-version: 8
         server-id: ${{ github.event.inputs.repository }}
         server-username: MAVEN_USERNAME
         server-password: MAVEN_CENTRAL_TOKEN
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
     - name: Publish to Apache Maven Central
-      run: mvn clean deploy -pl apollo-client,apollo-mockserver,apollo-openapi -am -DskipTests=true -Prelease "-Dreleases.repo=https://oss.sonatype.org/service/local/staging/deploy/maven2" "-Dsnapshots.repo=https://oss.sonatype.org/content/repositories/snapshots"
+      run: mvn clean deploy -pl apollo-client,apollo-mockserver,apollo-openapi,apollo-client-config-data -am -DskipTests=true -Prelease "-Dreleases.repo=https://oss.sonatype.org/service/local/staging/deploy/maven2" "-Dsnapshots.repo=https://oss.sonatype.org/content/repositories/snapshots"
       env:
         MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
         MAVEN_CENTRAL_TOKEN: ${{ secrets.MAVEN_CENTRAL_TOKEN }}

CHANGES.md

@@ -2,10 +2,9 @@ Changes by Version
 ==================
 Release Notes.
 
-Apollo 1.10.0
+Apollo 2.0.0
 
 ------------------
-* [Bump version to 1.10.0](https://github.com/ctripcorp/apollo/pull/3917)
 * [Fix issue that the $ symbol is not used when reading shell variables](https://github.com/ctripcorp/apollo/pull/3890)
 * [Bump xstream from 1.4.17 to 1.4.18](https://github.com/apolloconfig/apollo/pull/3916)
 * [switch apollo.config-service log from warning to info level](https://github.com/ctripcorp/apollo/pull/3884)
@@ -19,6 +18,7 @@ Apollo 1.10.0
 * [Implement password policies to avoid weak passwords](https://github.com/apolloconfig/apollo/pull/4008)
 * [Extend the gray release capability to support dimensions other than IP](https://github.com/apolloconfig/apollo/pull/4013)
 * [public namespace basic function](https://github.com/apolloconfig/apollo/pull/3850)
+* [Bump version to 2.0.0 and drop java 1.7 support](https://github.com/apolloconfig/apollo/pull/4015)
 
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)

apollo-client/pom.xml

@@ -27,7 +27,6 @@
 	<artifactId>apollo-client</artifactId>
 	<name>Apollo Client</name>
 	<properties>
-		<java.version>1.7</java.version>
 		<github.path>${project.artifactId}</github.path>
 	</properties>
 	<dependencyManagement>

apollo-core/pom.xml

@@ -28,7 +28,6 @@
 	<name>Apollo Core</name>
 	<packaging>jar</packaging>
 	<properties>
-		<java.version>1.7</java.version>
 		<github.path>${project.artifactId}</github.path>
 	</properties>
 	<dependencies>

apollo-demo/pom.xml

@@ -27,7 +27,6 @@
 	<name>Apollo Demo</name>
 	<packaging>jar</packaging>
 	<properties>
-		<java.version>1.7</java.version>
 		<github.path>${project.artifactId}</github.path>
 	</properties>
 	<dependencies>

apollo-mockserver/pom.xml

@@ -29,7 +29,6 @@
   <name>Apollo Mock Server</name>
 
   <properties>
-    <java.version>1.7</java.version>
     <github.path>${project.artifactId}</github.path>
   </properties>
 

apollo-openapi/pom.xml

@@ -29,7 +29,6 @@
   <name>Apollo Open Api</name>
 
   <properties>
-    <java.version>1.7</java.version>
     <github.path>${project.artifactId}</github.path>
   </properties>
 

docs/zh/deployment/distributed-deployment-guide.md

@@ -14,13 +14,8 @@
 ### 1.1.2 Java
 
 * Apollo服务端：1.8+
-* Apollo客户端：1.7+
-
-由于需要同时运行服务端和客户端，所以建议安装Java 1.8+。
-
->对于Apollo客户端，运行时环境只需要1.7+即可。
-
->注：对于Apollo客户端，如果有需要的话，可以做少量代码修改来降级到Java 1.6，详细信息可以参考[Issue 483](https://github.com/ctripcorp/apollo/issues/483)
+* Apollo客户端：1.8+
+    * 如需运行在 Java 1.7 运行时环境，请使用 1.x 版本的 apollo 客户端，如 1.9.1
 
 在配置好后，可以通过如下命令检查：
 ```sh
@@ -1321,6 +1316,6 @@ admin-service.access.tokens=098f6bcd4621d373cade4e832627b4f6,ad0234829205b903319
 
 ### 3.2.8 apollo.access-key.auth-time-diff-tolerance - 配置服务端AccessKey校验容忍的时间偏差
 
-> 适用于1.10.0及以上版本
+> 适用于2.0.0及以上版本
 
 默认值为60，单位为秒。由于密钥认证时需要校验时间，客户端与服务端的时间可能存在时间偏差，如果偏差太大会导致认证失败，此配置可以配置容忍的时间偏差大小，默认为60秒。

docs/zh/deployment/quick-start.md

@@ -11,9 +11,8 @@
 ## 1.1 Java
 
 * Apollo服务端：1.8+
-* Apollo客户端：1.7+
-
-由于Quick Start会在本地同时启动服务端和客户端，所以需要在本地安装Java 1.8+。
+* Apollo客户端：1.8+
+   * 如需运行在 Java 1.7 运行时环境，请使用 1.x 版本的 apollo 客户端，如 1.9.1
 
 在配置好后，可以通过如下命令检查：
 ```sh

docs/zh/usage/java-sdk-user-guide.md

@@ -4,7 +4,8 @@
 # 一、准备工作
 ## 1.1 环境要求
 
-* Java: 1.7+
+* Java: 1.8+
+    * 如需运行在 Java 1.7 运行时环境，请使用 1.x 版本的 apollo 客户端，如 1.9.1
 * Guava: 20.0+
     * Apollo客户端默认会引用Guava 29，如果你的项目引用了其它版本，请确保版本号大于等于20.0
 
@@ -345,23 +346,23 @@ ApolloLabel是应用的标签信息，是从服务端获取配置的一个重要
 
 1. System Property
 
-Apollo 1.9.2+支持通过System Property传入apollo.label信息，如
+Apollo 2.0.0+支持通过System Property传入apollo.label信息，如
 
 ```bash
 -Dapollo.label=YOUR-APOLLO-LABEL
 ```
 
 2. 操作系统的System Environment
 
-Apollo 1.9.2+支持通过操作系统的System Environment `APP_LABEL`来传入apollo.label信息，如
+Apollo 2.0.0+支持通过操作系统的System Environment `APP_LABEL`来传入apollo.label信息，如
 
 ```bash
 APOLLO_LABEL=YOUR-APOLLO-LABEL
 ```
 
 3. Spring Boot application.properties
 
-Apollo 1.9.2+支持通过Spring Boot的application.properties文件配置，如
+Apollo 2.0.0+支持通过Spring Boot的application.properties文件配置，如
 
 ```properties
 apollo.label=YOUR-APOLLO-LABEL

pom.xml

@@ -60,7 +60,7 @@
 	</developers>
 
 	<properties>
-		<revision>1.10.0-SNAPSHOT</revision>
+		<revision>2.0.0-SNAPSHOT</revision>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<spring-boot.version>2.4.2</spring-boot.version>

scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml

@@ -90,7 +90,7 @@ spec:
                 path: application-github.properties
 
       containers:
-        - image: apolloconfig/apollo-adminservice:1.10.0-SNAPSHOT
+        - image: apolloconfig/apollo-adminservice:2.0.0-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml

@@ -108,7 +108,7 @@ spec:
                 path: application-github.properties
 
       containers:
-        - image: apolloconfig/apollo-configservice:1.10.0-SNAPSHOT
+        - image: apolloconfig/apollo-configservice:2.0.0-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml

@@ -90,7 +90,7 @@ spec:
                 path: application-github.properties
 
       containers:
-        - image: apolloconfig/apollo-adminservice:1.10.0-SNAPSHOT
+        - image: apolloconfig/apollo-adminservice:2.0.0-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml

@@ -108,7 +108,7 @@ spec:
                 path: application-github.properties
 
       containers:
-        - image: apolloconfig/apollo-configservice:1.10.0-SNAPSHOT
+        - image: apolloconfig/apollo-configservice:2.0.0-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml

@@ -90,7 +90,7 @@ spec:
                 path: application-github.properties
 
       containers:
-        - image: apolloconfig/apollo-adminservice:1.10.0-SNAPSHOT
+        - image: apolloconfig/apollo-adminservice:2.0.0-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml

@@ -108,7 +108,7 @@ spec:
                 path: application-github.properties
 
       containers:
-        - image: apolloconfig/apollo-configservice:1.10.0-SNAPSHOT
+        - image: apolloconfig/apollo-configservice:2.0.0-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml

@@ -90,7 +90,7 @@ spec:
                 path: application-github.properties
 
       containers:
-        - image: apolloconfig/apollo-adminservice:1.10.0-SNAPSHOT
+        - image: apolloconfig/apollo-adminservice:2.0.0-SNAPSHOT
           imagePullPolicy: IfNotPresent
           name: container-apollo-admin-server-uat
           ports:

scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml

@@ -108,7 +108,7 @@ spec:
                 path: application-github.properties
 
       containers:
-        - image: apolloconfig/apollo-configservice:1.10.0-SNAPSHOT
+        - image: apolloconfig/apollo-configservice:2.0.0-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml

@@ -132,7 +132,7 @@ spec:
               - key: apollo-env.properties
                 path: apollo-env.properties
       containers:
-        - image: apolloconfig/apollo-portal:1.10.0-SNAPSHOT
+        - image: apolloconfig/apollo-portal:2.0.0-SNAPSHOT
           securityContext:
             privileged: true
           imagePullPolicy: IfNotPresent

scripts/helm/apollo-portal/Chart.yaml

@@ -18,7 +18,7 @@ name: apollo-portal
 description: A Helm chart for Apollo Portal
 type: application
 version: 0.4.0
-appVersion: 1.10.0-SNAPSHOT
+appVersion: 2.0.0-SNAPSHOT
 home: https://github.com/ctripcorp/apollo
 icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
 maintainers:

scripts/helm/apollo-service/Chart.yaml

@@ -18,7 +18,7 @@ name: apollo-service
 description: A Helm chart for Apollo Config Service and Apollo Admin Service
 type: application
 version: 0.4.0
-appVersion: 1.10.0-SNAPSHOT
+appVersion: 2.0.0-SNAPSHOT
 home: https://github.com/ctripcorp/apollo
 icon: https://raw.githubusercontent.com/ctripcorp/apollo/master/apollo-portal/src/main/resources/static/img/logo-simple.png
 maintainers:

scripts/sql/delta/v190-v1_10_0/apolloconfigdb-v190-v1_10_0.sql → scripts/sql/delta/v190-v200/apolloconfigdb-v190-v200.sql

@@ -13,7 +13,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-# delta schema to upgrade apollo config db from v1.9.0 to v1.10.0
+# delta schema to upgrade apollo config db from v1.9.0 to v2.0.0
 
 Use ApolloConfigDB;