Merge branch 'master' into bael-16656

spring-boot-cli/groovy/data/DataConfig.groovy

@@ -0,0 +1,23 @@
+package bael.data
+
+@Grab('h2')
+
+import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.ComponentScan
+import org.springframework.context.annotation.Configuration
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType
+import org.springframework.web.servlet.config.annotation.EnableWebMvc
+import javax.sql.DataSource
+
+@Configuration
+@EnableWebMvc
+@ComponentScan('bael.data')
+class DataConfig {
+
+    @Bean
+    DataSource dataSource() {
+        return new EmbeddedDatabaseBuilder().setType(EmbeddedDatabaseType.H2).build();
+    }
+
+}