From ff0a33f6ef514a6f53f5e4948f7f41d3b7807144 Mon Sep 17 00:00:00 2001
From: Slawomir Jaranowski <s.jaranowski@gmail.com>
Date: Sun, 9 Jan 2022 11:06:22 +0100
Subject: [PATCH] Use the same Maven version in all modules

- cause fail site build on jdk > 8
---
 doxia-integration-tools/pom.xml                              | 4 ----
 doxia-site-renderer/pom.xml                                  | 2 +-
 .../maven/doxia/siterenderer/DefaultSiteRendererTest.java    | 5 +++--
 pom.xml                                                      | 1 +
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 86dc10e6..1362f6b3 100644
--- a/doxia-integration-tools/pom.xml
+++ b/doxia-integration-tools/pom.xml
@@ -34,10 +34,6 @@
   <name>Doxia Sitetools :: Integration Tools</name>
   <description>A collection of tools to help the integration of Doxia Sitetools in Maven plugins.</description>
 
-  <properties>
-    <mavenVersion>2.2.1</mavenVersion>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index 6feab55a..e5db41d7 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -39,7 +39,7 @@ under the License.
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>3.0</version>
+      <version>${mavenVersion}</version>
     </dependency>
 
     <dependency>
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
index 755e27e6..8e0157ab 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
@@ -45,9 +45,9 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.DefaultArtifact;
+import org.apache.maven.artifact.versioning.VersionRange;
 import org.apache.maven.doxia.Doxia;
 import org.apache.maven.doxia.parser.ParseException;
-import org.apache.maven.doxia.parser.Parser;
 import org.apache.maven.doxia.sink.Sink;
 import org.apache.maven.doxia.site.decoration.DecorationModel;
 import org.apache.maven.doxia.site.decoration.io.xpp3.DecorationXpp3Reader;
@@ -359,7 +359,8 @@ public void testVelocityToolManagerForSkin()
          */
         attributes.put( "doxiaSiteRendererVersion", "1.7-bogus" );
 
-        Artifact skin = new DefaultArtifact( "org.group", "artifact", "1.1", null, "jar", "", null );
+        Artifact skin = new DefaultArtifact( "org.group", "artifact",
+            VersionRange.createFromVersion( "1.1" ), null, "jar", "", null );
         skin.setFile( skinFile );
         SiteRenderingContext siteRenderingContext =
             renderer.createContextForSkin( skin, attributes, new DecorationModel(), "defaultWindowTitle",
diff --git a/pom.xml b/pom.xml
index fa55bd16..2315dec5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,7 @@ under the License.
   <properties>
     <doxiaVersion>2.0.0-M1</doxiaVersion>
     <slf4jVersion>1.7.32</slf4jVersion>
+    <mavenVersion>2.2.1</mavenVersion>
     <maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
     <project.build.outputTimestamp>2021-12-12T17:08:52Z</project.build.outputTimestamp>
   </properties>