upgraded parent pom
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1635402 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 2902a60..7d6aa04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<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>
diff --git a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
index f014e35..9579770 100644
--- a/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
+++ b/src/main/java/org/apache/maven/shared/repository/DefaultRepositoryAssembler.java
@@ -335,7 +335,8 @@
writeChecksums( targetFile );
- addPomWithAncestry( a, project.getRemoteArtifactRepositories(), localRepository, targetRepository, groupVersionAlignments, project );
+ addPomWithAncestry( a, project.getRemoteArtifactRepositories(), localRepository, targetRepository,
+ groupVersionAlignments, project );
}
}
}
@@ -383,9 +384,12 @@
{
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 @@
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 @@
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 @@
field.setAccessible( false );
}
- catch( NoSuchFieldException e )
+ catch ( NoSuchFieldException e )
{
// fine... no field, no cache. we'll ignore it.
}
@@ -654,9 +658,8 @@
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();
diff --git a/src/main/java/org/apache/maven/shared/repository/RepositoryAssembler.java b/src/main/java/org/apache/maven/shared/repository/RepositoryAssembler.java
index ceec21e..fb841bc 100644
--- a/src/main/java/org/apache/maven/shared/repository/RepositoryAssembler.java
+++ b/src/main/java/org/apache/maven/shared/repository/RepositoryAssembler.java
@@ -30,7 +30,7 @@
{
String ROLE = RepositoryAssembler.class.getName();
- public void buildRemoteRepository( File repositoryDirectory, RepositoryInfo repository,
- RepositoryBuilderConfigSource configSource )
+ void buildRemoteRepository( File repositoryDirectory, RepositoryInfo repository,
+ RepositoryBuilderConfigSource configSource )
throws RepositoryAssemblyException;
}
diff --git a/src/main/java/org/apache/maven/shared/repository/RepositoryBuilderConfigSource.java b/src/main/java/org/apache/maven/shared/repository/RepositoryBuilderConfigSource.java
index 60c9d67..1aa6cad 100644
--- a/src/main/java/org/apache/maven/shared/repository/RepositoryBuilderConfigSource.java
+++ b/src/main/java/org/apache/maven/shared/repository/RepositoryBuilderConfigSource.java
@@ -22,6 +22,9 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.project.MavenProject;
+/**
+ *
+ */
public interface RepositoryBuilderConfigSource
{
diff --git a/src/main/java/org/apache/maven/shared/repository/model/DefaultRepositoryInfo.java b/src/main/java/org/apache/maven/shared/repository/model/DefaultRepositoryInfo.java
index 63d10df..4b12257 100644
--- a/src/main/java/org/apache/maven/shared/repository/model/DefaultRepositoryInfo.java
+++ b/src/main/java/org/apache/maven/shared/repository/model/DefaultRepositoryInfo.java
@@ -23,6 +23,9 @@
import java.util.List;
+/**
+ *
+ */
public class DefaultRepositoryInfo
implements RepositoryInfo
{
diff --git a/src/main/java/org/apache/maven/shared/repository/model/GroupVersionAlignment.java b/src/main/java/org/apache/maven/shared/repository/model/GroupVersionAlignment.java
index ba34979..b5288fb 100644
--- a/src/main/java/org/apache/maven/shared/repository/model/GroupVersionAlignment.java
+++ b/src/main/java/org/apache/maven/shared/repository/model/GroupVersionAlignment.java
@@ -21,6 +21,9 @@
import java.util.List;
+/**
+ *
+ */
public interface GroupVersionAlignment
{
diff --git a/src/main/java/org/apache/maven/shared/repository/model/RepositoryInfo.java b/src/main/java/org/apache/maven/shared/repository/model/RepositoryInfo.java
index 72f0d22..00bdd33 100644
--- a/src/main/java/org/apache/maven/shared/repository/model/RepositoryInfo.java
+++ b/src/main/java/org/apache/maven/shared/repository/model/RepositoryInfo.java
@@ -21,6 +21,9 @@
import java.util.List;
+/**
+ *
+ */
public interface RepositoryInfo
{
