Merge branch '3.1.x'

3 years ago · db4fac1ce4
2 changed files with 3 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -21,4 +21,3 @@ _site/
				@@ -21,4 +21,3 @@ _site/
 antrun
 .vscode/
 .flattened-pom.xml
-.sdkmanrc
--- a/.sdkmanrc
+++ b/.sdkmanrc
@ -0,0 +1,3 @@
				@@ -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