Repository: archiva Updated Branches: refs/heads/master 54b223670 -> ac641f48d
Add pom properties to ProjectVersionMetadata Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/b1838d2e Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/b1838d2e Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/b1838d2e Branch: refs/heads/master Commit: b1838d2e3ce5cc3ac5406b6432192ce0200306af Parents: 5d29c9f Author: Carlos Sanchez <[email protected]> Authored: Fri Nov 21 20:12:53 2014 +0100 Committer: Carlos Sanchez <[email protected]> Committed: Fri Nov 21 20:25:26 2014 +0100 ---------------------------------------------------------------------- .../metadata/model/ProjectVersionMetadata.java | 22 ++++++++++++++++++++ .../storage/maven2/Maven2RepositoryStorage.java | 1 + .../Maven2RepositoryMetadataResolverTest.java | 3 +++ 3 files changed, 26 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/b1838d2e/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java ---------------------------------------------------------------------- diff --git a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java index 1ff3401..967eb0d 100644 --- a/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java +++ b/archiva-modules/metadata/metadata-model/src/main/java/org/apache/archiva/metadata/model/ProjectVersionMetadata.java @@ -20,8 +20,12 @@ package org.apache.archiva.metadata.model; */ 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 class ProjectVersionMetadata 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; http://git-wip-us.apache.org/repos/asf/archiva/blob/b1838d2e/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java index 44d2947..a75d007 100644 --- a/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java +++ b/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryStorage.java @@ -372,6 +372,7 @@ public class Maven2RepositoryStorage 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() ); http://git-wip-us.apache.org/repos/asf/archiva/blob/b1838d2e/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java ---------------------------------------------------------------------- diff --git a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java index f23e2d6..3f3b8e2 100644 --- a/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java +++ b/archiva-modules/plugins/maven2-repository/src/test/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryMetadataResolverTest.java @@ -209,6 +209,9 @@ public class Maven2RepositoryMetadataResolverTest 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
![http://www.apache.org/images/asf_logo_wide.gif"](http://www.apache.org/images/asf_logo_wide.gif"){kind=link}