diff --git a/pom.xml b/pom.xml index 6430edb8..d7493a27 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. org.apache.maven.plugins maven-plugins - 41 + 42 @@ -114,14 +114,13 @@ under the License. + 3.6.3 1.11.1 1.11.1 - 3.2.5 2.0.1 - 1.0.0.v20140518 + 1.4.1 3.12.1 1.11.1 - 3.1.0 ParameterNumber,MethodLength 2023-11-17T21:50:41Z @@ -138,8 +137,8 @@ under the License. 3.2.0 - org.apache.maven - maven-core + org.codehaus.plexus + plexus-container-default @@ -169,12 +168,6 @@ under the License. ${mavenVersion} provided - - org.apache.maven - maven-repository-metadata - ${mavenVersion} - provided - org.apache.maven maven-settings @@ -184,7 +177,7 @@ under the License. org.apache.maven.shared maven-dependency-tree - 3.2.1 + 3.3.0 org.apache.maven.shared @@ -198,9 +191,10 @@ under the License. 3.0.0 - org.eclipse.aether - aether-api - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-api + ${resolverVersion} + test @@ -290,26 +284,6 @@ under the License. - - org.apache.maven.doxia - doxia-decoration-model - ${doxiaSitetoolsVersion} - - - org.apache.maven.doxia - doxia-site-renderer - ${doxiaSitetoolsVersion} - - - org.codehaus.plexus - plexus-container-default - - - org.codehaus.plexus - plexus-component-api - - - org.apache.maven.doxia doxia-integration-tools @@ -392,21 +366,21 @@ under the License. test - org.eclipse.aether - aether-impl - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-impl + ${resolverVersion} test - org.eclipse.aether - aether-connector-basic - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-connector-basic + ${resolverVersion} test - org.eclipse.aether - aether-transport-wagon - ${aetherVersion} + org.apache.maven.resolver + maven-resolver-transport-wagon + ${resolverVersion} test 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 cc37ed52..f3816378 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,19 @@ 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 +111,11 @@ public void setArtifactHandler(ArtifactHandler handler) { @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 14b40069..1f716301 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 @@ -80,7 +80,7 @@ public ProjectInfoProjectStub() { 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);