From acfdfb789d5e599a1f2f0579fbc3ee3eff24dff0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 6 Nov 2013 11:48:27 +0000 Subject: [PATCH] Update main class to reflect use of JarLauncher b19f6bb238 updated the CLI so that it should be launched using Spring Boot Loader's JarLauncher, however the spring and spring.bat shell scripts were not updated so they still launched the CLI by using SpringCli as the main class. This led to a NoClassDefFoundError as none of the dependencies in the jar's /lib directory could be found. This commit updates the two shells scripts to use JarLauncher as the main class. --- spring-boot-cli/src/main/content/bin/spring.bat | 2 +- spring-boot-cli/src/main/executablecontent/bin/spring | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-cli/src/main/content/bin/spring.bat b/spring-boot-cli/src/main/content/bin/spring.bat index bff7df2db0..c9c0081c06 100644 --- a/spring-boot-cli/src/main/content/bin/spring.bat +++ b/spring-boot-cli/src/main/content/bin/spring.bat @@ -59,7 +59,7 @@ set CMD_LINE_ARGS=%$ @rem Setup the command line set CLASSPATH=%SPRING_HOME%\lib\* -"%JAVA_EXE%" %JAVA_OPTS% -cp "%CLASSPATH%" org.springframework.boot.cli.SpringCli %CMD_LINE_ARGS% +"%JAVA_EXE%" %JAVA_OPTS% -cp "%CLASSPATH%" org.springframework.boot.loader.JarLauncher %CMD_LINE_ARGS% :end @rem End local scope for the variables with windows NT shell diff --git a/spring-boot-cli/src/main/executablecontent/bin/spring b/spring-boot-cli/src/main/executablecontent/bin/spring index 901faae35f..c9aec1e479 100755 --- a/spring-boot-cli/src/main/executablecontent/bin/spring +++ b/spring-boot-cli/src/main/executablecontent/bin/spring @@ -92,4 +92,4 @@ if $cygwin; then CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` fi -"${JAVA_HOME}/bin/java" ${JAVA_OPTS} -cp "$CLASSPATH" org.springframework.boot.cli.SpringCli $* +"${JAVA_HOME}/bin/java" ${JAVA_OPTS} -cp "$CLASSPATH" org.springframework.boot.loader.JarLauncher $*