You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2022/01/28 22:14:20 UTC
[maven-project-info-reports-plugin] 01/01: mvn4 aggregator
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch mvn4
in repository https://gitbox.apache.org/repos/asf/maven-project-info-reports-plugin.git
commit 518902a8fbb01f6f782cc44f3ac392edbb3c4efd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Fri Jan 28 23:14:16 2022 +0100
mvn4 aggregator
---
pom.xml | 66 ++++-----
src/it/MPIR-362/pom.xml | 4 +-
.../projectinfo/AbstractProjectInfoReport.java | 2 +-
.../report/projectinfo/DependenciesReport.java | 3 +-
.../projectinfo/DependencyConvergenceReport.java | 28 ++--
.../apache/maven/report/projectinfo/ScmReport.java | 152 +--------------------
.../dependencies/DependencyVersionMap.java | 4 +-
.../SinkSerializingDependencyNodeVisitor.java | 4 +-
src/main/resources/project-info-reports.properties | 2 +
.../resources/project-info-reports_cs.properties | 2 +
.../resources/project-info-reports_de.properties | 2 +
.../resources/project-info-reports_es.properties | 2 +
.../resources/project-info-reports_fr.properties | 2 +
.../resources/project-info-reports_gl.properties | 2 +
.../resources/project-info-reports_hu.properties | 2 +
.../resources/project-info-reports_it.properties | 2 +
.../resources/project-info-reports_ja.properties | 2 +
.../resources/project-info-reports_ko.properties | 2 +
.../resources/project-info-reports_lt.properties | 2 +
.../resources/project-info-reports_nl.properties | 2 +
.../resources/project-info-reports_no.properties | 2 +
.../resources/project-info-reports_pl.properties | 2 +
.../resources/project-info-reports_pt.properties | 2 +
.../project-info-reports_pt_BR.properties | 2 +
.../resources/project-info-reports_ru.properties | 2 +
.../resources/project-info-reports_sk.properties | 2 +
.../resources/project-info-reports_sv.properties | 2 +
.../resources/project-info-reports_tr.properties | 2 +
.../project-info-reports_zh_CN.properties | 2 +
.../project-info-reports_zh_TW.properties | 2 +
.../projectinfo/AbstractProjectInfoTestCase.java | 13 +-
31 files changed, 99 insertions(+), 221 deletions(-)
diff --git a/pom.xml b/pom.xml
index 51b4072..6ea097b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>34</version>
+ <version>35-SNAPSHOT</version>
<relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
</parent>
@@ -118,13 +118,13 @@ under the License.
</distributionManagement>
<properties>
- <doxiaVersion>1.11.1</doxiaVersion>
- <doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
- <mavenVersion>3.0</mavenVersion>
- <scmVersion>1.12.2</scmVersion>
+ <doxiaVersion>2.0.0-M2-SNAPSHOT</doxiaVersion>
+ <doxiaSitetoolsVersion>2.0.0-M1-SNAPSHOT</doxiaSitetoolsVersion>
+ <mavenVersion>4.0.0-alpha-1-SNAPSHOT</mavenVersion>
+ <scmVersion>2.0.0-M2-SNAPSHOT</scmVersion>
<sitePluginVersion>3.10.0</sitePluginVersion>
<surefire.version>2.22.2</surefire.version>
- <javaVersion>7</javaVersion>
+ <javaVersion>8</javaVersion>
<checkstyle.violation.ignore>ParameterNumber,MethodLength</checkstyle.violation.ignore>
<project.build.outputTimestamp>2021-04-25T18:21:42Z</project.build.outputTimestamp>
</properties>
@@ -133,12 +133,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
- <version>3.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>3.0.0</version>
+ <version>3.1.0-SNAPSHOT</version>
</dependency>
<!-- Maven -->
@@ -153,41 +153,48 @@ under the License.
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-repository-metadata</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
<version>${mavenVersion}</version>
+ <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
- <version>2.2</version>
+ <version>3.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.3</version>
+ <version>4.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
@@ -214,12 +221,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-common-artifact-filters</artifactId>
- <version>3.1.0</version>
+ <version>3.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.12.0</version>
+ <version>2.0.0-SNAPSHOT</version>
</dependency>
<!-- SCM -->
@@ -241,16 +248,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-perforce</artifactId>
- <version>${scmVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-starteam</artifactId>
- <version>${scmVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-svn-commons</artifactId>
<version>${scmVersion}</version>
</dependency>
@@ -262,23 +259,6 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvs-commons</artifactId>
- <version>${scmVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvsexe</artifactId>
- <version>${scmVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
- <artifactId>maven-scm-provider-cvsjava</artifactId>
- <version>${scmVersion}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-git-commons</artifactId>
<version>${scmVersion}</version>
</dependency>
@@ -305,12 +285,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-decoration-model</artifactId>
- <version>${doxia-sitetoolsVersion}</version>
+ <version>${doxiaSitetoolsVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-site-renderer</artifactId>
- <version>${doxia-sitetoolsVersion}</version>
+ <version>${doxiaSitetoolsVersion}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.plexus</groupId>
@@ -325,7 +305,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-integration-tools</artifactId>
- <version>${doxia-sitetoolsVersion}</version>
+ <version>${doxiaSitetoolsVersion}</version>
</dependency>
<!-- Plexus -->
@@ -361,7 +341,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>2.1</version>
+ <version>3.4.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/src/it/MPIR-362/pom.xml b/src/it/MPIR-362/pom.xml
index e20fc42..3c09149 100644
--- a/src/it/MPIR-362/pom.xml
+++ b/src/it/MPIR-362/pom.xml
@@ -30,8 +30,8 @@
<url>http://maven.apache.org/plugins/it/${project.artifactId}</url>
<properties>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
diff --git a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
index 83e7504..ddd9cd8 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
@@ -116,7 +116,7 @@ public abstract class AbstractProjectInfoReport
// ----------------------------------------------------------------------
@Parameter( defaultValue = "${session}", readonly = true, required = true )
- private MavenSession session;
+ protected MavenSession session;
/**
* Local Repository.
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
index 61c8b2d..475e73e 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependenciesReport.java
@@ -189,7 +189,7 @@ public class DependenciesReport
try
{
ArtifactFilter artifactFilter = new ScopeArtifactFilter( Artifact.SCOPE_TEST );
- return dependencyGraphBuilder.buildDependencyGraph( project, artifactFilter );
+ return dependencyGraphBuilder.buildDependencyGraph( session.getProjectBuildingRequest(), artifactFilter );
}
catch ( DependencyGraphBuilderException e )
{
@@ -253,4 +253,5 @@ public class DependenciesReport
IOUtil.close( resourceList );
}
}
+
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
index 875a11e..7f9c89f 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
@@ -47,17 +47,17 @@ import org.apache.maven.report.projectinfo.dependencies.DependencyVersionMap;
import org.apache.maven.report.projectinfo.dependencies.SinkSerializingDependencyNodeVisitor;
import org.apache.maven.reporting.MavenReportException;
import org.apache.maven.shared.artifact.filter.StrictPatternIncludesArtifactFilter;
-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilder;
-import org.apache.maven.shared.dependency.tree.DependencyNode;
-import org.apache.maven.shared.dependency.tree.DependencyTreeBuilderException;
-import org.apache.maven.shared.dependency.tree.filter.AncestorOrSelfDependencyNodeFilter;
-import org.apache.maven.shared.dependency.tree.filter.AndDependencyNodeFilter;
-import org.apache.maven.shared.dependency.tree.filter.ArtifactDependencyNodeFilter;
-import org.apache.maven.shared.dependency.tree.filter.DependencyNodeFilter;
-import org.apache.maven.shared.dependency.tree.traversal.BuildingDependencyNodeVisitor;
-import org.apache.maven.shared.dependency.tree.traversal.CollectingDependencyNodeVisitor;
-import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
-import org.apache.maven.shared.dependency.tree.traversal.FilteringDependencyNodeVisitor;
+import org.apache.maven.shared.dependency.graph.DependencyGraphBuilder;
+import org.apache.maven.shared.dependency.graph.DependencyGraphBuilderException;
+import org.apache.maven.shared.dependency.graph.DependencyNode;
+import org.apache.maven.shared.dependency.graph.filter.AncestorOrSelfDependencyNodeFilter;
+import org.apache.maven.shared.dependency.graph.filter.AndDependencyNodeFilter;
+import org.apache.maven.shared.dependency.graph.filter.ArtifactDependencyNodeFilter;
+import org.apache.maven.shared.dependency.graph.filter.DependencyNodeFilter;
+import org.apache.maven.shared.dependency.graph.traversal.BuildingDependencyNodeVisitor;
+import org.apache.maven.shared.dependency.graph.traversal.CollectingDependencyNodeVisitor;
+import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
+import org.apache.maven.shared.dependency.graph.traversal.FilteringDependencyNodeVisitor;
/**
* Generates the Project Dependency Convergence report for (reactor) builds.
@@ -87,7 +87,7 @@ public class DependencyConvergenceReport
* Dependency tree builder, will use it to build dependency tree.
*/
@Component
- private DependencyTreeBuilder dependencyTreeBuilder;
+ private DependencyGraphBuilder dependencyGraphBuilder;
private ArtifactFilter filter = null;
@@ -902,9 +902,9 @@ public class DependencyConvergenceReport
{
try
{
- return dependencyTreeBuilder.buildDependencyTree( buildingRequest.getProject(), localRepository, filter );
+ return dependencyGraphBuilder.buildDependencyGraph( buildingRequest, filter );
}
- catch ( DependencyTreeBuilderException e )
+ catch ( DependencyGraphBuilderException e )
{
throw new MavenReportException( "Could not build dependency tree: " + e.getMessage(), e );
}
diff --git a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
index 0299332..e849417 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
@@ -27,11 +27,8 @@ import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.scm.manager.ScmManager;
-import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
import org.apache.maven.scm.provider.git.repository.GitScmProviderRepository;
import org.apache.maven.scm.provider.hg.repository.HgScmProviderRepository;
-import org.apache.maven.scm.provider.perforce.repository.PerforceScmProviderRepository;
-import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.i18n.I18N;
@@ -347,14 +344,7 @@ public class ScmReport
startSection( getI18nString( "anonymousaccess.title" ) );
- if ( anonymousRepository != null && isScmSystem( anonymousRepository, "cvs" ) )
- {
- CvsScmProviderRepository cvsRepo =
- (CvsScmProviderRepository) anonymousRepository.getProviderRepository();
-
- anonymousAccessCVS( cvsRepo );
- }
- else if ( anonymousRepository != null && isScmSystem( anonymousRepository, "git" ) )
+ if ( anonymousRepository != null && isScmSystem( anonymousRepository, "git" ) )
{
GitScmProviderRepository gitRepo =
(GitScmProviderRepository) anonymousRepository.getProviderRepository();
@@ -402,12 +392,6 @@ public class ScmReport
{
developerAccessClearCase();
}
- else if ( devRepository != null && isScmSystem( devRepository, "cvs" ) )
- {
- CvsScmProviderRepository cvsRepo = (CvsScmProviderRepository) devRepository.getProviderRepository();
-
- developerAccessCVS( cvsRepo );
- }
else if ( devRepository != null && isScmSystem( devRepository, "git" ) )
{
GitScmProviderRepository gitRepo = (GitScmProviderRepository) devRepository.getProviderRepository();
@@ -420,20 +404,6 @@ public class ScmReport
developerAccessMercurial( hgRepo );
}
- else if ( devRepository != null && isScmSystem( devRepository, "perforce" ) )
- {
- PerforceScmProviderRepository perforceRepo =
- (PerforceScmProviderRepository) devRepository.getProviderRepository();
-
- developerAccessPerforce( perforceRepo );
- }
- else if ( devRepository != null && isScmSystem( devRepository, "starteam" ) )
- {
- StarteamScmProviderRepository starteamRepo =
- (StarteamScmProviderRepository) devRepository.getProviderRepository();
-
- developerAccessStarteam( starteamRepo );
- }
else if ( devRepository != null && isScmSystem( devRepository, "svn" ) )
{
SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) devRepository.getProviderRepository();
@@ -521,28 +491,6 @@ public class ScmReport
// CVS
// CHECKSTYLE_OFF: LineLength
- /**
- * Create the documentation to provide an anonymous access with a <code>CVS</code> SCM. For example, generate
- * the following command line:
- * <p>
- * cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic login
- * </p>
- * <p>
- * cvs -z3 -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic co maven-plugins/dist
- * </p>
- *
- * @param cvsRepo
- * @see <a
- * href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115">https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a>
- */
- // CHECKSTYLE_ON: LineLength
- private void anonymousAccessCVS( CvsScmProviderRepository cvsRepo )
- {
- paragraph( getI18nString( "anonymousaccess.cvs.intro" ) );
-
- verbatimText( "$ cvs -d " + cvsRepo.getCvsRoot() + " login" + LS + "$ cvs -z3 -d "
- + cvsRepo.getCvsRoot() + " co " + cvsRepo.getModule() );
- }
// Git
@@ -599,31 +547,6 @@ public class ScmReport
}
// CHECKSTYLE_OFF: LineLength
- /**
- * Create the documentation to provide an developer access with a <code>CVS</code> SCM. For example, generate
- * the following command line:
- * <p>
- * cvs -d :pserver:username@cvs.apache.org:/home/cvs login
- * </p>
- * <p>
- * cvs -z3 -d :ext:username@cvs.apache.org:/home/cvs co maven-plugins/dist
- * </p>
- *
- * @param cvsRepo
- * @see <a
- * href="https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115">https://www.cvshome.org/docs/manual/cvs-1.12.12/cvs_16.html#SEC115</a>
- */
- // CHECKSTYLE_ON: LineLength
- private void developerAccessCVS( CvsScmProviderRepository cvsRepo )
- {
- paragraph( getI18nString( "devaccess.cvs.intro" ) );
-
- // Safety: remove the username if present
- String cvsRoot = StringUtils.replace( cvsRepo.getCvsRoot(), cvsRepo.getUser(), "username" );
-
- verbatimText( "$ cvs -d " + cvsRoot + " login" + LS + "$ cvs -z3 -d " + cvsRoot
- + " co " + cvsRepo.getModule() );
- }
// Git
@@ -668,82 +591,9 @@ public class ScmReport
// Perforce
// CHECKSTYLE_OFF: LineLength
- /**
- * Create the documentation to provide an developer access with a <code>Perforce</code> SCM. For example,
- * generate the following command line:
- * <p>
- * p4 -H hostname -p port -u username -P password path
- * </p>
- * <p>
- * p4 -H hostname -p port -u username -P password path submit -c changement
- * </p>
- *
- * @param perforceRepo
- * @see <a
- * href="http://www.perforce.com/perforce/doc.051/manuals/cmdref/index.html">http://www.perforce.com/
- * perforce
- * /doc.051/manuals/cmdref/index.html</>
- */
- // CHECKSTYLE_ON: LineLength
- private void developerAccessPerforce( PerforceScmProviderRepository perforceRepo )
- {
- paragraph( getI18nString( "devaccess.perforce.intro" ) );
-
- StringBuilder command = new StringBuilder();
- command.append( "$ p4" );
- if ( !StringUtils.isEmpty( perforceRepo.getHost() ) )
- {
- command.append( " -H " ).append( perforceRepo.getHost() );
- }
- if ( perforceRepo.getPort() > 0 )
- {
- command.append( " -p " ).append( perforceRepo.getPort() );
- }
- command.append( " -u username" );
- command.append( " -P password" );
- command.append( " " );
- command.append( perforceRepo.getPath() );
- command.append( LS );
- command.append( "$ p4 submit -c \"A comment\"" );
-
- verbatimText( command.toString() );
- }
// Starteam
- /**
- * Create the documentation to provide an developer access with a <code>Starteam</code> SCM. For example,
- * generate the following command line:
- * <p>
- * stcmd co -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -is
- * </p>
- * <p>
- * stcmd ci -x -nologo -stop -p myusername:mypassword@myhost:1234/projecturl -f NCI -is
- * </p>
- *
- * @param starteamRepo
- */
- private void developerAccessStarteam( StarteamScmProviderRepository starteamRepo )
- {
- paragraph( getI18nString( "devaccess.starteam.intro" ) );
-
- StringBuilder command = new StringBuilder();
-
- // Safety: remove the username/password if present
- String fullUrl = StringUtils.replace( starteamRepo.getFullUrl(), starteamRepo.getUser(), "username" );
- fullUrl = StringUtils.replace( fullUrl, starteamRepo.getPassword(), "password" );
-
- command.append( "$ stcmd co -x -nologo -stop -p " );
- command.append( fullUrl );
- command.append( " -is" );
- command.append( LS );
- command.append( "$ stcmd ci -x -nologo -stop -p " );
- command.append( fullUrl );
- command.append( " -f NCI -is" );
-
- verbatimText( command.toString() );
- }
-
// Subversion
/**
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
index 3346a7d..70727b1 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependencyVersionMap.java
@@ -25,8 +25,8 @@ import java.util.List;
import java.util.Map;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.shared.dependency.tree.DependencyNode;
-import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
+import org.apache.maven.shared.dependency.graph.DependencyNode;
+import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
/**
* @author Simon Wang
diff --git a/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java b/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
index 073a618..f79d808 100644
--- a/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
+++ b/src/main/java/org/apache/maven/report/projectinfo/dependencies/SinkSerializingDependencyNodeVisitor.java
@@ -22,8 +22,8 @@ package org.apache.maven.report.projectinfo.dependencies;
import java.util.List;
import org.apache.maven.doxia.sink.Sink;
-import org.apache.maven.shared.dependency.tree.DependencyNode;
-import org.apache.maven.shared.dependency.tree.traversal.DependencyNodeVisitor;
+import org.apache.maven.shared.dependency.graph.DependencyNode;
+import org.apache.maven.shared.dependency.graph.traversal.DependencyNodeVisitor;
/**
* A dependency node visitor that serializes visited nodes to a sink writer. It's used to serialize tree in project
diff --git a/src/main/resources/project-info-reports.properties b/src/main/resources/project-info-reports.properties
index 18d8738..00ee3f9 100644
--- a/src/main/resources/project-info-reports.properties
+++ b/src/main/resources/project-info-reports.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Access
report.ci-management.anthill.intro = This project uses {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = This project uses {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_cs.properties b/src/main/resources/project-info-reports_cs.properties
index 818e5b5..76195d5 100644
--- a/src/main/resources/project-info-reports_cs.properties
+++ b/src/main/resources/project-info-reports_cs.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = P\u0159\u00edstup
report.ci-management.anthill.intro = Tento projekt pou\u017e\u00edv\u00e1 {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Tento projekt pou\u017e\u00edv\u00e1 {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_de.properties b/src/main/resources/project-info-reports_de.properties
index d71866d..40e5f43 100644
--- a/src/main/resources/project-info-reports_de.properties
+++ b/src/main/resources/project-info-reports_de.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Zugriff
report.ci-management.anthill.intro = Dieses Projekt verwendet {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Dieses Projekt verwendet {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_es.properties b/src/main/resources/project-info-reports_es.properties
index d7afcad..7b13cf8 100644
--- a/src/main/resources/project-info-reports_es.properties
+++ b/src/main/resources/project-info-reports_es.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Acceso
report.ci-management.anthill.intro = Este proyecto usa {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Este proyecto usa {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_fr.properties b/src/main/resources/project-info-reports_fr.properties
index 184798d..ae15758 100644
--- a/src/main/resources/project-info-reports_fr.properties
+++ b/src/main/resources/project-info-reports_fr.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Acc\u00e8s
report.ci-management.anthill.intro = Ce projet utilise {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Ce projet utilise {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_gl.properties b/src/main/resources/project-info-reports_gl.properties
index 7286852..c55ac05 100644
--- a/src/main/resources/project-info-reports_gl.properties
+++ b/src/main/resources/project-info-reports_gl.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Acceso
report.ci-management.anthill.intro = Este proxecto usa {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Este proxecto usa {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_hu.properties b/src/main/resources/project-info-reports_hu.properties
index 0e4bacb..7755a75 100644
--- a/src/main/resources/project-info-reports_hu.properties
+++ b/src/main/resources/project-info-reports_hu.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Hozz\u00e1f\u00e9r\u00e9s
report.ci-management.anthill.intro = Ez a projekt {Anthill, http://www.anthillpro.com/html/products/anthillos/} rendszert haszn\u00C3\u00A1l.
report.ci-management.bamboo.intro = Ez a projekt {Bamboo, http://www.atlassian.com/software/bamboo/} rendszert haszn\u00C3\u00A1l.
diff --git a/src/main/resources/project-info-reports_it.properties b/src/main/resources/project-info-reports_it.properties
index 4c0ca3e..f6cf01e 100644
--- a/src/main/resources/project-info-reports_it.properties
+++ b/src/main/resources/project-info-reports_it.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Accesso
report.ci-management.anthill.intro = Questo progetto usa {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Questo progetto usa {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_ja.properties b/src/main/resources/project-info-reports_ja.properties
index 9fd494b..803c1a7 100644
--- a/src/main/resources/project-info-reports_ja.properties
+++ b/src/main/resources/project-info-reports_ja.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = \u30A2\u30AF\u30BB\u30B9
report.ci-management.anthill.intro = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F {Anthill, http://www.anthillpro.com/html/products/anthillos/} \u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
report.ci-management.bamboo.intro = \u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306F {Bamboo, http://www.atlassian.com/software/bamboo/} \u3092\u4F7F\u7528\u3057\u3066\u3044\u307E\u3059\u3002
diff --git a/src/main/resources/project-info-reports_ko.properties b/src/main/resources/project-info-reports_ko.properties
index 92fa6d9..83fc419 100644
--- a/src/main/resources/project-info-reports_ko.properties
+++ b/src/main/resources/project-info-reports_ko.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = \uc811\uadfc
report.ci-management.anthill.intro = \uc774 \ud504\ub85c\uc81d\ud2b8\ub294 {Anthill, http://www.anthillpro.com/html/products/anthillos/}\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4.
report.ci-management.bamboo.intro = \uc774 \ud504\ub85c\uc81d\ud2b8\ub294 {Bamboo, http://www.atlassian.com/software/bamboo/}\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4.
diff --git a/src/main/resources/project-info-reports_lt.properties b/src/main/resources/project-info-reports_lt.properties
index d9a2e12..33b9bfd 100644
--- a/src/main/resources/project-info-reports_lt.properties
+++ b/src/main/resources/project-info-reports_lt.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Prieiga
report.ci-management.anthill.intro = \u0160is projektas naudoja {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = \u0160is projektas naudoja {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_nl.properties b/src/main/resources/project-info-reports_nl.properties
index 3b29c39..d2e6a9f 100644
--- a/src/main/resources/project-info-reports_nl.properties
+++ b/src/main/resources/project-info-reports_nl.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.anthill.intro = Dit project gebruikt {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Dit project gebruikt {Bamboo, http://www.atlassian.com/software/bamboo/}.
report.ci-management.buildforge.intro = Dit project gebruikt {Build Forge, http://www-306.ibm.com/software/awdtools/buildforge/enterprise/}.
diff --git a/src/main/resources/project-info-reports_no.properties b/src/main/resources/project-info-reports_no.properties
index 6c38d1d..ea4d85c 100644
--- a/src/main/resources/project-info-reports_no.properties
+++ b/src/main/resources/project-info-reports_no.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Tilgang
report.ci-management.anthill.intro = Dette prosjektet bruker {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Dette prosjektet bruker {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_pl.properties b/src/main/resources/project-info-reports_pl.properties
index 4a35e2a..7ac7b53 100644
--- a/src/main/resources/project-info-reports_pl.properties
+++ b/src/main/resources/project-info-reports_pl.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Dost\u0119p
report.ci-management.anthill.intro = Projekt ten u\u017Cywa systemu {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Projekt ten u\u017Cywa systemu {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_pt.properties b/src/main/resources/project-info-reports_pt.properties
index a14fb58..a808399 100644
--- a/src/main/resources/project-info-reports_pt.properties
+++ b/src/main/resources/project-info-reports_pt.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Acesso
report.ci-management.anthill.intro = Este projecto usa o {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Este projecto usa o {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_pt_BR.properties b/src/main/resources/project-info-reports_pt_BR.properties
index aee79c4..eed6c6c 100644
--- a/src/main/resources/project-info-reports_pt_BR.properties
+++ b/src/main/resources/project-info-reports_pt_BR.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Acesso
report.ci-management.anthill.intro = Este projeto utiliza o {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Este projeto utiliza o {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_ru.properties b/src/main/resources/project-info-reports_ru.properties
index 527ad75..e21d576 100644
--- a/src/main/resources/project-info-reports_ru.properties
+++ b/src/main/resources/project-info-reports_ru.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = \u0414\u043E\u0441\u0442\u0443\u043F
report.ci-management.anthill.intro = \u0414\u0430\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = \u0414\u0430\u043D\u043D\u044B\u0439 \u043F\u0440\u043E\u0435\u043A\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0435\u0442 {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_sk.properties b/src/main/resources/project-info-reports_sk.properties
index b2d6c26..cc0fd7a 100644
--- a/src/main/resources/project-info-reports_sk.properties
+++ b/src/main/resources/project-info-reports_sk.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Pr\u00edstup
report.ci-management.anthill.intro = Tento projekt pou\u017e\u00edva {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Tento projekt pou\u017e\u00edva {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_sv.properties b/src/main/resources/project-info-reports_sv.properties
index 9fc301d..8da52b1 100644
--- a/src/main/resources/project-info-reports_sv.properties
+++ b/src/main/resources/project-info-reports_sv.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = \u00c5tkomst
report.ci-management.anthill.intro = Detta projekt anv\u00e4nder {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = Detta projekt anv\u00e4nder {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_tr.properties b/src/main/resources/project-info-reports_tr.properties
index e28db16..a645566 100644
--- a/src/main/resources/project-info-reports_tr.properties
+++ b/src/main/resources/project-info-reports_tr.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = Eri\u00feim
report.ci-management.anthill.intro = This project uses {Anthill, http://www.anthillpro.com/html/products/anthillos/}.
report.ci-management.bamboo.intro = This project uses {Bamboo, http://www.atlassian.com/software/bamboo/}.
diff --git a/src/main/resources/project-info-reports_zh_CN.properties b/src/main/resources/project-info-reports_zh_CN.properties
index cb65519..26ad82e 100644
--- a/src/main/resources/project-info-reports_zh_CN.properties
+++ b/src/main/resources/project-info-reports_zh_CN.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = \u8BBF\u95EE
report.ci-management.anthill.intro = \u672C\u9879\u76EE\u4F7F\u7528 {Anthill, http://www.anthillpro.com/html/products/anthillos/}\u3002
report.ci-management.bamboo.intro = \u672C\u9879\u76EE\u4F7F\u7528 {Bamboo, http://www.atlassian.com/software/bamboo/}\u3002
diff --git a/src/main/resources/project-info-reports_zh_TW.properties b/src/main/resources/project-info-reports_zh_TW.properties
index 930817e..7c7f584 100644
--- a/src/main/resources/project-info-reports_zh_TW.properties
+++ b/src/main/resources/project-info-reports_zh_TW.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+# CHECKSTYLE_OFF: LineLength
+
report.ci-management.access = \u5b58\u53d6 (Access)
report.ci-management.anthill.intro = \u672c\u5c08\u6848\u4f7f\u7528 {Anthill, http://www.anthillpro.com/html/products/anthillos/}\u3002
report.ci-management.bamboo.intro = \u672c\u5c08\u6848\u4f7f\u7528 {Bamboo, http://www.atlassian.com/software/bamboo/}\u3002
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 01f04e5..73fd93e 100644
--- a/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
+++ b/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
@@ -32,10 +32,12 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.report.projectinfo.stubs.DependencyArtifactStubFactory;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
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.DefaultRepositorySystemSession;
+import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
+import org.eclipse.aether.repository.LocalRepository;
/**
* Abstract class to test reports generation with <a href="http://www.httpunit.org/">HTTPUnit</a> framework.
@@ -182,9 +184,10 @@ public abstract class AbstractProjectInfoTestCase
LegacySupport legacySupport = lookup( LegacySupport.class );
legacySupport.setSession( newMavenSession( new MavenProjectStub() ) );
- DefaultRepositorySystemSession repoSession =
- (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( artifactStubFactory.getWorkingDir() ) );
+ DefaultRepositorySystemSession repoSession = MavenRepositorySystemUtils.newSession();
+ LocalRepository localRepo = new LocalRepository( artifactStubFactory.getWorkingDir() );
+ repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory()
+ .newInstance( repoSession, localRepo ) );
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
setVariableValueToObject( mojo, "remoteRepositories", mojo.getProject().getRemoteArtifactRepositories() );