Merge branch 'master' into version/v10.0

52North · Oct 26, 2022 · 96fe49a · 96fe49a
2 parents fa9d33a + 2bc328b
commit 96fe49a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,22 +10,13 @@ updates:
   - dependency-name: xml-apis:xml-apis
     versions:
     - ">= 2.a, < 3"
-  - dependency-name: org.elasticsearch.client:elasticsearch-rest-high-level-client
-    versions:
-    - 7.11.0
-  - dependency-name: org.elasticsearch.client:elasticsearch-rest-client
-    versions:
-    - 7.11.0
-  - dependency-name: org.elasticsearch:elasticsearch
-    versions:
-    - 7.11.0
 - package-ecosystem: maven
   directory: "/"
   schedule:
     interval: daily
     time: "04:15"
   open-pull-requests-limit: 10
-  target-branch: "version/v10.0"
+  target-branch: "maintenance/9.x"
   ignore:
   - dependency-name: xml-apis:xml-apis
     versions:

diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-java-8:
-    if: github.ref != 'refs/heads/version/v10.0'
+    if: github.ref == 'refs/heads/maintenance/*'
     runs-on: ubuntu-latest
     name: Java 8 compile
 
@@ -22,7 +22,7 @@ jobs:
     - name: Build with Maven
       run: mvn -U -B clean install
   build-java-11:
-    if: github.ref == 'refs/heads/version/v10.0'
+    if: github.ref != 'refs/heads/maintenance/*'
     runs-on: ubuntu-latest
     name: Java 11 compile
 
@@ -38,7 +38,7 @@ jobs:
       run: mvn -U -B clean install
 
   publish-snapshot-java-8:
-    if: github.ref != 'refs/heads/version/v10.0'
+    if: github.ref == 'refs/heads/maintenance/*'
     needs: build-java-8
     runs-on: ubuntu-latest
 
@@ -59,7 +59,7 @@ jobs:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
   publish-snapshot-java-11:
-    if: github.ref == 'refs/heads/version/v10.0'
+    if: github.ref != 'refs/heads/maintenance/*'
     needs: build-java-11
     runs-on: ubuntu-latest
 

diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-java-8:
-    if: github.ref != 'refs/heads/version/v10.0'
+    if: github.ref == 'refs/heads/maintenance/*'
     strategy:
       matrix:
         java: [ 8, 11, 17 ]
@@ -25,7 +25,7 @@ jobs:
     - name: Build with Maven
       run: mvn -U -B clean install
   build-java-11:
-    if: github.ref == 'refs/heads/version/v10.0'
+    if: github.ref != 'refs/heads/version/v10.0'
     strategy:
       matrix:
         java: [ 11, 17 ]

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build-java-8:
-    if: github.ref != 'refs/heads/version/v10.0'
+    if: github.ref == 'refs/heads/maintenance/*'
     strategy:
       matrix:
         java: [ 8, 11, 17 ]
@@ -24,7 +24,7 @@ jobs:
     - name: Build with Maven
       run: mvn -fae -U -B clean install -P check
   build-java-11:
-    if: github.ref == 'refs/heads/version/v10.0'
+    if: github.ref != 'refs/heads/maintenance/*'
     strategy:
       matrix:
         java: [ 11, 17 ]
@@ -43,7 +43,7 @@ jobs:
       run: mvn -fae -U -B clean install -P check
 
   publish-snapshot-java-8:
-    if: github.ref != 'refs/heads/version/v10.0'
+    if: github.ref == 'refs/heads/maintenance/*'
     needs: build-java-8
     runs-on: ubuntu-latest
 
@@ -64,7 +64,7 @@ jobs:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
   publish-snapshot-java-11:
-    if: github.ref == 'refs/heads/version/v10.0'
+    if: github.ref != 'refs/heads/maintenance/*'
     needs: build-java-11
     runs-on: ubuntu-latest