Skip to content

Commit 617abf5

Browse files
committed
Added documentation for sortPom
1 parent b95e93b commit 617abf5

File tree

4 files changed

+68
-2
lines changed

4 files changed

+68
-2
lines changed

CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
1212
## [Unreleased]
1313
### Added
1414
* Added support for custom JSR223 formatters ([#945](https://github.com/diffplug/spotless/pull/945))
15+
* Added support for formating and sorting Maven POMs ([#946](https://github.com/diffplug/spotless/pull/946))
1516

1617
## [2.17.0] - 2021-09-27
1718
### Added

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ lib('generic.EndWithNewlineStep') +'{{yes}} | {{yes}}
4848
lib('generic.IndentStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
4949
lib('generic.Jsr223Step') +'{{no}} | {{yes}} | {{no}} | {{no}} |',
5050
lib('generic.LicenseHeaderStep') +'{{yes}} | {{yes}} | {{yes}} | {{no}} |',
51-
lib('generic.NativeCmdStep') +'{{no}} | {{yes}} | {{no}} | {{no}} |',
51+
lib('generic.NativeCmdStep') +'{{no}} | {{yes}} | {{no}} | {{no}} |',
5252
lib('generic.ReplaceRegexStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
5353
lib('generic.ReplaceStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
5454
lib('generic.TrimTrailingWhitespaceStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
@@ -66,6 +66,7 @@ lib('kotlin.DiktatStep') +'{{yes}} | {{yes}}
6666
lib('markdown.FreshMarkStep') +'{{yes}} | {{no}} | {{no}} | {{no}} |',
6767
lib('npm.PrettierFormatterStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
6868
lib('npm.TsFmtFormatterStep') +'{{yes}} | {{yes}} | {{no}} | {{no}} |',
69+
lib('pom.SortPomStepStep') +'{{no}} | {{yes}} | {{no}} | {{no}} |',
6970
lib('python.BlackStep') +'{{yes}} | {{no}} | {{no}} | {{no}} |',
7071
lib('scala.ScalaFmtStep') +'{{yes}} | {{yes}} | {{yes}} | {{no}} |',
7172
lib('sql.DBeaverSQLFormatterStep') +'{{yes}} | {{yes}} | {{yes}} | {{no}} |',
@@ -86,7 +87,7 @@ extra('wtp.EclipseWtpFormatterStep') +'{{yes}} | {{yes}}
8687
| [`generic.IndentStep`](lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
8788
| [`generic.Jsr223Step`](lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java) | :white_large_square: | :+1: | :white_large_square: | :white_large_square: |
8889
| [`generic.LicenseHeaderStep`](lib/src/main/java/com/diffplug/spotless/generic/LicenseHeaderStep.java) | :+1: | :+1: | :+1: | :white_large_square: |
89-
| [`generic.NativeCmdStep`](lib/src/main/java/com/diffplug/spotless/generic/NativeCmdStep.java) | :white_large_square: | :+1: | :white_large_square: | :white_large_square: |
90+
| [`generic.NativeCmdStep`](lib/src/main/java/com/diffplug/spotless/generic/NativeCmdStep.java) | :white_large_square: | :+1: | :white_large_square: | :white_large_square: |
9091
| [`generic.ReplaceRegexStep`](lib/src/main/java/com/diffplug/spotless/generic/ReplaceRegexStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
9192
| [`generic.ReplaceStep`](lib/src/main/java/com/diffplug/spotless/generic/ReplaceStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
9293
| [`generic.TrimTrailingWhitespaceStep`](lib/src/main/java/com/diffplug/spotless/generic/TrimTrailingWhitespaceStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
@@ -104,6 +105,7 @@ extra('wtp.EclipseWtpFormatterStep') +'{{yes}} | {{yes}}
104105
| [`markdown.FreshMarkStep`](lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java) | :+1: | :white_large_square: | :white_large_square: | :white_large_square: |
105106
| [`npm.PrettierFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/PrettierFormatterStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
106107
| [`npm.TsFmtFormatterStep`](lib/src/main/java/com/diffplug/spotless/npm/TsFmtFormatterStep.java) | :+1: | :+1: | :white_large_square: | :white_large_square: |
108+
| [`pom.SortPomStepStep`](lib/src/main/java/com/diffplug/spotless/pom/SortPomStepStep.java) | :white_large_square: | :+1: | :white_large_square: | :white_large_square: |
107109
| [`python.BlackStep`](lib/src/main/java/com/diffplug/spotless/python/BlackStep.java) | :+1: | :white_large_square: | :white_large_square: | :white_large_square: |
108110
| [`scala.ScalaFmtStep`](lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java) | :+1: | :+1: | :+1: | :white_large_square: |
109111
| [`sql.DBeaverSQLFormatterStep`](lib/src/main/java/com/diffplug/spotless/sql/DBeaverSQLFormatterStep.java) | :+1: | :+1: | :+1: | :white_large_square: |

plugin-maven/CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
55
## [Unreleased]
66
### Added
77
* Added support for custom JSR223 formatters ([#945](https://github.com/diffplug/spotless/pull/945))
8+
* Added support for formating and sorting Maven POMs ([#946](https://github.com/diffplug/spotless/pull/946))
89

910
## [2.14.0] - 2021-09-27
1011
### Added

plugin-maven/README.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ user@machine repo % mvn spotless:check
5555
- [Python](#python) ([black](#black))
5656
- [Antlr4](#antlr4) ([antlr4formatter](#antlr4formatter))
5757
- [Sql](#sql) ([dbeaver](#dbeaver))
58+
- [Maven Pom](#maven-pom) ([sortPom](#sortpom))
5859
- [Typescript](#typescript) ([tsfmt](#tsfmt), [prettier](#prettier))
5960
- Multiple languages
6061
- [Prettier](#prettier) ([plugins](#prettier-plugins), [npm detection](#npm-detection), [`.npmrc` detection](#npmrc-detection))
@@ -511,6 +512,67 @@ sql.formatter.indent.type=space
511512
sql.formatter.indent.size=4
512513
```
513514

515+
## Maven POM
516+
517+
[code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/Pom.java). [available steps](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java).
518+
519+
```xml
520+
<configuration>
521+
<pom>
522+
<!-- These are the defaults, you can override if you want -->
523+
<includes>
524+
<include>pom.xml</include>
525+
</includes>
526+
527+
<sortPom /> <!-- has its own section below -->
528+
529+
</pom>
530+
</configuration>
531+
```
532+
533+
### sortPom
534+
535+
[homepage](https://github.com/Ekryd/sortpom). [code](https://github.com/diffplug/spotless/tree/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/pom/SortPom.java).
536+
537+
All configuration settings are optional, they are described in detail [here](https://github.com/Ekryd/sortpom/wiki/Parameters).
538+
539+
```xml
540+
<sortPom>
541+
542+
<encoding>UTF-8</encoding> <!-- The encoding of the pom files -->
543+
544+
<lineSeparator>${line.separator}</lineSeparator> <!-- line separator to use -->
545+
546+
<expandEmptyElements>true</expandEmptyElements> <!-- Should empty elements be expanded-->
547+
548+
<spaceBeforeCloseEmptyElement>false</spaceBeforeCloseEmptyElement> <!-- Should a space be added inside self-closing elements-->
549+
550+
<keepBlankLines>true</keepBlankLines> <!-- Keep empty lines -->
551+
552+
<nrOfIndentSpace>2</nrOfIndentSpace> <!-- Indentation -->
553+
554+
<indentBlankLines>false</indentBlankLines> <!-- Should empty lines be indented -->
555+
556+
<indentSchemaLocation>false</indentSchemaLocation> <!-- Should schema locations be indended -->
557+
558+
<predefinedSortOrder>recommended_2008_06</predefinedSortOrder> <!-- Sort order of elements: https://github.com/Ekryd/sortpom/wiki/PredefinedSortOrderProfiles-->
559+
560+
<sortOrderFile></sortOrderFile> <!-- Custom sort order of elements: https://raw.githubusercontent.com/Ekryd/sortpom/master/sorter/src/main/resources/custom_1.xml -->
561+
562+
<sortDependencies></sortDependencies> <!-- Sort dependencies: https://github.com/Ekryd/sortpom/wiki/SortDependencies-->
563+
564+
<sortDependencyExclusions></sortDependencyExclusions> <!-- Sort dependency exclusions: https://github.com/Ekryd/sortpom/wiki/SortDependencies-->
565+
566+
<sortPlugins></sortPlugins> <!-- Sort plugins: https://github.com/Ekryd/sortpom/wiki/SortPlugins -->
567+
568+
<sortProperties>false</sortProperties> <!-- Sort properties -->
569+
570+
<sortModules>false</sortModules> <!-- Sort modules -->
571+
572+
<sortExecutions>false</sortExecutions> <!-- Sort plugin executions -->
573+
</sortPom>
574+
```
575+
514576
<a name="applying-to-typescript-source"></a>
515577

516578
## Typescript

0 commit comments

Comments
 (0)