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

@@ -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.4.0
-appVersion: 1.10.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:
-- 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/workflows/build.yml

@@ -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

@@ -34,7 +34,7 @@ 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*
@@ -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/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,15 +2,36 @@ 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)
 * [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)
 
 ------------------
 All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/8?closed=1)

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 ## Contributing to apollo
 
-Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard Github development process, using Github tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
+Apollo is released under the non-restrictive Apache 2.0 license, and follows a very standard GitHub development process, using GitHub tracker for issues and merging pull requests into master. If you want to contribute even something trivial please do not hesitate, but follow the guidelines below.
 
 ### Sign the Contributor License Agreement