This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch doxia-2.0.0
in repository
https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
The following commit(s) were added to refs/heads/doxia-2.0.0 by this push:
new 8ce250e foo
8ce250e is described below
commit 8ce250e92a0fa9b2d4fa1ba28b4c1a36fbe822bf
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Sat May 25 12:26:50 2024 +0200
foo
---
pom.xml | 56 ++++++++++++++--------
.../projectinfo/AbstractProjectInfoTestCase.java | 16 +++----
.../stubs/ProjectInfoPluginArtifactStub.java | 12 ++++-
.../projectinfo/stubs/ProjectInfoProjectStub.java | 2 +-
4 files changed, 54 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9395b30..b28956a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>41</version>
+ <version>42</version>
<relativePath />
</parent>
@@ -114,13 +114,13 @@ under the License.
</distributionManagement>
<properties>
- <doxiaVersion>2.0.0-M8</doxiaVersion>
- <doxiaSitetoolsVersion>2.0.0-M16</doxiaSitetoolsVersion>
- <mavenVersion>3.2.5</mavenVersion>
+ <doxiaVersion>2.0.0-M12</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M19</doxiaSitetoolsVersion>
+ <mavenVersion>3.6.3</mavenVersion>
<scmVersion>2.0.1</scmVersion>
- <aetherVersion>1.0.0.v20140518</aetherVersion>
- <sitePluginVersion>4.0.0-M13</sitePluginVersion>
- <fluidoSkinVersion>2.0.0-M8</fluidoSkinVersion>
+ <resolverVersion>1.4.1</resolverVersion>
+ <sitePluginVersion>4.0.0-M15-SNAPSHOT</sitePluginVersion>
+ <fluidoSkinVersion>2.0.0-M9</fluidoSkinVersion>
<checkstyle.violation.ignore>ParameterNumber,MethodLength</checkstyle.violation.ignore>
<project.build.outputTimestamp>2023-11-17T21:50:41Z</project.build.outputTimestamp>
</properties>
@@ -129,12 +129,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>4.0.0-M9</version>
+ <version>4.0.0-M12</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>4.0.0-M13</version>
+ <version>4.0.0-M15</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven</groupId>
@@ -184,6 +184,19 @@ under the License.
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
<version>3.2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-util</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- This replaces the exclude for maven-depepdency-tree -->
+ <dependency>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-util</artifactId>
+ <version>${resolverVersion}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -197,9 +210,10 @@ under the License.
<version>3.0.0</version>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-api</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-api</artifactId>
+ <version>${resolverVersion}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -353,21 +367,21 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-impl</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-impl</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-connector-basic</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-connector-basic</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.eclipse.aether</groupId>
- <artifactId>aether-transport-wagon</artifactId>
- <version>${aetherVersion}</version>
+ <groupId>org.apache.maven.resolver</groupId>
+ <artifactId>maven-resolver-transport-wagon</artifactId>
+ <version>${resolverVersion}</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
index 6b2f8ef..d6e8d20 100644
---
a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
+++
b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -97,23 +97,23 @@ public abstract class AbstractProjectInfoTestCase extends
AbstractMojoTestCase {
}
/**
- * Gets a fully qualified title as generated by Doxia 1.6
+ * Gets a fully qualified title as generated by Doxia Sitetools
*
- * @param name the name to prepare
- * @param title the title to prepare
- * @return the prepared title as per Doxia 1.6
+ * @param projectTitle the project title to prepare
+ * @param shortTitle the short title to prepare
+ * @return the prepared title as per Doxia Sitetools
* @since 2.8
*/
- protected String prepareTitle(String name, String title) {
- if (name == null || name.isEmpty()) {
+ protected String prepareTitle(String projectTitle, String shortTitle) {
+ if (projectTitle == null || projectTitle.isEmpty()) {
throw new IllegalArgumentException("The name cannot be empty");
}
- if (title == null || title.isEmpty()) {
+ if (shortTitle == null || shortTitle.isEmpty()) {
throw new IllegalArgumentException("The title cannot be empty");
}
- return String.format("%s \u2013 %s", name, title);
+ return String.format("%s \u2013 %s", shortTitle, projectTitle);
}
/**
diff --git
a/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoPluginArtifactStub.java
b/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoPluginArtifactStub.java
index cc37ed5..2040cf4 100644
---
a/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoPluginArtifactStub.java
+++
b/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoPluginArtifactStub.java
@@ -35,15 +35,18 @@ public class ProjectInfoPluginArtifactStub extends
ArtifactStub {
private String packaging;
+ private String type;
+
private VersionRange versionRange;
private ArtifactHandler handler;
- public ProjectInfoPluginArtifactStub(String groupId, String artifactId,
String version, String packaging) {
+ public ProjectInfoPluginArtifactStub(String groupId, String artifactId,
String version, String packaging, String type) {
this.groupId = groupId;
this.artifactId = artifactId;
this.version = version;
this.packaging = packaging;
+ this.type = type;
versionRange = VersionRange.createFromVersion(version);
}
@@ -107,6 +110,11 @@ public class ProjectInfoPluginArtifactStub extends
ArtifactStub {
@Override
public String getType() {
- return "";
+ return type;
+ }
+
+ @Override
+ public void setType(String type) {
+ this.type = type;
}
}
diff --git
a/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
b/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
index 5df9241..3bf5a8b 100644
---
a/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
+++
b/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
@@ -82,7 +82,7 @@ public abstract class ProjectInfoProjectStub extends
MavenProjectStub {
setPackaging(model.getPackaging());
String type = Objects.toString(super.getPackaging(), "jar");
- Artifact artifact = new ProjectInfoPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), type);
+ Artifact artifact = new ProjectInfoPluginArtifactStub(getGroupId(),
getArtifactId(), getVersion(), type, type);
artifact.setArtifactHandler(new DefaultArtifactHandlerStub());
setArtifact(artifact);
