Merge branch '3.1.x'

spring-cloud · Jan 3, 2022 · eb0d694 · eb0d694
2 parents c55d97d + ad3ddef
commit eb0d694
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,5 +18,4 @@ _site/
 .factorypath
 .vscode/
 .flattened-pom.xml
-.DS_Store
-.sdkmanrc
+.DS_Store
diff --git 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