Skip to content

Commit

Permalink
Merge pull request eugenp#7989 from dkapil/task/FixIntegrationBuild_1…
Browse files Browse the repository at this point in the history
…01019

Added fixes in root pom to fix integration builds
  • Loading branch information
jzheaux authored Oct 10, 2019
2 parents ed23b83 + 97610a2 commit 0b6f07b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
7 changes: 6 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>


Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spring-core-2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
</dependencyManagement>

<build>
<finalName>spring-all</finalName>
<finalName>spring-core-2</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
Expand Down
4 changes: 2 additions & 2 deletions spring-shell/pom.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down

0 comments on commit 0b6f07b

Please sign in to comment.