Fix checkstyle reported errors
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1722469 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
index 5780959..9a0fa8e 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
@@ -19,8 +19,8 @@
* under the License.
*/
-import org.apache.maven.plugins.assembly.model.GroupVersionAlignment;
import org.apache.maven.plugins.assembly.model.Repository;
+import org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment;
import org.apache.maven.plugins.assembly.repository.model.RepositoryInfo;
import java.util.ArrayList;
@@ -35,7 +35,7 @@
private final Repository repo;
- private List<org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment> convertedAlignments;
+ private List<GroupVersionAlignment> convertedAlignments;
/**
* @param repo The {@link Repository}
@@ -58,16 +58,16 @@
* {@inheritDoc}
*/
@Override
- public List<org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment> getGroupVersionAlignments()
+ public List<GroupVersionAlignment> getGroupVersionAlignments()
{
- final List<GroupVersionAlignment> alignments = repo.getGroupVersionAlignments();
+ final List<org.apache.maven.plugins.assembly.model.GroupVersionAlignment> alignments =
+ repo.getGroupVersionAlignments();
if ( convertedAlignments == null || alignments.size() != convertedAlignments.size() )
{
- final List<org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment> l =
- new ArrayList<org.apache.maven.plugins.assembly.repository.model.GroupVersionAlignment>( alignments.size() );
+ final List<GroupVersionAlignment> l = new ArrayList<GroupVersionAlignment>( alignments.size() );
- for ( final GroupVersionAlignment alignment : alignments )
+ for ( final org.apache.maven.plugins.assembly.model.GroupVersionAlignment alignment : alignments )
{
l.add( new GroupVersionAlignmentWrapper( alignment ) );
}
diff --git a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
index 3793842..5112446 100644
--- a/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
+++ b/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
@@ -153,7 +153,8 @@
MavenProject project = configSource.getProject();
ArtifactRepository localRepository = configSource.getLocalRepository();
- Map<String, GroupVersionAlignment> groupVersionAlignments = createGroupVersionAlignments( repository.getGroupVersionAlignments() );
+ Map<String, GroupVersionAlignment> groupVersionAlignments =
+ createGroupVersionAlignments( repository.getGroupVersionAlignments() );
ArtifactRepository targetRepository = createLocalRepository( repositoryDirectory );
@@ -344,7 +345,8 @@
private void addPomWithAncestry( final Artifact artifact, List<ArtifactRepository> remoteArtifactRepositories,
ArtifactRepository localRepository, ArtifactRepository targetRepository,
- Map<String, GroupVersionAlignment> groupVersionAlignments, MavenProject masterProject )
+ Map<String, GroupVersionAlignment> groupVersionAlignments,
+ MavenProject masterProject )
throws RepositoryAssemblyException
{
String type = artifact.getType();
@@ -531,7 +533,9 @@
sha1.toLowerCase() );
}
+ // CHECKSTYLE_OFF: LineLength
protected Map<String, GroupVersionAlignment> createGroupVersionAlignments( List<GroupVersionAlignment> versionAlignments )
+ // CHECKSTYLE_ON: LineLength
{
Map<String, GroupVersionAlignment> groupVersionAlignments = new HashMap<String, GroupVersionAlignment>();
