maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject svn commit: r1722469 - in /maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly: archive/phase/wrappers/RepoInfoWrapper.java repository/DefaultRepositoryAssembler.java
Date Thu, 31 Dec 2015 21:30:40 GMT
Author: rfscholte
Date: Thu Dec 31 21:30:40 2015
New Revision: 1722469

URL: http://svn.apache.org/viewvc?rev=1722469&view=rev
Log:
Fix checkstyle reported errors

Modified:
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
    maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java?rev=1722469&r1=1722468&r2=1722469&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/archive/phase/wrappers/RepoInfoWrapper.java
Thu Dec 31 21:30:40 2015
@@ -19,8 +19,8 @@ package org.apache.maven.plugins.assembl
  * 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 @@ public class RepoInfoWrapper
 
     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 @@ public class RepoInfoWrapper
      * {@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 ) );
             }

Modified: maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java?rev=1722469&r1=1722468&r2=1722469&view=diff
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
(original)
+++ maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugins/assembly/repository/DefaultRepositoryAssembler.java
Thu Dec 31 21:30:40 2015
@@ -153,7 +153,8 @@ public class DefaultRepositoryAssembler
         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 @@ public class DefaultRepositoryAssembler
 
     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 @@ public class DefaultRepositoryAssembler
                              sha1.toLowerCase() );
     }
 
+    // CHECKSTYLE_OFF: LineLength
     protected Map<String, GroupVersionAlignment> createGroupVersionAlignments( List<GroupVersionAlignment>
versionAlignments )
+    // CHECKSTYLE_ON: LineLength
     {
         Map<String, GroupVersionAlignment> groupVersionAlignments = new HashMap<String,
GroupVersionAlignment>();
 



Mime
View raw message