Refactor cli properties into single project

pom.xml

@@ -37,7 +37,6 @@
 				<module>spring-boot-actuator</module>
 				<module>spring-boot-starters</module>
 				<module>spring-boot-cli</module>
-				<module>spring-boot-cli-properties</module>
 				<module>spring-boot-integration-tests</module>
 			</modules>
 		</profile>

spring-boot-cli-properties/src/main/resources/META-INF/springcli.properties.vpp

-#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

spring-boot-cli/pom.xml

@@ -14,13 +14,29 @@
 		<main.basedir>${basedir}/..</main.basedir>
 		<start-class>org.springframework.boot.cli.SpringCli</start-class>
 	</properties>
+	<dependencyManagement>
 		<dependencies>
-		<!-- Compile -->
 			<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-boot-cli-properties</artifactId>
-			<version>${project.version}</version>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-starter-parent</artifactId>
+				<version>0.5.0.BUILD-SNAPSHOT</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.codehaus.groovy</groupId>
+				<artifactId>groovy-xml</artifactId>
+				<version>${groovy.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.projectreactor</groupId>
+				<artifactId>reactor-core</artifactId>
+				<version>${reactor.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<dependencies>
+		<!-- Compile -->
 		<dependency>
 			<groupId>net.sf.jopt-simple</groupId>
 			<artifactId>jopt-simple</artifactId>
@@ -76,6 +92,12 @@
 			<resource>
 				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
+                <excludes>
+                    <exclude>**/*.vpp</exclude>
+                </excludes>
+			</resource>
+			<resource>
+				<directory>${project.build.directory}/generated-resources</directory>
 			</resource>
 			<resource>
 				<directory>src/main/groovy</directory>
@@ -151,6 +173,47 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-cli-properties</id>
+						<phase>generate-sources</phase>
+						<configuration>
+							<target>
+								<typedef resource="foundrylogic/vpp/typedef.properties" />
+								<taskdef resource="foundrylogic/vpp/taskdef.properties" />
+								<property name="dependencies" value="${project.parent}" />
+								<vppcopy
+									file="${basedir}/src/main/resources/META-INF/springcli.properties.vpp"
+									tofile="${project.build.directory}/generated-resources/META-INF/springcli.properties"
+									overwrite="true" />
+							</target>
+						</configuration>
+						<goals>
+							<goal>run</goal>
+						</goals>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>foundrylogic.vpp</groupId>
+						<artifactId>vpp</artifactId>
+						<version>2.2.1</version>
+					</dependency>
+				</dependencies>
+			</plugin>
 		</plugins>
 	</build>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>objectstyle</id>
+			<name>ObjectStyle.org Repository</name>
+			<url>http://objectstyle.org/maven2/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</pluginRepository>
+	</pluginRepositories>
 </project>

spring-boot-cli/src/main/resources/META-INF/springcli.properties.vpp

+#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

spring-boot-parent/pom.xml

@@ -211,11 +211,6 @@
 							<artifactId>ant</artifactId>
 							<version>1.7.0</version>
 						</dependency>
-						<dependency>
-							<groupId>foundrylogic.vpp</groupId>
-							<artifactId>vpp</artifactId>
-							<version>2.2.1</version>
-						</dependency>
 					</dependencies>
 				</plugin>
 				<plugin>
@@ -328,14 +323,6 @@
 						<enabled>true</enabled>
 					</snapshots>
 				</pluginRepository>
-				<pluginRepository>
-					<id>objectstyle</id>
-					<name>ObjectStyle.org Repository</name>
-					<url>http://objectstyle.org/maven2/</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
 			</pluginRepositories>
 		</profile>
 		<profile>