SpringCloud/spring-cloud-build
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.x'

Browse Source
This commit is contained in:
Spencer Gibb
2019-03-13 16:33:23 -04:00
parent d9abf1ed42 9965c61542
commit 914e6bda9c
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -235,7 +235,7 @@
</execution>
</executions>
</plugin>
<plugin>
<!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.0.0</version>
@@ -250,7 +250,7 @@
</pomElements>
</configuration>
<executions>
<!-- enable flattening -->
&lt;!&ndash; enable flattening &ndash;&gt;
<execution>
<id>flatten</id>
<phase>process-resources</phase>
@@ -258,7 +258,7 @@
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
&lt;!&ndash; ensure proper cleanup &ndash;&gt;
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
@@ -267,7 +267,7 @@
</goals>
</execution>
</executions>
</plugin>
</plugin>-->
</plugins>
<pluginManagement>
<plugins>

8
spring-cloud-dependencies-parent/pom.xml
View File

@@ -196,7 +196,7 @@
</profiles>
<build>
<plugins>
<plugin>
<!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>flatten-maven-plugin</artifactId>
<version>1.0.0</version>
@@ -211,7 +211,7 @@
</pomElements>
</configuration>
<executions>
<!-- enable flattening -->
&lt;!&ndash; enable flattening &ndash;&gt;
<execution>
<id>flatten</id>
<phase>process-resources</phase>
@@ -219,7 +219,7 @@
<goal>flatten</goal>
</goals>
</execution>
<!-- ensure proper cleanup -->
&lt;!&ndash; ensure proper cleanup &ndash;&gt;
<execution>
<id>flatten.clean</id>
<phase>clean</phase>
@@ -228,7 +228,7 @@
</goals>
</execution>
</executions>
</plugin>
</plugin>-->
</plugins>
<pluginManagement>
<plugins>