Merge branch 'master' into issue-210-Suggestion_Add_a_parameter_to_co…

…ntrol_the_sort_of_dependencies_in_dependencymanagement
Ekryd · Jul 13, 2022 · a63767b · a63767b
2 parents 974320b + 6f8a0b4
commit a63767b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...ependencies-ignore-trick/expected_pom.xml → ...ependencies-ignore-trick/expected/pom.xml b/...ependencies-ignore-trick/expected_pom.xml → ...ependencies-ignore-trick/expected/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.8.5</version>
+      <version>3.8.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>

diff --git a/maven-plugin/src/it/sort-dependencies-ignore-trick/pom.xml b/maven-plugin/src/it/sort-dependencies-ignore-trick/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.8.5</version>
+      <version>3.8.6</version>
     </dependency>
     <dependency>
       <?SORTPOM IGNORE?>

diff --git a/maven-plugin/src/it/sort-dependencies-ignore-trick/postbuild.groovy b/maven-plugin/src/it/sort-dependencies-ignore-trick/postbuild.groovy
@@ -1,6 +1,6 @@
 log = new File(basedir, 'build.log')
 sorted = new File(basedir, 'pom.xml')
-expected = new File(basedir, 'expected_pom.xml')
+expected = new File(basedir, 'expected/pom.xml')
 backup = new File(basedir, 'pom.xml.bak')
 
 assert log.exists()

diff --git a/pom.xml b/pom.xml
@@ -138,7 +138,7 @@
           <!-- References plugin (not directly used) -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.4.0</version>
+          <version>3.4.1</version>
         </plugin>
         <plugin>
           <!-- Define versions for standard plugins -->