Skip to content

Commit 488b033

Browse files
author
Phillip Webb
committed
Polish POM formatting
1 parent 6f9bb23 commit 488b033

File tree

67 files changed

+188
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+188
-116
lines changed

‎pom.xml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>org.springframework.boot</groupId>
56
<artifactId>spring-boot-build</artifactId>
@@ -95,15 +96,20 @@
9596
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
9697
<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
9798
<var name="version-type" value="${project.version}" />
98-
<propertyregex property="version-type" override="true" input="${version-type}" regexp=".*\.(.*)" replace="\1" />
99-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
100-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
101-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
99+
<propertyregex property="version-type" override="true"
100+
input="${version-type}" regexp=".*\.(.*)" replace="\1" />
101+
<propertyregex property="version-type" override="true"
102+
input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
103+
<propertyregex property="version-type" override="true"
104+
input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
105+
<propertyregex property="version-type" override="true"
106+
input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
102107
<stringutil string="${version-type}" property="profile">
103108
<lowercase />
104109
</stringutil>
105110
<echo message="Writing settings for ${profile} profile" />
106-
<copy file=".settings-template.xml" tofile="settings.xml" overwrite="true">
111+
<copy file=".settings-template.xml" tofile="settings.xml"
112+
overwrite="true">
107113
<filterset>
108114
<filter token="profile" value="${profile}" />
109115
</filterset>
@@ -120,7 +126,8 @@
120126
<inherited>false</inherited>
121127
<configuration>
122128
<target>
123-
<property name="sourceFile" value="spring-boot-starters/spring-boot-starter-parent/pom.xml" />
129+
<property name="sourceFile"
130+
value="spring-boot-starters/spring-boot-starter-parent/pom.xml" />
124131
<xslt in="${sourceFile}" out="${sourceFile}.new" force="true">
125132
<style>
126133
<string><![CDATA[

‎spring-boot-actuator/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>

‎spring-boot-autoconfigure/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>

‎spring-boot-cli/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎spring-boot-cli/pom.xml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>
@@ -258,21 +259,30 @@
258259
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
259260
<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
260261
<var name="version-type" value="${project.version}" />
261-
<propertyregex property="version-type" override="true" input="${version-type}" regexp=".*\.(.*)" replace="\1" />
262-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
263-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
264-
<propertyregex property="version-type" override="true" input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
262+
<propertyregex property="version-type" override="true"
263+
input="${version-type}" regexp=".*\.(.*)" replace="\1" />
264+
<propertyregex property="version-type" override="true"
265+
input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
266+
<propertyregex property="version-type" override="true"
267+
input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
268+
<propertyregex property="version-type" override="true"
269+
input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
265270
<stringutil string="${version-type}" property="repo">
266271
<lowercase />
267272
</stringutil>
268-
<checksum algorithm="sha-1" file="${project.build.directory}/spring-boot-cli-${project.version}-bin.tar.gz" property="checksum" />
269-
<echo message="Customizing homebrew for ${project.version} with checksum ${checksum} in ${repo} repo" />
270-
<copy file="${basedir}/src/main/homebrew/springboot.rb" tofile="${project.build.directory}/springboot.rb" overwrite="true">
273+
<checksum algorithm="sha-1"
274+
file="${project.build.directory}/spring-boot-cli-${project.version}-bin.tar.gz"
275+
property="checksum" />
276+
<echo
277+
message="Customizing homebrew for ${project.version} with checksum ${checksum} in ${repo} repo" />
278+
<copy file="${basedir}/src/main/homebrew/springboot.rb"
279+
tofile="${project.build.directory}/springboot.rb" overwrite="true">
271280
<filterchain>
272281
<expandproperties />
273282
</filterchain>
274283
</copy>
275-
<attachartifact file="${project.build.directory}/springboot.rb" classifier="homebrew" type="rb" />
284+
<attachartifact file="${project.build.directory}/springboot.rb"
285+
classifier="homebrew" type="rb" />
276286
</target>
277287
</configuration>
278288
</execution>

‎spring-boot-full-build/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<groupId>org.springframework.boot</groupId>
56
<artifactId>spring-boot-full-build</artifactId>

‎spring-boot-integration-tests/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>

‎spring-boot-parent/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>

‎spring-boot-samples/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<groupId>org.springframework.boot</groupId>

‎spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
34
<modelVersion>4.0.0</modelVersion>
45
<parent>
56
<!-- Your own application should inherit from spring-boot-starter-parent -->

0 commit comments

Comments
 (0)