diff --git a/app.groovy b/app.groovy
index 893e73ff..82051916 100644
--- a/app.groovy
+++ b/app.groovy
@@ -1,5 +1,5 @@
-@Grab("org.springframework.bootstrap:spring-bootstrap-actuator:0.5.0.BUILD-SNAPSHOT")
-@Grab("org.codehaus.groovy:groovy-ant:2.1.3")
+@Grab("org.springframework.zero:spring-actuator:0.5.0.BUILD-SNAPSHOT")
+@Grab("org.codehaus.groovy:groovy-ant:2.1.6")
@Grab("org.codehaus.groovy.modules.http-builder:http-builder:0.5.2")
@Grab(group='net.sf.json-lib', module='json-lib', version='2.3', classifier='jdk15')
import groovyx.net.http.*
@@ -107,17 +107,18 @@ class MainController {
}
-@Grab("org.springframework.security:spring-security-javaconfig:1.0.0.CI-SNAPSHOT")
+@Grab("org.springframework.security:spring-security-config:3.2.0.M2")
+@Grab(value="org.springframework.security:spring-security-web:3.2.0.M2", transitive=false)
import org.springframework.security.config.annotation.web.*
import org.springframework.security.authentication.*
import org.springframework.security.core.Authentication
import org.springframework.security.core.authority.AuthorityUtils
-import org.springframework.bootstrap.actuate.properties.SecurityProperties
+import org.springframework.actuate.properties.SecurityProperties
@Configuration
@Log
class SecurityConfiguration {
- @Bean(name = "org.springframework.bootstrap.actuate.properties.SecurityProperties")
+ @Bean(name = "org.springframework.actuate.properties.SecurityProperties")
SecurityProperties securityProperties() {
SecurityProperties security = new SecurityProperties()
security.getBasic().setPath("/gs/**")
@@ -141,7 +142,7 @@ class PomRequest {
def style = []
String name = "demo"
- String description = "Demo project for Spring Bootstrap"
+ String description = "Demo project for Spring Zero"
String groupId = "org.test"
String artifactId
String version = "0.0.1.SNAPSHOT"
diff --git a/cacerts b/cacerts
deleted file mode 100644
index 7ae128ae..00000000
Binary files a/cacerts and /dev/null differ
diff --git a/logback.xml b/logback.xml
new file mode 100644
index 00000000..c08f8de9
--- /dev/null
+++ b/logback.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+ ${CONSOLE_LOG_PATTERN}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/logging.properties b/logging.properties
deleted file mode 100644
index fa7b1113..00000000
--- a/logging.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-handlers = java.util.logging.ConsoleHandler
-.level = INFO
-
-java.util.logging.ConsoleHandler.level = FINE
-sun.net.www.protocol.http.HttpURLConnection.level = ALL
-#org.apache.http.level = ALL
-#groovyx.net.http.level = ALL
-org.springframework.bootstrap = ALL
diff --git a/manifest.yml b/manifest.yml
index 3b1f7539..10eb2ba7 100644
--- a/manifest.yml
+++ b/manifest.yml
@@ -1,8 +1,9 @@
---
applications:
-- name: spring
+- name: initializr
memory: 1024M
instances: 1
- url: spring.cfapps.io
+ url: initializr.cfapps.io
path: .
- command: JAVA_OPTS=-Djava.util.logging.config.file=logging.properties cp cacerts .jdk/lib/security && ./spring/bin/spring run --local app.groovy -- --server.port=$PORT
+ command: java -jar ./spring/lib/*.jar run --local app.groovy -- --server.port=$PORT
+ buildpack: https://github.com/cloudfoundry/cloudfoundry-buildpack-java
diff --git a/templates/starter-pom.xml b/templates/starter-pom.xml
index 5589aec2..c2b7202e 100644
--- a/templates/starter-pom.xml
+++ b/templates/starter-pom.xml
@@ -11,15 +11,15 @@
${description}
- org.springframework.bootstrap
- spring-bootstrap-starters
+ org.springframework.zero
+ spring-starter-parent
0.5.0.BUILD-SNAPSHOT
<% styles.each { %>
- org.springframework.bootstrap
- spring-bootstrap-${it}starter
+ org.springframework.zero
+ spring-starter-${it}
<% } %>