|
1 |
| -<?xml version="1.0" encoding="UTF-8" standalone="no"?> |
| 1 | +<?xml version="1.0" encoding="UTF-8"?> |
2 | 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 https://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 3 | + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> |
4 | 4 | <modelVersion>4.0.0</modelVersion>
|
5 | 5 |
|
6 | 6 | <parent>
|
|
67 | 67 | <maven.compiler.release>${oh.java.version}</maven.compiler.release>
|
68 | 68 |
|
69 | 69 | <sat.version>0.17.0</sat.version>
|
70 |
| - <spotless.version>2.43.0</spotless.version> |
| 70 | + <spotless.version>2.44.3</spotless.version> |
71 | 71 | <!-- Eclipse Java formatter version 4.26+ does not check test files -->
|
72 | 72 | <spotless.eclipse.version>4.25</spotless.eclipse.version>
|
73 | 73 | <spotless.eclipse.wtp.version>4.21.0</spotless.eclipse.wtp.version>
|
|
169 | 169 | </execution>
|
170 | 170 | </executions>
|
171 | 171 | </plugin>
|
172 |
| - <plugin> |
173 |
| - <groupId>com.github.ekryd.sortpom</groupId> |
174 |
| - <artifactId>sortpom-maven-plugin</artifactId> |
175 |
| - <version>4.0.0</version> |
176 |
| - <configuration> |
177 |
| - <predefinedSortOrder>recommended_2008_06</predefinedSortOrder> |
178 |
| - <createBackupFile>false</createBackupFile> |
179 |
| - <keepBlankLines>true</keepBlankLines> |
180 |
| - </configuration> |
181 |
| - <executions> |
182 |
| - <execution> |
183 |
| - <id>sortpom-verify</id> |
184 |
| - <goals> |
185 |
| - <goal>verify</goal> |
186 |
| - </goals> |
187 |
| - <phase>verify</phase> |
188 |
| - <configuration> |
189 |
| - <verifyFail>Stop</verifyFail> |
190 |
| - </configuration> |
191 |
| - </execution> |
192 |
| - </executions> |
193 |
| - </plugin> |
194 | 172 | <plugin>
|
195 | 173 | <groupId>com.diffplug.spotless</groupId>
|
196 | 174 | <artifactId>spotless-maven-plugin</artifactId>
|
197 | 175 | <version>${spotless.version}</version>
|
198 | 176 | <configuration>
|
199 |
| - <formats> |
200 |
| - <format> |
201 |
| - <!-- pom.xml --> |
202 |
| - <includes> |
203 |
| - <include>pom.xml</include> |
204 |
| - </includes> |
205 |
| - <eclipseWtp> |
206 |
| - <type>XML</type> |
207 |
| - <files> |
208 |
| - <file>openhab_wst_pom_file.prefs</file> |
209 |
| - </files> |
210 |
| - <version>${spotless.eclipse.wtp.version}</version> |
211 |
| - </eclipseWtp> |
212 |
| - <trimTrailingWhitespace/> |
213 |
| - <endWithNewline/> |
214 |
| - </format> |
215 |
| - </formats> |
| 177 | + <pom> |
| 178 | + <sortPom> |
| 179 | + <expandEmptyElements>false</expandEmptyElements> |
| 180 | + <indentAttribute>schemaLocation</indentAttribute> |
| 181 | + <predefinedSortOrder>recommended_2008_06</predefinedSortOrder> |
| 182 | + <sortDependencyExclusions/> |
| 183 | + <sortDependencyManagement/> |
| 184 | + </sortPom> |
| 185 | + </pom> |
216 | 186 | </configuration>
|
217 | 187 | <dependencies>
|
218 | 188 | <dependency>
|
|
268 | 238 | </execution>
|
269 | 239 | </executions>
|
270 | 240 | </plugin>
|
271 |
| - <plugin> |
272 |
| - <groupId>com.github.ekryd.sortpom</groupId> |
273 |
| - <artifactId>sortpom-maven-plugin</artifactId> |
274 |
| - </plugin> |
275 | 241 | <plugin>
|
276 | 242 | <groupId>com.diffplug.spotless</groupId>
|
277 | 243 | <artifactId>spotless-maven-plugin</artifactId>
|
|
0 commit comments