Merge remote-tracking branch 'origin/master' into release

senacor · Apr 3, 2022 · e34532a · e34532a
2 parents 063be53 + 4c869d0
commit e34532a
Show file tree

Hide file tree

Showing 58 changed files with 1,677 additions and 514 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,28 @@
+version: 2
+updates:
+  - package-ecosystem: maven
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 20
+    ignore:
+      - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client
+        versions:
+          - 7.11.x
+          - 7.12.x
+          - 7.13.x
+          - 7.14.x
+          - 7.15.x
+          - 7.16.x
+          - 7.17.x
+          - 8.x
+      - dependency-name: org.elasticsearch:elasticsearch
+        versions:
+          - 7.11.x
+          - 7.12.x
+          - 7.13.x
+          - 7.14.x
+          - 7.15.x
+          - 7.16.x
+          - 7.17.x
+          - 8.x
diff --git a/.github/workflows/maven-matrix.yml b/.github/workflows/maven-matrix.yml
@@ -2,6 +2,11 @@ name: Maven Matrix Build
 
 on:
   push:
+    branches:
+      - master
+      - release
+  # pull_request to run the pipeline on PRs from external, because "push" does not create this pipeline on external PRs
+  pull_request:
   schedule:
     # * is a special character in YAML so you have to quote this string
     - cron: '30 5 * * *'
@@ -14,15 +19,16 @@ jobs:
   build-and-test-with-jdk:
     strategy:
       matrix:
-        java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16 ]
+        java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 ]
       fail-fast: false
     runs-on: ubuntu-18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: zulu
           java-version: ${{ matrix.java }}
       - name: Cache local Maven repository
         uses: actions/cache@v2
@@ -40,19 +46,20 @@ jobs:
   build-and-test-with-es-version:
     strategy:
       matrix:
-        elasticsearchVersion: [ "7.12.0", "7.11.2", "7.10.2", "7.9.3", "7.8.1",
-                                "7.7.1", "7.6.2", "7.5.2" ]
+        elasticsearchVersion: [ "8.1.2", "8.0.1", "7.17.2", "7.16.3", "7.15.2", "7.14.2",
+                                "7.13.4", "7.12.1", "7.11.2", "7.10.2", "7.9.3", "7.8.1", "7.7.1", "7.6.2", "7.5.2" ]
       fail-fast: false
     runs-on: ubuntu-18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: zulu
           java-version: 11
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.m2/repository
@@ -68,26 +75,27 @@ jobs:
 
   release-dry-run:
     # this will just build like the real release job, but not do a release (dry run)
-    needs: [build-and-test-with-jdk, build-and-test-with-es-version]
-    if: ${{ github.ref != 'refs/heads/release' }}
+    needs: [ build-and-test-with-jdk, build-and-test-with-es-version ]
+    if: ${{ github.event_name != 'pull_request' && github.ref != 'refs/heads/release' }}
     runs-on: ubuntu-18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Import GPG key to sign maven build artifacts
-        uses: crazy-max/ghaction-import-gpg@v3
+        uses: crazy-max/ghaction-import-gpg@v4
         with:
-          gpg-private-key: ${{ secrets.GPG_SECRET_KEYS }}
+          gpg_private_key: ${{ secrets.GPG_SECRET_KEYS }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          git-user-signingkey: true
-          git-commit-gpgsign: true
+          git_user_signingkey: true
+          git_commit_gpgsign: true
       - name: Set up JDK 8
         # with JDK 11 the maven-javadoc-plugin > 3.0.1 fails with "cannot find symbol org.elasticsearch.*"
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: zulu
           java-version: 8
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.m2/repository
@@ -108,26 +116,27 @@ jobs:
 
   release:
     # Release to maven central and create Github release
-    needs: [build-and-test-with-jdk, build-and-test-with-es-version]
+    needs: [ build-and-test-with-jdk, build-and-test-with-es-version ]
     if: ${{ github.repository == 'senacor/elasticsearch-evolution' && github.event_name == 'push' && github.ref == 'refs/heads/release' }}
     runs-on: ubuntu-18.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Import GPG key to sign maven build artifacts
-        uses: crazy-max/ghaction-import-gpg@v3
+        uses: crazy-max/ghaction-import-gpg@v4
         with:
-          gpg-private-key: ${{ secrets.GPG_SECRET_KEYS }}
+          gpg_private_key: ${{ secrets.GPG_SECRET_KEYS }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          git-user-signingkey: true
-          git-commit-gpgsign: true
+          git_user_signingkey: true
+          git_commit_gpgsign: true
       - name: Set up JDK 8
         # with JDK 11 the maven-javadoc-plugin > 3.0.1 fails with "cannot find symbol org.elasticsearch.*"
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: zulu
           java-version: 8
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.m2/repository

diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -1,24 +1,31 @@
 name: Quality analysis
 
-on: ["push", "pull_request"]
+on:
+  push:
+    branches:
+      - master
+      - release
+  pull_request:
 
 env:
   MVN_CMD: "./mvnw --settings .cicd.settings.xml -e -B -V"
 
 jobs:
   code-analysis:
     runs-on: ubuntu-18.04
-
+    env:
+      COVERALLS_REPO_TOKEN_EXISTS: ${{ secrets.COVERALLS_REPO_TOKEN != '' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up JDK 8
         # build with JDK 8 because of issue https://github.com/trautonen/coveralls-maven-plugin/issues/112
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: zulu
           java-version: 8
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.m2/repository
@@ -30,13 +37,9 @@ jobs:
       - name: Build and test with Maven
         run: $MVN_CMD install
       - name: Execute Maven coveralls Plugin
+        if: ${{ env.COVERALLS_REPO_TOKEN_EXISTS == 'true' }}
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
           GITHUB_EVENT_NAME: ${{ github.event_name }}
           GITHUB_EVENT_PATH: ${{ github.event_path }}
-        run: $MVN_CMD coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN -DserviceName=GitHub-Actions
-      - name: Run codacy-coverage-reporter
-        uses: codacy/codacy-coverage-reporter-action@master
-        with:
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          coverage-reports: elasticsearch-evolution-core/target/site/jacoco/jacoco.xml,spring-boot-starter-elasticsearch-evolution/target/site/jacoco/jacoco.xml
+        run: $MVN_CMD coveralls:report -DrepoToken=$COVERALLS_REPO_TOKEN -DserviceName=GitHub-Actions
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1,18 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you 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.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar