Merge pull request eugenp#7989 from dkapil/task/FixIntegrationBuild_101019

jzheaux · web-flow · commit 0b6f07b8ba34 · 2019-10-10T01:20:29.000-06:00
Added fixes in root pom to fix integration builds
diff --git a/pom.xml b/pom.xml
@@ -704,6 +704,7 @@
 				<module>spring-boot-security</module>
 				<module>spring-boot-testing</module>
 				<module>spring-boot-vue</module>
+				<module>spring-caching</module>
 				<module>spring-boot-libraries</module>
 
 				
@@ -746,6 +747,7 @@
 
 				<module>spring-mobile</module>
 				<module>spring-mockito</module>
+				<module>spring-mvc-basics-2</module>
 				<module>spring-mvc-forms-jsp</module>
 				<module>spring-mvc-forms-thymeleaf</module>
 				<module>spring-mvc-java</module>
@@ -774,6 +776,8 @@
 				<module>spring-rest-simple</module>
 				<module>spring-resttemplate</module>
 				<module>spring-roo</module>
+
+				<module>spring-scheduling</module>
 				<module>spring-security-acl</module>
 				<module>spring-security-angular/server</module>
 				<module>spring-security-cache-control</module>
@@ -798,6 +802,7 @@
 				<module>spring-security-thymeleaf</module>
 				<module>spring-security-x509</module>
 				<module>spring-session</module>
+				<module>spring-shell</module>
 				<module>spring-sleuth</module>
 				<module>spring-soap</module>
 				<module>spring-social-login</module>
@@ -881,7 +886,6 @@
 				<module>spring-5-security-cognito</module>
 				<module>spring-activiti</module>
 				<module>spring-akka</module>
-				<module>spring-all</module>
 				<module>spring-aop</module>
 				<module>spring-apache-camel</module>
 				<module>spring-batch</module>
@@ -1432,6 +1436,7 @@
 
 				<module>spring-core</module>
 				<module>spring-core-2</module>
+				<module>spring-core-3</module>
 				<module>spring-cucumber</module>
 
 				<module>spring-data-rest</module>
diff --git a/spring-core-2/pom.xml b/spring-core-2/pom.xml
@@ -162,7 +162,7 @@
     </dependencyManagement>
 
     <build>
-        <finalName>spring-all</finalName>
+        <finalName>spring-core-2</finalName>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
diff --git a/spring-shell/pom.xml b/spring-shell/pom.xml
@@ -1,9 +1,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-core-2</artifactId>
+    <artifactId>spring-shell</artifactId>
     <version>0.1-SNAPSHOT</version>
-    <name>spring-core-2</name>
+    <name>spring-shell</name>
     <packaging>war</packaging>
 
     <parent>
