Merge branch 'apolloconfig:master' into master

.gitattributes

@@ -1 +1,2 @@
-text=auto
+text=auto
+*.sh text eol=lf

scripts/helm/apollo-portal/Chart.yaml → .github/FUNDING.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Apollo Authors
+# Copyright 2022 Apollo Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,15 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-apiVersion: v2
-name: apollo-portal
-description: A Helm chart for Apollo Portal
-type: application
-version: 0.3.0
-appVersion: 1.9.0
-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:
-- name: nobodyiam
-  email: [email protected]
-  url: https://github.com/nobodyiam
+
+github: [apolloconfig] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+open_collective: apollo # Replace with a single Open Collective username

.github/stale.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Apollo Authors
+# Copyright 2022 Apollo Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/build.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Apollo Authors
+# Copyright 2022 Apollo Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jdk: [7, 8, 11]
+        jdk: [8, 11, 17]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK
@@ -42,15 +42,15 @@ 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
     - name: JDK 11 
       if: matrix.jdk == '11'
-      run: mvn clean compile -Dmaven.gitcommitid.skip=true
+      run: mvn -B clean compile -Dmaven.gitcommitid.skip=true
+    - name: JDK 17
+      if: matrix.jdk == '17'
+      run: mvn -B clean compile -Dmaven.gitcommitid.skip=true
     - name: Upload coverage to Codecov
       if: matrix.jdk == '8'
       uses: codecov/codecov-action@v1

.github/workflows/cla.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Apollo Authors
+# Copyright 2022 Apollo Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -34,10 +34,10 @@ jobs:
           PERSONAL_ACCESS_TOKEN : ${{ secrets.PERSONAL_ACCESS_TOKEN_FOR_CLA_ASSISTANT }}
         with:
           path-to-signatures: 'signatures/version1/cla.json'
-          path-to-document: 'https://github.com/ctripcorp/apollo-community/blob/master/CLA.md' # e.g. a CLA or a DCO document
+          path-to-document: 'https://github.com/apolloconfig/apollo-community/blob/master/CLA.md' # e.g. a CLA or a DCO document
           # branch should not be protected
           branch: 'master'
-          allowlist: dependabot,bot*
+          allowlist: dependabot,bot*,github-actions
           remote-repository-name: apollo-community
 
          #below are the optional inputs - If the optional inputs are not given, then default values will be taken
@@ -49,4 +49,4 @@ jobs:
           #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA'
           #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.'
           #lock-pullrequest-aftermerge: false - if you don't want this bot to automatically lock the pull request after merging (default - true)
-          #use-dco-flag: true - If you are using DCO instead of CLA
+          #use-dco-flag: true - If you are using DCO instead of CLA

.github/workflows/license.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Apollo Authors
+# Copyright 2022 Apollo Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/workflows/release.yml

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Apollo Authors
+# Copyright 2022 Apollo Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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 "-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 }}

.licenserc.yaml

@@ -1,5 +1,5 @@
 #
-# Copyright 2021 Apollo Authors
+# Copyright 2022 Apollo Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

CHANGES.md

@@ -2,80 +2,55 @@ Changes by Version
 ==================
 Release Notes.
 
-Apollo 1.9.0
+Apollo 2.0.0
 
 ------------------
-* [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552)
-* [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553)
-* [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561)
-* [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563)
-* [slim docker images](https://github.com/ctripcorp/apollo/pull/3572)
-* [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574)
-* [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575)
-* [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585)
-* [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593)
-* [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594)
-* [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602)
-* [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609)
-* [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611)
-* [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617)
-* [update known users](https://github.com/ctripcorp/apollo/pull/3619)
-* [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620)
-* [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627)
-* [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628)
-* [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632)
-* [update known users](https://github.com/ctripcorp/apollo/pull/3633)
-* [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634)
-* [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646)
-* [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656)
-* [update known users](https://github.com/ctripcorp/apollo/pull/3657)
-* [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658)
-* [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660)
-* [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667)
-* [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668)
-* [fix unit test](https://github.com/ctripcorp/apollo/pull/3669)
-* [解决日志系统未初始化完成时，apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677)
-* [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679)
-* [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670)
-* [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682)
-* [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692)
-* [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695)
-* [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699)
-* [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713)
-* [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720)
-* [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666)
-* [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757)
-* [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766)
-* [Improve the item-value length limit configuration document](https://github.com/ctripcorp/apollo/pull/3789)
-* [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765)
-* [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754)
-* [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647)
-* [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786)
-* [feature: add email for select user on apollo portal](https://github.com/ctripcorp/apollo/pull/3797)
-* [feature: modify item comment valid size](https://github.com/ctripcorp/apollo/pull/3803)
-* [set default session store-type](https://github.com/ctripcorp/apollo/pull/3812)
-* [speed up the stale issue mark and close phase](https://github.com/ctripcorp/apollo/pull/3808)
-* [feature: add the delegating password encoder for apollo-portal simple auth](https://github.com/ctripcorp/apollo/pull/3804)
-* [support release apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3822)
-* [Fix possiable NPE](https://github.com/ctripcorp/apollo/pull/3832)
-* [Reduce bootstrap time in the situation with large properties](https://github.com/ctripcorp/apollo/pull/3816)
-* [docs: English catalog in sidebar](https://github.com/ctripcorp/apollo/pull/3831)
-* [fix the issue that release messages might be missed in certain scenarios](https://github.com/ctripcorp/apollo/pull/3819)
-* [use official docker images for manual kubernetes deployment](https://github.com/ctripcorp/apollo/pull/3840)
-* [fix size of create project button](https://github.com/ctripcorp/apollo/pull/3849)
-* [translation of "portal-how-to-enable-webhook-notification.md"](https://github.com/ctripcorp/apollo/pull/3847)
-* [feature: add history detail for not key-value type of namespace](https://github.com/ctripcorp/apollo/pull/3856)
-* [fix show-text-modal number display](https://github.com/ctripcorp/apollo/pull/3851)
-* [Lazy load ConfigUtil](https://github.com/ctripcorp/apollo/pull/3864)
-* [make jdbc session enable default](https://github.com/ctripcorp/apollo/pull/3869)
-* [support json/yaml/xml format for public namespace](https://github.com/ctripcorp/apollo/pull/3836)
-* [Translate application into 应用 not 项目](https://github.com/ctripcorp/apollo/pull/3877)
-* [add spring configuration metadata for property names cache](https://github.com/ctripcorp/apollo/pull/3879)
-* [Fix Multiple PropertySourcesPlaceholderConfigurer beans registered issue](https://github.com/ctripcorp/apollo/pull/3865)
-* [use jdk 8 to publish apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3880)
-* [fix apollo config data loader with profiles](https://github.com/ctripcorp/apollo/pull/3870)
-* [polish log](https://github.com/ctripcorp/apollo/pull/3882)
-
+* [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)
+* [Make Access Key Timestamp check configurable](https://github.com/ctripcorp/apollo/pull/3908)
+* [remove ctrip profile](https://github.com/ctripcorp/apollo/pull/3920)
+* [Remove spring dependencies from internal code](https://github.com/apolloconfig/apollo/pull/3937)
+* [Fix issue: ingress syntax](https://github.com/apolloconfig/apollo/pull/3933)
+* [refactor: let open api more easier to use and development](https://github.com/apolloconfig/apollo/pull/3943)
+* [feat(scripts): use bash to call openapi](https://github.com/apolloconfig/apollo/pull/3980)
+* [Support search by item](https://github.com/apolloconfig/apollo/pull/3977)
+* [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)
+* [Optimize home page style](https://github.com/apolloconfig/apollo/pull/4052)
+* [Support Java 17](https://github.com/apolloconfig/apollo/pull/4060)
+* [Optimize top navbar style](https://github.com/apolloconfig/apollo/pull/4073)
+* [Support export/import configs by apollo env](https://github.com/apolloconfig/apollo/pull/3947)
+* [Catch LinkageError for ClassLoaderUtil.isClassPresent in case class is present but is failed to load](https://github.com/apolloconfig/apollo/pull/4097)
+* [Split helm chart into another repo](https://github.com/apolloconfig/apollo/pull/4125)
+* [fix gray publish refresh item status](https://github.com/apolloconfig/apollo/pull/4128)
+* [Support only show difference keys when compare namespace](https://github.com/apolloconfig/apollo/pull/4165)
+* [Fix the issue that property placeholder doesn't work for dubbo reference beans](https://github.com/apolloconfig/apollo/pull/4175)
+* [Fix the NPE occurred when using EnableApolloConfig with Spring 3.1.1](https://github.com/apolloconfig/apollo/pull/4180)
+* [Bump guava from 29.0 to 31.0.1](https://github.com/apolloconfig/apollo/pull/4182)
+* [fix the json number display issue when it's longer than 16](https://github.com/apolloconfig/apollo/pull/4183)
+* [Bump client springboot version](https://github.com/apolloconfig/apollo/pull/4189)
+* [The release history of namespaces that are not properties will also show comments and release times](https://github.com/apolloconfig/apollo/pull/4198)
+* [Add unit tests for Utils](https://github.com/apolloconfig/apollo/pull/4193)
+* [Change Copy Right year to 2022](https://github.com/apolloconfig/apollo/pull/4202)
+* [Optimize create namespace page](https://github.com/apolloconfig/apollo/pull/4213)
+* [Allow disable apollo client cache](https://github.com/apolloconfig/apollo/pull/4199)
+* [Make password check not hardcoded](https://github.com/apolloconfig/apollo/pull/4207)
+* [Fix update user's password failure](https://github.com/apolloconfig/apollo/pull/4212)
+* [Fix bug: associated namespace display incorrect in text view](https://github.com/apolloconfig/apollo/pull/4219)
+* [Add Ordered interface to ProviderManager SPI](https://github.com/apolloconfig/apollo/pull/4218)
+* [Using commons-lang3 to replace commons-lang](https://github.com/apolloconfig/apollo/pull/4225)
+* [optimize import/export config](https://github.com/apolloconfig/apollo/pull/4231)
+* [Configure publish and rollback modal boxes to add scrollbars](https://github.com/apolloconfig/apollo/pull/4251)
+* [fix import config bug](https://github.com/apolloconfig/apollo/pull/4262)
+* [Refactor the soft delete design](https://github.com/apolloconfig/apollo/pull/3866)
+* [Fix the potential data inconsistency issue](https://github.com/apolloconfig/apollo/pull/4256)
+* [Fix the deleted items display issue in text mode](https://github.com/apolloconfig/apollo/pull/4279)
+* [Upgrade spring boot to 2.6.6 and spring cloud to 2021.0.1](https://github.com/apolloconfig/apollo/pull/4295)
+* [Fix the apollo portal start failed issue](https://github.com/apolloconfig/apollo/pull/4298)
+* [fix: javax.net.ssl.SSLHandshakeException: No appropriate protocol](https://github.com/apolloconfig/apollo/pull/4308)
+* [Upgrade flyway to 8.0.5](https://github.com/apolloconfig/apollo/pull/4312)
 ------------------
-All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
-
+All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)