Merge pull request #7989 from dkapil/task/FixIntegrationBuild_101019

Added fixes in root pom to fix integration builds
This commit is contained in:
Josh Cummings 2019-10-10 01:20:29 -06:00 committed by GitHub
commit 0b6f07b8ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions

View File

@ -704,6 +704,7 @@
<module>spring-boot-security</module> <module>spring-boot-security</module>
<module>spring-boot-testing</module> <module>spring-boot-testing</module>
<module>spring-boot-vue</module> <module>spring-boot-vue</module>
<module>spring-caching</module>
<module>spring-boot-libraries</module> <module>spring-boot-libraries</module>
@ -746,6 +747,7 @@
<module>spring-mobile</module> <module>spring-mobile</module>
<module>spring-mockito</module> <module>spring-mockito</module>
<module>spring-mvc-basics-2</module>
<module>spring-mvc-forms-jsp</module> <module>spring-mvc-forms-jsp</module>
<module>spring-mvc-forms-thymeleaf</module> <module>spring-mvc-forms-thymeleaf</module>
<module>spring-mvc-java</module> <module>spring-mvc-java</module>
@ -774,6 +776,8 @@
<module>spring-rest-simple</module> <module>spring-rest-simple</module>
<module>spring-resttemplate</module> <module>spring-resttemplate</module>
<module>spring-roo</module> <module>spring-roo</module>
<module>spring-scheduling</module>
<module>spring-security-acl</module> <module>spring-security-acl</module>
<module>spring-security-angular/server</module> <module>spring-security-angular/server</module>
<module>spring-security-cache-control</module> <module>spring-security-cache-control</module>
@ -798,6 +802,7 @@
<module>spring-security-thymeleaf</module> <module>spring-security-thymeleaf</module>
<module>spring-security-x509</module> <module>spring-security-x509</module>
<module>spring-session</module> <module>spring-session</module>
<module>spring-shell</module>
<module>spring-sleuth</module> <module>spring-sleuth</module>
<module>spring-soap</module> <module>spring-soap</module>
<module>spring-social-login</module> <module>spring-social-login</module>
@ -881,7 +886,6 @@
<module>spring-5-security-cognito</module> <module>spring-5-security-cognito</module>
<module>spring-activiti</module> <module>spring-activiti</module>
<module>spring-akka</module> <module>spring-akka</module>
<module>spring-all</module>
<module>spring-aop</module> <module>spring-aop</module>
<module>spring-apache-camel</module> <module>spring-apache-camel</module>
<module>spring-batch</module> <module>spring-batch</module>
@ -1432,6 +1436,7 @@
<module>spring-core</module> <module>spring-core</module>
<module>spring-core-2</module> <module>spring-core-2</module>
<module>spring-core-3</module>
<module>spring-cucumber</module> <module>spring-cucumber</module>
<module>spring-data-rest</module> <module>spring-data-rest</module>

View File

@ -162,7 +162,7 @@
</dependencyManagement> </dependencyManagement>
<build> <build>
<finalName>spring-all</finalName> <finalName>spring-core-2</finalName>
<resources> <resources>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>

View File

@ -1,9 +1,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> 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> <modelVersion>4.0.0</modelVersion>
<artifactId>spring-core-2</artifactId> <artifactId>spring-shell</artifactId>
<version>0.1-SNAPSHOT</version> <version>0.1-SNAPSHOT</version>
<name>spring-core-2</name> <name>spring-shell</name>
<packaging>war</packaging> <packaging>war</packaging>
<parent> <parent>