Fix some samples

Les Vogel · Les Vogel · commit caedce3ef2da · 2017-08-23T18:31:22.000-07:00
diff --git a/.kokoro/system_tests.sh b/.kokoro/system_tests.sh
@@ -116,7 +116,7 @@ for app in "helloworld" "kotlin-appengine-standard" "kotlin-springboot-appengine
       "springboot-appengine-standard" "kotlin-spark-appengine-standard" \
       "sparkjava-appengine-standard"
 do
-  (cd "${app}" \
+  (cd "${app}"; \
   mvn appengine:deploy -Dapp.deploy.version="${app}" -Dapp.deploy.project="${GOOGLE_CLOUD_PROJECT}")
 done
 
diff --git a/appengine-standard-java8/kotlin-spark-appengine-standard/pom.xml b/appengine-standard-java8/kotlin-spark-appengine-standard/pom.xml
@@ -48,8 +48,8 @@ limitations under the License.
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib</artifactId>
-      <version>1.1.3-2</version>
+      <artifactId>kotlin-stdlib-jre8</artifactId>
+      <version>1.1.4-2</version>
     </dependency>
     <dependency>
       <groupId>com.sparkjava</groupId>
@@ -109,7 +109,7 @@ limitations under the License.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.8.0-alpha2</version>
+      <version>1.7.25</version> <!-- TEST if not 1.7.25 -->
     </dependency>
   </dependencies>
 
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/pom.xml b/appengine-standard-java8/kotlin-springboot-appengine-standard/pom.xml
@@ -31,7 +31,7 @@ limitations under the License.
 
   <properties>
     <java.version>1.8</java.version>
-    <kotlin.version>1.1.3-2</kotlin.version>
+    <kotlin.version>1.1.4-2</kotlin.version>
   </properties>
 
   <dependencies>
diff --git a/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/kotlin/org/jetbrains/kotlin/demo/GreetingController.kt b/appengine-standard-java8/kotlin-springboot-appengine-standard/src/main/kotlin/org/jetbrains/kotlin/demo/GreetingController.kt
@@ -14,5 +14,4 @@ class GreetingController {
     @GetMapping("/greeting")
     fun greeting(@RequestParam(value = "name", defaultValue = "World") name: String) =
                 Greeting(counter.incrementAndGet(), "Hello, $name, from a SpringBoot Application written in Kotlin, running on Google App Engine Java8 Standard...")
-
 }
diff --git a/appengine-standard-java8/springboot-appengine-standard/pom.xml b/appengine-standard-java8/springboot-appengine-standard/pom.xml
@@ -31,6 +31,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>
+      <version>${spring.boot.version}</version>
             <!-- Exclude Tomcat so that it doesn't conflict w/ Jetty server -->
       <exclusions>
         <exclusion>
@@ -58,6 +59,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
+      <version>${spring.boot.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/appengine-standard-java8/springboot-appengine-standard/src/main/java/com/example/appengine/demos/springboot/HelloworldController.java b/appengine-standard-java8/springboot-appengine-standard/src/main/java/com/example/appengine/demos/springboot/HelloworldController.java
@@ -22,6 +22,6 @@
 public class HelloworldController {
   @GetMapping("/")
   public String hello() {
-    return "Hello world!";
+    return "Hello world - springboot-appengine-standard!";
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,4 @@ class GreetingController {`
`14`	`14`	`@GetMapping("/greeting")`
`15`	`15`	`fun greeting(@RequestParam(value = "name", defaultValue = "World") name: String) =`
`16`	`16`	`Greeting(counter.incrementAndGet(), "Hello, $name, from a SpringBoot Application written in Kotlin, running on Google App Engine Java8 Standard...")`
`17`		`-`
`18`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@`
`22`	`22`	`public class HelloworldController {`
`23`	`23`	`@GetMapping("/")`
`24`	`24`	`public String hello() {`
`25`		`- return "Hello world!";`
	`25`	`+ return "Hello world - springboot-appengine-standard!";`
`26`	`26`	`}`
`27`	`27`	`}`