Revert "Target latest 3.1 SNAPSHOT (3.1.2-SNAPSHOT)"

This reverts commit 2e5f65688dec732f2287abb4094422328d4c7d68.
Revert "Target latest 3.1 GA (3.1.1-GA)"

This reverts commit c8b82841f0312484c16e3b7d9b6ebfd36640e9e8.