Merge branch 'master' into issue-837-update-property-includes-parent

mojohaus · Dec 2, 2022 · 5292c53 · 5292c53
2 parents b324f5c + f61270b
commit 5292c53
Show file tree

Hide file tree

Showing 41 changed files with 427 additions and 462 deletions.
diff --git a/pom.xml b/pom.xml
@@ -127,7 +127,6 @@
     <maven.compiler.source>${mojo.java.target}</maven.compiler.source>
     <junitBomVersion>5.9.1</junitBomVersion>
     <mavenVersion>3.2.5</mavenVersion>
-    <wagonVersion>3.5.2</wagonVersion>
     <doxiaVersion>1.11.1</doxiaVersion>
     <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
     <pluginVersion>${project.version}</pluginVersion>

diff --git a/versions-common/pom.xml b/versions-common/pom.xml
@@ -63,25 +63,12 @@
             <version>${mavenVersion}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-provider-api</artifactId>
-            <version>${wagonVersion}</version>
-            <scope>provided</scope>
-        </dependency>
         <!-- woodstox only used for unit tests -->
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- wagon only used for unit tests -->
-        <dependency>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-file</artifactId>
-            <version>${wagonVersion}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>