diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 515206e7951..780201d5905 100644 --- a/.github/workflows/build.yml +++ b/.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 diff --git a/.github/workflows/release-1.8.yml b/.github/workflows/release-1.8.yml deleted file mode 100644 index 228b242fbbe..00000000000 --- a/.github/workflows/release-1.8.yml +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright 2021 Apollo Authors -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: publish apollo-client-config-data - -on: - workflow_dispatch: - inputs: - repository: - description: 'Maven Repository(snapshots or releases)' - required: true - default: 'snapshots' - -jobs: - publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Maven Central Repository - uses: actions/setup-java@v1 - with: - 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-config-data -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 }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1c659517857..231bc8956c4 100644 --- a/.github/workflows/release.yml +++ b/.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 }} diff --git a/CHANGES.md b/CHANGES.md index 99c2e293946..48b70b9b215 100644 --- a/CHANGES.md +++ b/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) \ No newline at end of file diff --git a/apollo-client/pom.xml b/apollo-client/pom.xml index b554690d14e..c4a49d80c53 100644 --- a/apollo-client/pom.xml +++ b/apollo-client/pom.xml @@ -27,7 +27,6 @@ apollo-client Apollo Client - 1.7 ${project.artifactId} diff --git a/apollo-core/pom.xml b/apollo-core/pom.xml index 25f26fb82f5..ae9d6d74419 100644 --- a/apollo-core/pom.xml +++ b/apollo-core/pom.xml @@ -28,7 +28,6 @@ Apollo Core jar - 1.7 ${project.artifactId} diff --git a/apollo-demo/pom.xml b/apollo-demo/pom.xml index bbad1685a28..0bc0425cf19 100644 --- a/apollo-demo/pom.xml +++ b/apollo-demo/pom.xml @@ -27,7 +27,6 @@ Apollo Demo jar - 1.7 ${project.artifactId} diff --git a/apollo-mockserver/pom.xml b/apollo-mockserver/pom.xml index 240a2a7efe8..350e02c8ce8 100644 --- a/apollo-mockserver/pom.xml +++ b/apollo-mockserver/pom.xml @@ -29,7 +29,6 @@ Apollo Mock Server - 1.7 ${project.artifactId} diff --git a/apollo-openapi/pom.xml b/apollo-openapi/pom.xml index 8ac93965941..23cd07bdc0d 100644 --- a/apollo-openapi/pom.xml +++ b/apollo-openapi/pom.xml @@ -29,7 +29,6 @@ Apollo Open Api - 1.7 ${project.artifactId} diff --git a/docs/zh/deployment/distributed-deployment-guide.md b/docs/zh/deployment/distributed-deployment-guide.md index 81cbeba88f5..e2b72b6c723 100644 --- a/docs/zh/deployment/distributed-deployment-guide.md +++ b/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秒。 diff --git a/docs/zh/deployment/quick-start.md b/docs/zh/deployment/quick-start.md index cec5c205bcd..b66ca18e4d1 100644 --- a/docs/zh/deployment/quick-start.md +++ b/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 diff --git a/docs/zh/usage/java-sdk-user-guide.md b/docs/zh/usage/java-sdk-user-guide.md index 2af57b12703..af5921c7b74 100644 --- a/docs/zh/usage/java-sdk-user-guide.md +++ b/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,7 +346,7 @@ 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 @@ -353,7 +354,7 @@ Apollo 1.9.2+支持通过System Property传入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 @@ -361,7 +362,7 @@ 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 diff --git a/pom.xml b/pom.xml index 9a586711732..8c147943086 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ - 1.10.0-SNAPSHOT + 2.0.0-SNAPSHOT 1.8 UTF-8 2.4.2 diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml index 074b6a0c813..d6121d81f46 100755 --- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-admin-server-dev.yaml +++ b/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 diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml index 1c8236c3970..76225d7d56a 100755 --- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-dev/service-apollo-config-server-dev.yaml +++ b/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 diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml index 8dbecaf03c0..0532c555dd2 100755 --- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml +++ b/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 diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml index c12102ddbc3..55e6fba3d50 100755 --- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-config-server-fat.yaml +++ b/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 diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml index 448e73bccb6..b913c3a6ea4 100755 --- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-admin-server-prod.yaml +++ b/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 diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml index 21845e5ae73..7aaccc35547 100755 --- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-prod/service-apollo-config-server-prod.yaml +++ b/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 diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml index a804a8e7d7b..6e55a862f9a 100755 --- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-admin-server-uat.yaml +++ b/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: diff --git a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml b/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml index f5ccb022bd2..33b489bbcba 100755 --- a/scripts/apollo-on-kubernetes/kubernetes/apollo-env-uat/service-apollo-config-server-uat.yaml +++ b/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 diff --git a/scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml b/scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml index a2960cda34c..b223b32d9f4 100755 --- a/scripts/apollo-on-kubernetes/kubernetes/service-apollo-portal-server.yaml +++ b/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 diff --git a/scripts/helm/apollo-portal/Chart.yaml b/scripts/helm/apollo-portal/Chart.yaml index 96507850456..c6505576961 100644 --- a/scripts/helm/apollo-portal/Chart.yaml +++ b/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: diff --git a/scripts/helm/apollo-service/Chart.yaml b/scripts/helm/apollo-service/Chart.yaml index b98e3e67c25..e30f4ab515e 100644 --- a/scripts/helm/apollo-service/Chart.yaml +++ b/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: diff --git a/scripts/sql/delta/v190-v1_10_0/apolloconfigdb-v190-v1_10_0.sql b/scripts/sql/delta/v190-v200/apolloconfigdb-v190-v200.sql similarity index 90% rename from scripts/sql/delta/v190-v1_10_0/apolloconfigdb-v190-v1_10_0.sql rename to scripts/sql/delta/v190-v200/apolloconfigdb-v190-v200.sql index 1d4fb655af1..3202a80923d 100644 --- a/scripts/sql/delta/v190-v1_10_0/apolloconfigdb-v190-v1_10_0.sql +++ b/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;