Merge branch 'master' into stephan-sort-exclusions

# Conflicts:
#	sorter/src/test/java/sortpom/util/XmlProcessorTestUtil.java

.circleci/config.yml

@@ -52,12 +52,31 @@ jobs:
           key: sortpom-cache--{{ checksum "pom.xml" }}
 
 workflows:
+  version: 2
   work:
     jobs:
       - jdk8
-      - jdk11
-      - jdk12
-      - jdk13
-      - jdk14
-      - jdk15
+      - jdk12:
+          requires:
+            - jdk8
+      - jdk13:
+          requires:
+            - jdk8
+      - jdk14:
+          requires:
+            - jdk8
+      - jdk15:
+          requires:
+            - jdk8
+      - jdk11:
+          filters:  # using regex filters requires the entire branch to match
+            branches:              
+              only:  # only branches matching the below regex filters will run
+                - master
+          requires:
+            - jdk8
+            - jdk12
+            - jdk13
+            - jdk14
+            - jdk15
 

.github/dependabot.yml

@@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "maven" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+    ignored_updates:
+      - match:
+          dependency_name: "org.jdom:jdom"

.gitignore

@@ -8,3 +8,4 @@ idea-plugin/out
 .settings
 /maven-plugin/src/it/*/interpolated-pom.xml.bak
 /maven-plugin/src/it/*/build.log
+.java-version

README.md

@@ -20,30 +20,27 @@ The SortPom Plugin has two goals.
 
 ## Usage ##
 
-The Sortpom plugin will reorder the pom elements and format the xml structure in the pom-file. The plugin can be [configured](https://github.com/Ekryd/sortpom/wiki/Parameters) to sort by by different standards or by custom format. By default a backup file will be created, so that you can check how the pom-file has changed.
+The Sortpom plugin will reorder the pom elements and format the xml structure in the pom-file. The plugin can be [configured](https://github.com/Ekryd/sortpom/wiki/Parameters) to sort by different standards or by a custom format. A backup file will be created, by default, so that you can check how the pom-file has changed.
 
 Sortpom works best if it is run every time during Maven compilation. [Configure](https://github.com/Ekryd/sortpom/wiki/Parameters) it once and then forget about it. If you want to perform a simple test what the plugin does then open a command prompt in your project home and enter
 ```
 mvn com.github.ekryd.sortpom:sortpom-maven-plugin:sort -Dsort.keepBlankLines -Dsort.predefinedSortOrder=custom_1
 ```
 
-For a example how the plugin can be configured to run every time you build your project see [recommended configuration](https://github.com/Ekryd/sortpom/wiki/Recommended-configuration) wiki page
+An example of how the plugin can be configured to run every time you build your project see [recommended configuration](https://github.com/Ekryd/sortpom/wiki/Recommended-configuration) wiki page
 
 The plugin will not change how your Maven project is compiled  ([Exception](https://github.com/Ekryd/sortpom/wiki/Parameters-that-can-affect-your-build))
 
 ## News ##
+  * 2021-03-31: Heads up! The upcoming release 2.15.0 will contain a breaking change. If dependencies are sorted by SCOPE, then imported bom-files will be sorted towards the top. [#93](/../../issues/93)
+  * 2021-03-30: Released version 2.14.1 that fixes sorting of dependencies and plugins if artifactId or groupId contains a line break [#99](/../../issues/99)
+  * 2021-03-18: Released version 2.14.0 that adds support for indentSchemaLocation to break apart the long project declaration line at the top of the pom [#85](/../../issues/85)
   * 2021-01-16: Released version 2.13.1 that adds support for sortExecutions (to sort executions) and verifyFailOn (to have the option of a strict verify goal) [#81](/../../issues/81) [#82](/../../issues/82)
   * 2021-01-10: Moved build to [CircleCI](https://circleci.com)
   * 2020-07-02: Released version 2.12.0 that adds support to remove the space before self-closing xml tags. [#75](/../../issues/75)
   * 2020-02-29: John Patrick converted all JUnit tests to version 5. Thank you! [#72](/../../issues/72) [#73](/../../issues/73)
   * 2020-02-24: Renewed Open Source Licence for Araxis Merge. Thank you [Araxis](https://www.araxis.com/merge/)!
-  * 2020-02-03: Released version 2.11.0 that adds support to retain the file creation time of a sorted pom file. Thanks Christoph for your pull request! [#68](/../../issues/68) [#69](/../../issues/69)
-  * 2018-10-10: Released version 2.10.0. Eclipse users will not get 'Plugin execution not covered by lifecycle configuration' error anymore. Thanks Andrea for your pull request! [#66](/../../issues/66)
-  * 2018-09-20: Released version 2.9.0. Updated the default order to match Maven xsd. The parent element will get artifactId and groupId switched [#65](/../../issues/65)
-  * 2017-04-02: Released version 2.8.0 that adds support to sort modules. Thanks Monica for your pull request! [#54](/../../issues/54)
-  * 2017-03-29: Released version 2.7.0 that adds support to write to a separate violation file when verifying. [#44](/../../issues/44)
-  * 2017-03-18: Released version 2.6.0 that adds support to force sorting if only line breaks differ. Thanks again Benoit Guerin for your pull requests! [#46](/../../issues/46)
-  * 2017-02-18: Benoit Guerin supplied Maven invoker tests to the plugin. Thank you! [#47](/../../issues/47)
+  * 2020-02-03: Released version 2.11.0 that adds support to retain the file creation time of a sorted pom file. Thanks, Christoph for your pull request! [#68](/../../issues/68) [#69](/../../issues/69)
   * 2015-11-21: Released version 2.5.0. The plugin now uses Java 8, as some dependant plugins demand Java 8. Users of previous versions of Java will have to use version 2.4.0.
   * 2015-04-06: Released version 2.4.0 with new github location and updated libraries.
   * 2015-03-31: Moved the SortPom plugin to GitHub.

maven-plugin/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.github.ekryd.sortpom</groupId>
     <artifactId>sortpom-parent</artifactId>
-    <version>2.13.2-SNAPSHOT</version>
+    <version>2.14.2-SNAPSHOT</version>
   </parent>
 
   <!-- Basics -->
@@ -19,18 +19,15 @@
     <dependency>
       <groupId>com.github.ekryd.sortpom</groupId>
       <artifactId>sortpom-sorter</artifactId>
-      <version>2.13.2-SNAPSHOT</version>
+      <version>2.14.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.6.3</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.6.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -40,7 +37,6 @@
       <plugin>
         <groupId>com.github.ekryd.echo-maven-plugin</groupId>
         <artifactId>echo-maven-plugin</artifactId>
-        <version>1.3.0</version>
         <inherited>false</inherited>
         <executions>
           <execution>