This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva.git
commit cbfd3f256f0efd67f56f2654ad105c42f1e27dcf Author: Martin Stockhammer <[email protected]> AuthorDate: Wed Dec 30 18:36:42 2020 +0100 Fixing jackson error for properties attribute --- .../repository/maven/metadata/storage/Maven2RepositoryStorage.java | 2 +- .../org/apache/archiva/metadata/model/ProjectVersionMetadata.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java index 32dd9e4..7ebbe93 100644 --- a/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java +++ b/archiva-modules/archiva-maven/archiva-maven-repository/src/main/java/org/apache/archiva/repository/maven/metadata/storage/Maven2RepositoryStorage.java @@ -355,7 +355,7 @@ public class Maven2RepositoryStorage metadata.setOrganization(convertOrganization(model.getOrganization())); metadata.setScm(convertScm(model.getScm())); metadata.setUrl(model.getUrl()); - metadata.setProperties(model.getProperties()); + metadata.setProperties( new HashMap<String, String>( (Map) model.getProperties( ) ) ); MavenProjectFacet facet = new MavenProjectFacet(); facet.setGroupId(model.getGroupId() != null ? model.getGroupId() : model.getParent().getGroupId()); 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 1183532..c6b749d 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 @@ -199,12 +199,6 @@ public class ProjectVersionMetadata this.properties = properties; } - @SuppressWarnings( { "unchecked", "rawtypes" } ) - public void setProperties( Properties properties ) - { - setProperties( new HashMap<String, String>((Map) properties ) ); - } - public boolean isIncomplete() { return incomplete;
