Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-…

…dbutils
apache · May 16, 2021 · 84ab548 · 84ab548
2 parents 6671cd7 + c3db1e6
commit 84ab548
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -24,11 +24,9 @@ jobs:
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       matrix:
-        java: [ 8, 11, 15 ]
+        java: [ 8, 11, 16 ]
         experimental: [false]
         include:
-          - java: 16-ea
-            experimental: true        
           - java: 17-ea
             experimental: true
 
@@ -41,8 +39,9 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v1.4.3
+      uses: actions/setup-java@v2
       with:
+        distribution: 'adopt'
         java-version: ${{ matrix.java }}
     - name: Build with Maven
       run: mvn -V --file pom.xml --no-transfer-progress
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -96,8 +96,8 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="update" due-to="Gary Gregory, Dependabot">
         Update checkstyle from 8.28 to 8.35, #20.
       </action>
-      <action dev="ggregory" type="update" due-to="Dependabot">
-        Bump actions/setup-java from v1.4.0 to v1.4.3 #40.
+      <action dev="ggregory" type="update" due-to="Dependabot, Gary Gregory">
+        Bump actions/setup-java from v1.4.0 to v2 #40.
       </action>
       <action dev="ggregory" type="update" due-to="Dependabot">
         Bump checkstyle from 8.35 to 8.37 #47.