Commit 7ebe4935 authored by Phillip Webb's avatar Phillip Webb

Restore dependency in `maven-shade-plugin`

Restore `spring-boot-maven-plugin` dependency in `maven-shade-plugin`
starter configuration. Required so that the shade plugin can use
`PropertiesMergingResourceTransformer` if wanted.

Fixes gh-11200
parent d7251f52
...@@ -179,6 +179,13 @@ ...@@ -179,6 +179,13 @@
</filter> </filter>
</filters> </filters>
</configuration> </configuration>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
...@@ -210,7 +217,8 @@ ...@@ -210,7 +217,8 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> <!--This plugin's configuration is used to store Eclipse m2e settings
only. It has no influence on the Maven build itself. -->
<plugin> <plugin>
<groupId>org.eclipse.m2e</groupId> <groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId> <artifactId>lifecycle-mapping</artifactId>
......
...@@ -10,8 +10,12 @@ ...@@ -10,8 +10,12 @@
<xsl:apply-templates select="@*|node()" /> <xsl:apply-templates select="@*|node()" />
</xsl:copy> </xsl:copy>
</xsl:template> </xsl:template>
<xsl:template
match="/m:project/m:build/m:pluginManagement/m:plugins/m:plugin/m:dependencies/m:dependency/m:version/text()[. = '${revision}']">
<xsl:value-of select="/m:project/m:version/text()" />
</xsl:template>
<xsl:template match="/m:project/m:properties/m:main.basedir" /> <xsl:template match="/m:project/m:properties/m:main.basedir" />
<xsl:template match="/m:project/m:groupId" /> <xsl:template match="/m:project/m:groupId" />
<xsl:template match="/m:project/m:version" /> <xsl:template match="/m:project/m:version" />
<xsl:template match="/m:project/m:build/m:plugins" /> <xsl:template match="/m:project/m:build/m:plugins" />
</xsl:stylesheet> </xsl:stylesheet>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment