Merge pull request scala#4113 from retronym/ticket/8967

SI-8967 Only add JARs and dirs from $SCALA_HOME/lib to classpath

Author: adriaanm

src/compiler/scala/tools/ant/templates/tool-unix.tmpl

@@ -86,10 +86,14 @@ fi
 TOOL_CLASSPATH="@classpath@"
 if [[ -z "$TOOL_CLASSPATH" ]]; then
     for ext in "$SCALA_HOME"/lib/* ; do
-        if [[ -z "$TOOL_CLASSPATH" ]]; then
-            TOOL_CLASSPATH="$ext"
-        else
-            TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}"
+        file_extension="${ext##*.}"
+        # SI-8967 Only consider directories and files named '*.jar'
+        if [[ -d "$ext" || $file_extension == "jar" ]]; then
+          if [[ -z "$TOOL_CLASSPATH" ]]; then
+              TOOL_CLASSPATH="$ext"
+          else
+              TOOL_CLASSPATH="${TOOL_CLASSPATH}${SEP}${ext}"
+          fi
         fi
     done
 fi

src/compiler/scala/tools/ant/templates/tool-windows.tmpl

@@ -128,7 +128,7 @@ if defined _JAVA_PARAMS set _JAVA_OPTS=%_JAVA_OPTS% %_JAVA_PARAMS%
 
 set _TOOL_CLASSPATH=@classpath@
 if "%_TOOL_CLASSPATH%"=="" (
-  for %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f"
+  for %%f in ("!_SCALA_HOME!\lib\*.jar") do call :add_cpath "%%f"
   for /d %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f"
 )