Skip to content

Commit b03f890

Browse files
committed
Upgrade to spring-javaformat 0.0.2
1 parent 5692b83 commit b03f890

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
lines changed

spring-boot-dependencies/pom.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?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">
1+
<?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">
32
<modelVersion>4.0.0</modelVersion>
43
<groupId>org.springframework.boot</groupId>
54
<artifactId>spring-boot-dependencies</artifactId>
@@ -3258,4 +3257,4 @@
32583257
<id>integration-test</id>
32593258
</profile>
32603259
</profiles>
3261-
</project>
3260+
</project>

spring-boot-parent/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2727
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2828
<maven.version>3.1.1</maven.version>
29-
<spring-javaformat.version>0.0.1</spring-javaformat.version>
29+
<spring-javaformat.version>0.0.2</spring-javaformat.version>
3030
</properties>
3131
<scm>
3232
<url>http://github.com/spring-projects/spring-boot</url>
@@ -506,11 +506,6 @@
506506
<groupId>io.spring.javaformat</groupId>
507507
<artifactId>spring-javaformat-maven-plugin</artifactId>
508508
<version>${spring-javaformat.version}</version>
509-
<configuration>
510-
<excludes>
511-
<exclude>**/HelpMojo.java</exclude>
512-
</excludes>
513-
</configuration>
514509
<executions>
515510
<execution>
516511
<phase>validate</phase>

spring-boot-samples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<properties>
2222
<main.basedir>${basedir}/..</main.basedir>
2323
<java.version>1.8</java.version>
24-
<spring-javaformat.version>0.0.1</spring-javaformat.version>
24+
<spring-javaformat.version>0.0.2</spring-javaformat.version>
2525
</properties>
2626
<modules>
2727
<module>spring-boot-sample-ant</module>

spring-boot-samples/spring-boot-sample-ant/pom.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?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">
1+
<?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">
32
<!-- This POM is just to trigger the Ant/Ivy sample from Maven and to test -->
43
<modelVersion>4.0.0</modelVersion>
54
<parent>
@@ -62,8 +61,8 @@
6261
<phase>package</phase>
6362
<configuration>
6463
<target>
65-
<property name="build.compiler" value="extJavac" />
66-
<ant dir="${basedir}" />
64+
<property name="build.compiler" value="extJavac"/>
65+
<ant dir="${basedir}"/>
6766
</target>
6867
</configuration>
6968
<goals>
@@ -103,4 +102,4 @@
103102
</plugin>
104103
</plugins>
105104
</build>
106-
</project>
105+
</project>

spring-boot-starters/spring-boot-starter-parent/pom.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?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">
1+
<?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">
32
<modelVersion>4.0.0</modelVersion>
43
<parent>
54
<groupId>org.springframework.boot</groupId>
@@ -206,7 +205,7 @@
206205
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
207206
<resource>META-INF/spring.schemas</resource>
208207
</transformer>
209-
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
208+
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
210209
<transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
211210
<mainClass>${start-class}</mainClass>
212211
</transformer>
@@ -218,4 +217,4 @@
218217
</plugins>
219218
</pluginManagement>
220219
</build>
221-
</project>
220+
</project>

0 commit comments

Comments
 (0)