You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/01/09 10:06:45 UTC
[maven-doxia-sitetools] 01/01: Use the same Maven version in all modules
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch fix-site
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit d5f30548bd10dbe7d04de64ac3b97bd70b183358
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Sun Jan 9 11:06:22 2022 +0100
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 +-
.../org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java | 5 +++--
pom.xml | 4 ++++
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
index 4f8499b..09e7dff 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 a4aaff8..ea64eed 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>
<!-- doxia -->
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 c72d90e..4048f20 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 java.util.zip.ZipEntry;
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;
@@ -360,7 +360,8 @@ public class DefaultSiteRendererTest
*/
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 d3b864e..9f9714d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@ under the License.
</distributionManagement>
<properties>
+ <mavenVersion>2.2.1</mavenVersion>
<doxiaVersion>1.11.1</doxiaVersion>
<maven.site.path>doxia-sitetools-archives/doxia-sitetools-LATEST</maven.site.path>
<project.build.outputTimestamp>2021-12-12T17:08:52Z</project.build.outputTimestamp>
@@ -244,6 +245,9 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
+ <configuration>
+ <detectLinks>false</detectLinks>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>