From 488303a9e8388529e99d384b00461d460c4a3d3a Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Mon, 23 Jul 2007 16:48:30 +0000 Subject: [MRM-425 and MRM-426] - Added and modified code for handling snapshots (if the versions of a specific artifact snapshot are only timestamped versions, add a generic snapshot which is pointing to the latest timestamp version) in DefaultRepositoryBrowsing and ProjectModelToDatabaseConsumer. - Updated pom validations in ProjectModelToDatabaseConsumer - handling of timestamped versions were considered - Added isUniqueSnapshot(..) and isGenericSnapshot(..) in VersionUtil - Added new attribute 'modelVersion' in DependencyTreeTag to get the in-pom version. Did not use the version attribute so as to retain the actual version being browsed. Also updated DependencyTree - Updated the ff. pages for the version to be displayed: artifactInfo.jspf, showArtifact.jsp, dependencyTree.jsp and artifactDecorator.jsp - Updated the version in SearchResultHit git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@558795 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/maven/archiva/indexer/search/SearchResultHit.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'archiva-base/archiva-indexer') diff --git a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java index 002d02249..8b207fde8 100644 --- a/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java +++ b/archiva-base/archiva-indexer/src/main/java/org/apache/maven/archiva/indexer/search/SearchResultHit.java @@ -90,8 +90,8 @@ public class SearchResultHit public void addArtifact( ArchivaArtifact artifact ) { this.artifacts.add( artifact ); - - String ver = artifact.getBaseVersion(); + + String ver = artifact.getVersion(); if ( !this.versions.contains( ver ) ) { @@ -110,7 +110,7 @@ public class SearchResultHit if ( StringUtils.isBlank( this.version ) ) { - this.version = ver; + this.version = ver; } } -- cgit v1.2.3