diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000..29eccbf6
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,46 @@
+#
+#  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.
+#
+version: 2
+updates:
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+    time: '04:00'
+  open-pull-requests-limit: 10
+  ignore:
+    # ignore Java 8+ dependencies
+    - dependency-name: org.mockito:mockito-core
+      versions:
+        - ">= 3.0"
+    - dependency-name: org.apache.commons:commons-lang3
+      versions:
+        - ">= 3.9"
+    - dependency-name: commons-io:commons-io
+      versions:
+        - ">= 2.7"
+    # Ignore Maven 3.2.1+
+    - dependency-name: org.apache.maven.plugin-testing:maven-plugin-testing-tools
+      versions:
+        - ">=3.2.0"
+    - dependency-name: org.apache.maven.plugin-testing:maven-plugin-testing-harness
+      versions:
+        - ">=3.2.0"
+- package-ecosystem: "github-actions"
+  directory: "/"
+  schedule:
+    interval: "daily"
\ No newline at end of file
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 0cd022d5..7e6b0445 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,8 +24,8 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
-        java: [8, 11, 14, 15-ea]
+        os: [ubuntu-20.04, windows-latest, macOS-latest]
+        java: [7, 8, 11, 15, 16-ea]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
@@ -34,14 +34,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up cache for ~./m2/repository
-        uses: actions/cache@v1
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
         with:
-          path: ~/.m2/repository
-          key: maven-${{ matrix.os }}-java${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            maven-${{ matrix.os }}-java${{ matrix.java }}-
-            maven-${{ matrix.os }}-
+            path: ~/.m2/repository
+            key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+            restore-keys: |
+                ${{ runner.os }}-maven-
 
       - name: Set up JDK
         uses: actions/setup-java@v1