diff --git a/pom.xml b/pom.xml index 1b6adf30c15..5be17f66d8e 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,6 @@ spring-boot-actuator spring-boot-starters spring-boot-cli - spring-boot-cli-properties spring-boot-integration-tests diff --git a/spring-boot-cli-properties/pom.xml b/spring-boot-cli-properties/pom.xml deleted file mode 100644 index 69fe5538459..00000000000 --- a/spring-boot-cli-properties/pom.xml +++ /dev/null @@ -1,536 +0,0 @@ - - - 4.0.0 - - org.springframework.boot - spring-boot-parent - 0.5.0.BUILD-SNAPSHOT - ../spring-boot-parent - - spring-boot-cli-properties - jar - - ${basedir}/.. - - - - - ${project.groupId} - spring-boot-starter - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-actuator - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-aop - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-batch - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-data-jpa - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-integration - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-jdbc - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-jetty - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-logging - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-security - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-tomcat - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-web - ${project.version} - provided - - - ${project.groupId} - spring-boot-starter-websocket - ${project.version} - provided - - - ch.qos.logback - logback-classic - provided - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - provided - - - com.fasterxml.jackson.datatype - jackson-datatype-joda - provided - - - commons-dbcp - commons-dbcp - provided - - - commons-httpclient - commons-httpclient - provided - - - javax.servlet - javax.servlet-api - provided - - - javax.servlet - jstl - provided - - - joda-time - joda-time - provided - - - junit - junit - provided - - - log4j - log4j - provided - - - nz.net.ultraq.thymeleaf - thymeleaf-layout-dialect - provided - - - org.apache.activemq - activemq-core - provided - - - org.apache.tomcat.embed - tomcat-embed-core - provided - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - provided - - - org.apache.tomcat.embed - tomcat-embed-jasper - provided - - - org.apache.tomcat - tomcat-jdbc - provided - - - org.apache.tomcat - tomcat-jsp-api - provided - - - org.aspectj - aspectjrt - provided - - - org.aspectj - aspectjweaver - provided - - - org.codehaus.groovy - groovy-templates - provided - - - org.eclipse.jetty - jetty-webapp - provided - - - javax.servlet - org.eclipse.jetty.orbit - - - - - org.eclipse.jetty - jetty-util - provided - - - org.eclipse.jetty - jetty-jsp - provided - - - org.eclipse.jetty - jetty-annotations - provided - - - org.hamcrest - hamcrest-library - provided - - - com.h2database - h2 - provided - - - org.hibernate - hibernate-entitymanager - provided - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - provided - - - org.hibernate - hibernate-validator - provided - - - org.hsqldb - hsqldb - provided - - - org.liquibase - liquibase-core - provided - - - org.projectreactor - reactor-spring - provided - - - org.mockito - mockito-core - provided - - - org.slf4j - jcl-over-slf4j - provided - - - org.slf4j - slf4j-api - provided - - - org.slf4j - jul-to-slf4j - provided - - - org.slf4j - slf4j-log4j12 - provided - - - org.slf4j - slf4j-jdk14 - provided - - - org.springframework - spring-aop - provided - - - org.springframework - spring-beans - provided - - - org.springframework - spring-core - provided - - - org.springframework - spring-context - provided - - - org.springframework - spring-context-support - provided - - - quartz - quartz - - - - - org.springframework - spring-expression - provided - - - org.springframework - spring-jdbc - provided - - - org.springframework - spring-jms - provided - - - org.springframework - spring-messaging - provided - - - org.springframework - spring-orm - provided - - - org.springframework - spring-oxm - provided - - - commons-lang - commons-lang - - - - - org.springframework - spring-test - provided - - - org.springframework - spring-tx - provided - - - org.springframework - spring-websocket - provided - - - org.springframework - spring-web - provided - - - org.springframework - spring-webmvc - provided - - - commons-logging - commons-logging - - - - - org.springframework.batch - spring-batch-core - provided - - - org.springframework.data - spring-data-jpa - provided - - - org.springframework - spring-jdbc - - - org.springframework - spring-orm - - - - - org.springframework.data - spring-data-mongodb - provided - - - org.springframework.integration - spring-integration-core - provided - - - org.springframework.integration - spring-integration-file - provided - - - org.springframework.integration - spring-integration-http - provided - - - org.springframework.integration - spring-integration-ip - provided - - - org.springframework.integration - spring-integration-stream - provided - - - org.springframework.integration - spring-integration-dsl-groovy-core - provided - - - org.springframework.security - spring-security-core - provided - - - org.springframework.security - spring-security-config - provided - - - org.springframework.security - spring-security-web - provided - - - org.springframework.security - spring-security-acl - provided - - - org.thymeleaf - thymeleaf - provided - - - org.thymeleaf - thymeleaf-spring3 - provided - - - org.thymeleaf.extras - thymeleaf-extras-springsecurity3 - provided - - - org.yaml - snakeyaml - provided - - - org.apache.geronimo.specs - geronimo-jms_1.1_spec - provided - - - org.spockframework - spock-core - provided - - - - - - ${project.build.directory}/generated-resources - - - - - maven-jar-plugin - - - org.apache.maven.plugins - maven-antrun-plugin - - - generate-cli-properties - generate-sources - - - - - - - - - - run - - - - - - - diff --git a/spring-boot-cli-properties/src/main/resources/META-INF/springcli.properties.vpp b/spring-boot-cli-properties/src/main/resources/META-INF/springcli.properties.vpp deleted file mode 100644 index ff05b44b4ee..00000000000 --- a/spring-boot-cli-properties/src/main/resources/META-INF/springcli.properties.vpp +++ /dev/null @@ -1,18 +0,0 @@ -#set( $artifacts = $project.getReference('maven.project').artifacts ) -#foreach( $artifact in $artifacts ) -#if ( $artifact.scope == 'provided' ) -${artifact.artifactId}.version: $artifact.version -${artifact.artifactId}.groupId: $artifact.groupId -#end -#end -groovy.version: $ant.get('groovy.version') -jetty.version: $ant.get('jetty.version') -reactor.version: $ant.get('reactor.version') -spring.version: $ant.get('spring.version') -spring-batch.version: $ant.get('spring-batch.version') -spring-boot.version: $ant.get('project.version') -spring-rabbit.version: $ant.get('spring-rabbit.version') -spring-security.version: $ant.get('spring-security.version') -spring-integration.version: $ant.get('spring-integration.version') -spring-integration-groovydsl.version: $ant.get('spring-integration-groovydsl.version') -tomcat.version: $ant.get('tomcat.version') \ No newline at end of file diff --git a/spring-boot-cli/pom.xml b/spring-boot-cli/pom.xml index a54deb24b3d..436779bd7d8 100644 --- a/spring-boot-cli/pom.xml +++ b/spring-boot-cli/pom.xml @@ -14,13 +14,29 @@ ${basedir}/.. org.springframework.boot.cli.SpringCli + + + + org.springframework.boot + spring-boot-starter-parent + 0.5.0.BUILD-SNAPSHOT + pom + import + + + org.codehaus.groovy + groovy-xml + ${groovy.version} + + + org.projectreactor + reactor-core + ${reactor.version} + + + - - ${project.groupId} - spring-boot-cli-properties - ${project.version} - net.sf.jopt-simple jopt-simple @@ -76,6 +92,12 @@ src/main/resources true + + **/*.vpp + + + + ${project.build.directory}/generated-resources src/main/groovy @@ -151,6 +173,47 @@ + + org.apache.maven.plugins + maven-antrun-plugin + + + generate-cli-properties + generate-sources + + + + + + + + + + run + + + + + + foundrylogic.vpp + vpp + 2.2.1 + + + + + + objectstyle + ObjectStyle.org Repository + http://objectstyle.org/maven2/ + + false + + + diff --git a/spring-boot-cli/src/main/resources/META-INF/springcli.properties.vpp b/spring-boot-cli/src/main/resources/META-INF/springcli.properties.vpp new file mode 100644 index 00000000000..5dab540676f --- /dev/null +++ b/spring-boot-cli/src/main/resources/META-INF/springcli.properties.vpp @@ -0,0 +1,12 @@ +#set( $artifacts = $project.getReference('maven.project').dependencyManagement.dependencies ) +#foreach( $artifact in $artifacts ) +#if ( $artifact.type == 'jar' ) +${artifact.artifactId}.version: $artifact.version +${artifact.artifactId}.groupId: $artifact.groupId +#end +#end +#foreach( $entry in $project.getReference('maven.project').properties.entrySet() ) +#if ( $entry.key.endsWith('.version') ) +$entry.key: $entry.value +#end +#end \ No newline at end of file diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml index 08f81e9329c..cbe33f83131 100644 --- a/spring-boot-parent/pom.xml +++ b/spring-boot-parent/pom.xml @@ -211,11 +211,6 @@ ant 1.7.0 - - foundrylogic.vpp - vpp - 2.2.1 - @@ -328,14 +323,6 @@ true - - objectstyle - ObjectStyle.org Repository - http://objectstyle.org/maven2/ - - false - -