Author: hboutemy Date: Thu Oct 30 06:29:04 2014 New Revision: 1635402 URL: http://svn.apache.org/r1635402 Log: upgraded parent pom
Modified: maven/shared/trunk/maven-repository-builder/pom.xml maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryAssembler.java maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryBuilderConfigSource.java maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/DefaultRepositoryInfo.java maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/GroupVersionAlignment.java maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/RepositoryInfo.java Modified: maven/shared/trunk/maven-repository-builder/pom.xml URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/pom.xml?rev=1635402&r1=1635401&r2=1635402&view=diff ============================================================================== --- maven/shared/trunk/maven-repository-builder/pom.xml (original) +++ maven/shared/trunk/maven-repository-builder/pom.xml Thu Oct 30 06:29:04 2014 @@ -23,7 +23,7 @@ under the License. <parent> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-components</artifactId> - <version>20</version> + <version>21</version> <relativePath>../maven-shared-components/pom.xml</relativePath> </parent> Modified: maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java?rev=1635402&r1=1635401&r2=1635402&view=diff ============================================================================== --- maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java (original) +++ maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java Thu Oct 30 06:29:04 2014 @@ -335,7 +335,8 @@ public class DefaultRepositoryAssembler writeChecksums( targetFile ); - addPomWithAncestry( a, project.getRemoteArtifactRepositories(), localRepository, targetRepository, groupVersionAlignments, project ); + addPomWithAncestry( a, project.getRemoteArtifactRepositories(), localRepository, targetRepository, + groupVersionAlignments, project ); } } } @@ -383,9 +384,12 @@ public class DefaultRepositoryAssembler { artifact.isSnapshot(); - Artifact pomArtifact = artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(), artifact.getBaseVersion() ); + Artifact pomArtifact = + artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(), + artifact.getBaseVersion() ); - getLogger().debug( "Building MavenProject instance for: " + pomArtifact + ". NOTE: This SHOULD BE available in the Artifact API! ...but it's not." ); + getLogger().debug( "Building MavenProject instance for: " + pomArtifact + + ". NOTE: This SHOULD BE available in the Artifact API! ...but it's not." ); p = projectBuilder.buildFromRepository( pomArtifact, remoteArtifactRepositories, localRepository ); } catch ( ProjectBuildingException e ) @@ -401,10 +405,10 @@ public class DefaultRepositoryAssembler p = p.getParent(); } - while( p != null ) + while ( p != null ) { - Artifact destArtifact = artifactFactory.createProjectArtifact( p.getGroupId(), p.getArtifactId(), p - .getVersion() ); + Artifact destArtifact = + artifactFactory.createProjectArtifact( p.getGroupId(), p.getArtifactId(), p.getVersion() ); setAlignment( destArtifact, groupVersionAlignments ); @@ -414,8 +418,8 @@ public class DefaultRepositoryAssembler if ( ( sourceFile == null ) || !sourceFile.exists() ) { // something that hasn't been realigned yet...we want to read from the original location. - Artifact srcArtifact = artifactFactory.createProjectArtifact( p.getGroupId(), p.getArtifactId(), p - .getVersion() ); + Artifact srcArtifact = + artifactFactory.createProjectArtifact( p.getGroupId(), p.getArtifactId(), p.getVersion() ); sourceFile = new File( localRepository.getBasedir(), localRepository.pathOf( srcArtifact ) ); } @@ -627,7 +631,7 @@ public class DefaultRepositoryAssembler field.setAccessible( false ); } - catch( NoSuchFieldException e ) + catch ( NoSuchFieldException e ) { // fine... no field, no cache. we'll ignore it. } @@ -654,9 +658,8 @@ public class DefaultRepositoryAssembler DependencyManagement dependencyManagement = project.getModel().getDependencyManagement(); Map map = null; - List deps; - if ( ( dependencyManagement != null ) && ( ( deps = dependencyManagement.getDependencies() ) != null ) - && ( deps.size() > 0 ) ) + List deps = ( dependencyManagement == null ) ? null : dependencyManagement.getDependencies(); + if ( ( deps != null ) && ( deps.size() > 0 ) ) { map = new HashMap(); Modified: maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryAssembler.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryAssembler.java?rev=1635402&r1=1635401&r2=1635402&view=diff ============================================================================== --- maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryAssembler.java (original) +++ maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryAssembler.java Thu Oct 30 06:29:04 2014 @@ -30,7 +30,7 @@ public interface RepositoryAssembler { String ROLE = RepositoryAssembler.class.getName(); - public void buildRemoteRepository( File repositoryDirectory, RepositoryInfo repository, - RepositoryBuilderConfigSource configSource ) + void buildRemoteRepository( File repositoryDirectory, RepositoryInfo repository, + RepositoryBuilderConfigSource configSource ) throws RepositoryAssemblyException; } Modified: maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryBuilderConfigSource.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryBuilderConfigSource.java?rev=1635402&r1=1635401&r2=1635402&view=diff ============================================================================== --- maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryBuilderConfigSource.java (original) +++ maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/RepositoryBuilderConfigSource.java Thu Oct 30 06:29:04 2014 @@ -22,6 +22,9 @@ package org.apache.maven.shared.reposito import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.project.MavenProject; +/** + * + */ public interface RepositoryBuilderConfigSource { Modified: maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/DefaultRepositoryInfo.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/DefaultRepositoryInfo.java?rev=1635402&r1=1635401&r2=1635402&view=diff ============================================================================== --- maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/DefaultRepositoryInfo.java (original) +++ maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/DefaultRepositoryInfo.java Thu Oct 30 06:29:04 2014 @@ -23,6 +23,9 @@ import org.apache.maven.artifact.Artifac import java.util.List; +/** + * + */ public class DefaultRepositoryInfo implements RepositoryInfo { Modified: maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/GroupVersionAlignment.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/GroupVersionAlignment.java?rev=1635402&r1=1635401&r2=1635402&view=diff ============================================================================== --- maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/GroupVersionAlignment.java (original) +++ maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/GroupVersionAlignment.java Thu Oct 30 06:29:04 2014 @@ -21,6 +21,9 @@ package org.apache.maven.shared.reposito import java.util.List; +/** + * + */ public interface GroupVersionAlignment { Modified: maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/RepositoryInfo.java URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/RepositoryInfo.java?rev=1635402&r1=1635401&r2=1635402&view=diff ============================================================================== --- maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/RepositoryInfo.java (original) +++ maven/shared/trunk/maven-repository-builder/src/main/java/org/apache/maven/shared/repository/model/RepositoryInfo.java Thu Oct 30 06:29:04 2014 @@ -21,6 +21,9 @@ package org.apache.maven.shared.reposito import java.util.List; +/** + * + */ public interface RepositoryInfo {