diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ab5b7fb..8a71682 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,11 +24,9 @@
     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 @@
         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 package --file pom.xml --no-transfer-progress
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5b95a09..21ceb02 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -60,7 +60,7 @@
       ObjectCreateRule doesn't allow create objects which type is specified in attributeName only
     </action>
     <action dev="simonetripodi" type="fix" issue="DIGESTER-161" due-to="Eduard Papa">
-      Document thread-safety in javadoc of Rule class
+      Document thread-safety in Javadoc of Rule class
     </action>
     <action dev="ggregory" type="update" issue="DIGESTER-185">
       Update Apache Commons Logging from 1.1.1 to 1.2.
@@ -80,6 +80,9 @@
     <action dev="ggregory" type="update">
       Update JUnit from 4.10 to 4.13.
     </action>
+    <action type="update" dev="ggregory" due-to="Gary Gregory">
+      Bump build actions/setup-java from v1.4.0 to v2.
+    </action>
   </release>
   <release version="3.2" date="2011-12-13" description="Maintenance release.">
     <action dev="simonetripodi" type="fix" issue="DIGESTER-160">