mirror of https://github.com/apache/archiva.git
moved getMetadataFile inline
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@940398 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
76502a997d
commit
47847c95c1
|
@ -313,7 +313,7 @@ public class UploadAction
|
|||
int newBuildNumber = -1;
|
||||
String timestamp = null;
|
||||
|
||||
File versionMetadataFile = getMetadata( targetPath.getAbsolutePath() );
|
||||
File versionMetadataFile = new File( targetPath, MetadataTools.MAVEN_METADATA );
|
||||
ArchivaRepositoryMetadata versionMetadata = getMetadata( versionMetadataFile );
|
||||
|
||||
if ( VersionUtil.isSnapshot( version ) )
|
||||
|
@ -501,11 +501,6 @@ public class UploadAction
|
|||
return pomFile;
|
||||
}
|
||||
|
||||
private File getMetadata( String targetPath )
|
||||
{
|
||||
return new File( targetPath, MetadataTools.MAVEN_METADATA );
|
||||
}
|
||||
|
||||
private ArchivaRepositoryMetadata getMetadata( File metadataFile )
|
||||
throws RepositoryMetadataException
|
||||
{
|
||||
|
@ -561,8 +556,9 @@ public class UploadAction
|
|||
List<String> availableVersions = new ArrayList<String>();
|
||||
String latestVersion = version;
|
||||
|
||||
String projectPath = targetPath.substring( 0, targetPath.lastIndexOf( File.separatorChar ) );
|
||||
File projectMetadataFile = getMetadata( projectPath );
|
||||
File projectDir = new File( targetPath ).getParentFile();
|
||||
File projectMetadataFile = new File( projectDir, MetadataTools.MAVEN_METADATA );
|
||||
|
||||
ArchivaRepositoryMetadata projectMetadata = getMetadata( projectMetadataFile );
|
||||
|
||||
if ( projectMetadataFile.exists() )
|
||||
|
|
Loading…
Reference in New Issue