Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-06 01:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'project-properties'

Browse Source
This commit is contained in:
Carlos Sanchez 2014-11-24 09:15:00 +01:00
commit ac641f48d9
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java
View File

@ -20,8 +20,12 @@
*/
import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
@XmlRootElement( name = "projectVersionMetadata" )
public class ProjectVersionMetadata
@ -52,6 +56,8 @@ public class ProjectVersionMetadata
private List<Dependency> dependencies = new ArrayList<>();
private Map<String, String> properties = new HashMap<String, String>();
private boolean incomplete;
public String getId()
@ -184,6 +190,22 @@ public void addDependency( Dependency dependency )
this.dependencies.add( dependency );
}
public Map<String, String> getProperties()
{
return properties;
}
public void setProperties( Map<String, String> properties )
{
this.properties = properties;
}
@SuppressWarnings( { "unchecked", "rawtypes" } )
public void setProperties( Properties properties )
{
setProperties( new HashMap<String, String>((Map) properties ) );
}
public boolean isIncomplete()
{
return incomplete;

1
archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java
View File

@ -372,6 +372,7 @@ public ProjectVersionMetadata readProjectVersionMetadata( ReadMetadataRequest re
metadata.setOrganization( convertOrganization( model.getOrganization() ) );
metadata.setScm( convertScm( model.getScm() ) );
metadata.setUrl( model.getUrl() );
metadata.setProperties( model.getProperties() );
MavenProjectFacet facet = new MavenProjectFacet();
facet.setGroupId( model.getGroupId() != null ? model.getGroupId() : model.getParent().getGroupId() );

3
archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java
View File

@ -209,6 +209,9 @@ public void testGetProjectVersionMetadata()
assertDependency( dependencies.get( 7 ), "junit", "junit", "3.8.1", "test" );
assertDependency( dependencies.get( 8 ), "easymock", "easymock", "1.2_Java1.3", "test" );
assertDependency( dependencies.get( 9 ), "easymock", "easymockclassextension", "1.2", "test" );
assertEquals( 8, metadata.getProperties().size() );
assertEquals( "http://www.apache.org/images/asf_logo_wide.gif", metadata.getProperties().get("organization.logo") );
}
@Test