Merge branch '3.1.x'

2022-01-03 14:17:19 -05:00
parent c55d97d47c ad3ddefa16
commit eb0d694c4e
2 changed files with 4 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,4 @@ _site/
 .factorypath
 .vscode/
 .flattened-pom.xml
-.DS_Store
-.sdkmanrc
+.DS_Store
--- a/.sdkmanrc
+++ b/.sdkmanrc
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=8.0.292.hs-adpt