mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Fixup POM harmonization
Fix POM harmonization so that the release process now prepares the dependencies POM rather than starter-parent
This commit is contained in:
parent
33082fd56d
commit
a13404c670
17
pom.xml
17
pom.xml
@ -153,7 +153,7 @@
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>fixup-starter-parent</id>
|
||||
<id>fixup-dependencies-pom</id>
|
||||
<phase>verify</phase>
|
||||
<goals>
|
||||
<goal>run</goal>
|
||||
@ -161,7 +161,7 @@
|
||||
<inherited>false</inherited>
|
||||
<configuration>
|
||||
<target>
|
||||
<property name="sourceFile" value="spring-boot-starters/spring-boot-starter-parent/pom.xml" />
|
||||
<property name="sourceFile" value="spring-boot-dependencies/pom.xml" />
|
||||
<xslt in="${sourceFile}" out="${sourceFile}.new" force="true">
|
||||
<style>
|
||||
<string><![CDATA[
|
||||
@ -177,19 +177,8 @@
|
||||
|
||||
<xsl:template
|
||||
match="m:properties/m:spring-boot.version/text()">
|
||||
<xsl:value-of select="/m:project/m:parent/m:version/text()"/>
|
||||
<xsl:value-of select="/m:project/m:version/text()"/>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template
|
||||
match="m:dependency[m:groupId='org.springframework.boot']/m:version/text()">
|
||||
<xsl:text>${spring-boot.version}</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template
|
||||
match="m:plugin[m:groupId='org.springframework.boot']/m:version/text()">
|
||||
<xsl:text>${spring-boot.version}</xsl:text>
|
||||
</xsl:template>
|
||||
|
||||
</xsl:stylesheet>
|
||||
]]>
|
||||
</string>
|
||||
|
@ -1,6 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<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">
|
||||
<?xml version="1.0" encoding="UTF-8"?><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>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-dependencies</artifactId>
|
||||
@ -45,8 +43,8 @@
|
||||
</developer>
|
||||
</developers>
|
||||
<properties>
|
||||
<!-- Spring Boot -->
|
||||
<spring-boot.version>1.1.0.BUILD-SNAPSHOT</spring-boot.version>
|
||||
<!-- Spring Boot (replaced during a full build to a real value) -->
|
||||
<spring-boot.version>${project.version}</spring-boot.version>
|
||||
<!-- Third Party -->
|
||||
<activemq.version>5.7.0</activemq.version>
|
||||
<aspectj.version>1.7.4</aspectj.version>
|
||||
@ -147,7 +145,6 @@
|
||||
<artifactId>spring-boot-loader-tools</artifactId>
|
||||
<version>${spring-boot.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter</artifactId>
|
||||
@ -885,6 +882,11 @@
|
||||
<build>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||
<version>${spring-boot.version}</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-antrun-plugin</artifactId>
|
||||
|
@ -25,7 +25,6 @@
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-aop</artifactId>
|
||||
<version>${project.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
|
Loading…
Reference in New Issue
Block a user