diff --git a/pom.xml b/pom.xml
index 83a1bbc0..29f486c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@ under the License.
maven-plugins
org.apache.maven.plugins
34
- ../../pom/maven/maven-plugins/pom.xml
+
maven-project-info-reports-plugin
@@ -120,11 +120,13 @@ under the License.
1.11.1
1.11.1
- 3.0
+ 3.2.5
1.12.2
+ 1.0.0.v20140518
3.11.0
2.22.2
- 7
+ 8
+ 3.6.4
ParameterNumber,MethodLength
2022-02-21T20:17:22Z
@@ -139,45 +141,50 @@ under the License.
org.apache.maven.reporting
maven-reporting-impl
3.1.0
+
+
+ org.apache.maven
+ maven-core
+
+
-
- org.apache.maven
- maven-compat
- ${mavenVersion}
- test
-
-
org.apache.maven
maven-artifact
${mavenVersion}
+ provided
org.apache.maven
maven-core
${mavenVersion}
+ provided
org.apache.maven
maven-model
${mavenVersion}
+ provided
org.apache.maven
maven-plugin-api
${mavenVersion}
+ provided
org.apache.maven
maven-repository-metadata
${mavenVersion}
+ provided
org.apache.maven
maven-settings
${mavenVersion}
+ provided
org.apache.maven.shared
@@ -187,7 +194,7 @@ under the License.
org.apache.maven.shared
maven-shared-utils
- 3.3.3
+ 3.3.4
org.apache.maven.shared
@@ -198,12 +205,25 @@ under the License.
com.google.code.findbugs
bcel-findbugs
+
+ org.apache.maven
+ *
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
org.apache.bcel
bcel
- 6.2
+ 6.5.0
+
+
+ org.eclipse.aether
+ aether-api
+ ${aetherVersion}
@@ -214,12 +234,18 @@ under the License.
org.apache.maven.shared
maven-common-artifact-filters
- 3.1.0
+ 3.2.0
+
+
+ org.sonatype.sisu
+ sisu-inject-plexus
+
+
org.apache.maven.shared
maven-artifact-transfer
- 0.12.0
+ 0.13.1
@@ -233,6 +259,12 @@ under the License.
maven-scm-manager-plexus
${scmVersion}
runtime
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
org.apache.maven.scm
@@ -294,11 +326,23 @@ under the License.
org.apache.maven.doxia
doxia-sink-api
${doxiaVersion}
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
org.apache.maven.doxia
doxia-core
${doxiaVersion}
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
@@ -326,6 +370,12 @@ under the License.
org.apache.maven.doxia
doxia-integration-tools
${doxia-sitetoolsVersion}
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
@@ -343,7 +393,7 @@ under the License.
org.codehaus.plexus
plexus-utils
- 3.3.0
+ 3.4.1
org.codehaus.plexus
@@ -352,6 +402,12 @@ under the License.
+
+ org.apache.maven
+ maven-compat
+ ${mavenVersion}
+ test
+
org.httpunit
httpunit
@@ -361,13 +417,19 @@ under the License.
org.apache.maven.plugin-testing
maven-plugin-testing-harness
- 2.1
+ 3.3.0
test
+
+
+ org.codehaus.plexus
+ plexus-container-default
+
+
junit
junit
- 4.13.1
+ 4.13.2
test
@@ -383,15 +445,33 @@ under the License.
test
- org.sonatype.aether
- aether-connector-wagon
- 1.7
+ org.eclipse.aether
+ aether-impl
+ ${aetherVersion}
+ test
+
+
+ org.eclipse.aether
+ aether-connector-basic
+ ${aetherVersion}
+ test
+
+
+ org.eclipse.aether
+ aether-transport-wagon
+ ${aetherVersion}
test
org.apache.maven.wagon
wagon-http-lightweight
- 3.3.4
+ 3.5.1
+ test
+
+
+ org.slf4j
+ slf4j-simple
+ 1.7.32
test
@@ -404,7 +484,7 @@ under the License.
commons-io
commons-io
- 2.6
+ 2.11.0
@@ -437,6 +517,11 @@ under the License.
RSA
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+ 3.6.4
+
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 01f04e52..45d9c90d 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -34,8 +34,9 @@
import org.apache.maven.report.projectinfo.stubs.DependencyArtifactStubFactory;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.repository.LocalRepository;
/**
* Abstract class to test reports generation with HTTPUnit framework.
@@ -184,7 +185,7 @@ protected AbstractProjectInfoReport createReportMojo( String goal, File pluginXm
legacySupport.setSession( newMavenSession( new MavenProjectStub() ) );
DefaultRepositorySystemSession repoSession =
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( artifactStubFactory.getWorkingDir() ) );
+ repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repoSession, new LocalRepository( artifactStubFactory.getWorkingDir() ) ) );
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
setVariableValueToObject( mojo, "remoteRepositories", mojo.getProject().getRemoteArtifactRepositories() );
@@ -200,7 +201,7 @@ protected File generateReport( AbstractProjectInfoReport mojo, File pluginXmlFil
ProjectBuilder builder = lookup( ProjectBuilder.class );
ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
- buildingRequest.setRepositorySession( null );
+ buildingRequest.setRepositorySession( lookup( LegacySupport.class ).getRepositorySession() );
assertNotNull( "Local repository", mojo.localRepository );
testMavenProject = builder.build( pluginXmlFile, buildingRequest ).getProject();
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 0df5815e..61d06414 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
@@ -30,7 +30,8 @@
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.DefaultArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
+import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Build;
@@ -154,8 +155,8 @@ public Set getArtifacts()
@Override
public List getRemoteArtifactRepositories()
{
- ArtifactRepository repository = new DefaultArtifactRepository( "central", "https://repo1.maven.org/maven2",
- new DefaultRepositoryLayout() );
+ ArtifactRepository repository = new MavenArtifactRepository( "central", "https://repo1.maven.org/maven2",
+ new DefaultRepositoryLayout(), new ArtifactRepositoryPolicy(), new ArtifactRepositoryPolicy() );
return Collections.singletonList( repository );
}