Upgrade Javaconfig samples to Gretty 4

eleftherias · eleftherias · commit fc5f87503649 · 2021-11-12T10:42:14.000+01:00
Closes gh-1953
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy
@@ -36,7 +36,7 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin {
         pluginManager.apply("org.gretty");
 
         project.gretty {
-            servletContainer = 'tomcat85'
+            servletContainer = 'tomcat10'
             contextPath = '/'
             fileLogEnabled = false
         }
diff --git a/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle b/buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/spring-session-sample-javaconfig-custom-cookie.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle b/spring-session-samples/spring-session-sample-javaconfig-hazelcast/spring-session-sample-javaconfig-hazelcast.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle b/spring-session-samples/spring-session-sample-javaconfig-jdbc/spring-session-sample-javaconfig-jdbc.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle b/spring-session-samples/spring-session-sample-javaconfig-redis/spring-session-sample-javaconfig-redis.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle b/spring-session-samples/spring-session-sample-javaconfig-rest/spring-session-sample-javaconfig-rest.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
@@ -27,5 +27,5 @@ dependencies {
 
 gretty {
 	jvmArgs = ['-Dspring.profiles.active=embedded-redis']
-	servletContainer = 'tomcat9'
+	servletContainer = 'tomcat10'
 }
diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle b/spring-session-samples/spring-session-sample-javaconfig-security/spring-session-sample-javaconfig-security.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle b/spring-session-samples/spring-session-sample-misc-hazelcast/spring-session-sample-misc-hazelcast.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle b/spring-session-samples/spring-session-sample-xml-jdbc/spring-session-sample-xml-jdbc.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 
diff --git a/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle b/spring-session-samples/spring-session-sample-xml-redis/spring-session-sample-xml-redis.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "org.gretty" version "3.0.7"
+    id "org.gretty" version "4.0.0"
     id "io.spring.convention.spring-sample-war"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin {`
`36`	`36`	`pluginManager.apply("org.gretty");`
`37`	`37`
`38`	`38`	`project.gretty {`
`39`		`- servletContainer = 'tomcat85'`
	`39`	`+ servletContainer = 'tomcat10'`
`40`	`40`	`contextPath = '/'`
`41`	`41`	`fileLogEnabled = false`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id "org.gretty" version "3.0.7"`
	`2`	`+ id "org.gretty" version "4.0.0"`
`3`	`3`	`id "io.spring.convention.spring-sample-war"`
`4`	`4`	`}`
`5`	`5`