Merge branch 'main' into autoscan-accept-defaults

Author: rcsilva83

src/jenv-autoscan.psm1

@@ -48,7 +48,7 @@ function Invoke-AutoScan {
 
     # Ask user if java.exe should be added to the list
     foreach ($java in $javaExecutables) {
-        $version = Get-JavaVersion $java
+        $version = Get-JavaMajorVersion $java
         if ($acceptDefaults) {
             Invoke-Add $config $false $version ($java -replace "\\bin\\java\.exe$", "")
         } else {

src/util.psm1

@@ -22,4 +22,16 @@ function Get-JavaVersion {
     $version = (Get-Command $javaexe | Select-Object -ExpandProperty Version).toString()
     $version = $version -replace "(?>\.0)*(?!.+)", "" # Remove trailing zeros
     return $version
+}
+
+function Get-JavaMajorVersion {
+    param (
+        [Parameter(Mandatory = $true)][string]$javaexe
+    )
+    $version = Get-JavaVersion $javaexe
+    $endIndex = $version.IndexOf(".")
+    if ($version.StartsWith("1.")) {
+        $endIndex = $version.IndexOf(".", $endIndex + 1)
+    }
+    return $version.Substring(0, $endIndex)
 }