Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-22 01:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Checkstyle fixes

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@418480 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Carlos Sanchez Gonzalez 2006-07-01 14:27:10 +00:00
parent 3d42cb8fdf
commit 78813d2640
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-artifact-manager/pom.xml
View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?><project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>maven</artifactId>
<groupId>org.apache.maven</groupId>

2
maven-artifact-manager/src/main/java/org/apache/maven/artifact/manager/WagonManager.java
View File

@ -33,6 +33,8 @@
import java.util.List;
/**
* Manages <a href="http://maven.apache.org/wagon">Wagon</a> related operations in Maven.
*
* @author <a href="michal.maczka@dimatics.com">Michal Maczka </a>
* @version $Id$
*/

10
maven-artifact-manager/src/main/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManager.java
View File

@ -156,13 +156,11 @@ private void mergeMetadata( RepositoryMetadata metadata, List remoteRepositories
ArtifactRepositoryPolicy policy =
metadata.isSnapshot() ? repository.getSnapshots() : repository.getReleases();
if ( policy.isEnabled() && !repository.isBlacklisted() )
if ( ( policy.isEnabled() && !repository.isBlacklisted() )
&& ( loadMetadata( metadata, repository, localRepository, previousMetadata ) ) )
{
if ( loadMetadata( metadata, repository, localRepository, previousMetadata ) )
{
metadata.setRepository( repository );
selected = repository;
}
metadata.setRepository( repository );
selected = repository;
}
}
if ( loadMetadata( metadata, localRepository, localRepository, previousMetadata ) )

8
maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java
View File

@ -159,12 +159,10 @@ private int resolveLatestSnapshotBuildNumber( Artifact artifact, ArtifactReposit
int buildNumber = 0;
Metadata repoMetadata = metadata.getMetadata();
if ( repoMetadata != null )
if ( ( repoMetadata != null )
&& ( repoMetadata.getVersioning() != null && repoMetadata.getVersioning().getSnapshot() != null ) )
{
if ( repoMetadata.getVersioning() != null && repoMetadata.getVersioning().getSnapshot() != null )
{
buildNumber = repoMetadata.getVersioning().getSnapshot().getBuildNumber();
}
buildNumber = repoMetadata.getVersioning().getSnapshot().getBuildNumber();
}
return buildNumber;
}