You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2021/05/02 05:10:09 UTC

[maven-javadoc-plugin] branch master updated: add dependabot and jdk distribution in the matrix

This is an automated email from the ASF dual-hosted git repository.

olamy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new cab9d0d  add dependabot and jdk distribution in the matrix
cab9d0d is described below

commit cab9d0d3715263536778facfaaf957e468a27d5b
Author: olivier lamy <ol...@apache.org>
AuthorDate: Sun May 2 15:09:49 2021 +1000

    add dependabot and jdk distribution in the matrix
    
    Signed-off-by: olivier lamy <ol...@apache.org>
---
 .github/dependabot.yml      | 10 ++++++++++
 .github/workflows/maven.yml |  6 ++++--
 pom.xml                     |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..b76b895
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 28267d8..e075e96 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -25,7 +25,8 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        java: [7, 8, 11, 15, 16-ea, 17-ea]
+        java: [8, 11, 15, 16, 17-ea]
+        jdk: [adopt, zulu]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -44,8 +45,9 @@ jobs:
             maven-${{ matrix.os }}-
 
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: ${{ matrix.jdk }}
           java-version: ${{ matrix.java }}
 
       - name: Build with Maven
diff --git a/pom.xml b/pom.xml
index ed81cff..fafe5e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -391,6 +391,7 @@ under the License.
               <exclude>src/test/resources/unit/test-javadoc-test/junit/junit/3.8.1/junit-3.8.1.pom</exclude>
               <!-- temporary file that sometimes stays after a failure then completely blocks build -->
               <exclude>javadoc-options-javadoc-resources.xml</exclude>
+              <exclude>.github/dependabot.yml</exclude>
             </excludes>
           </configuration>
         </plugin>