diff --git a/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenDependencyFacet.java b/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenDependencyFacet.java index 7137095189..d891d8dd1b 100644 --- a/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenDependencyFacet.java +++ b/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenDependencyFacet.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Properties; import javax.enterprise.context.Dependent; import javax.inject.Inject; @@ -341,18 +340,6 @@ public Dependency resolveProperties(final Dependency dependency) return builder; } - @Override - public String removeProperty(final String name) - { - MavenFacet maven = getFaceted().getFacet(MavenFacet.class); - Model pom = maven.getPOM(); - - Properties properties = pom.getProperties(); - String result = (String) properties.remove(name); - maven.setPOM(pom); - return result; - } - @Override public List resolveAvailableVersions(final String gavs) { diff --git a/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenMetadataFacet.java b/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenMetadataFacet.java index 238e5a1f86..6eda82f3ee 100644 --- a/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenMetadataFacet.java +++ b/maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenMetadataFacet.java @@ -168,4 +168,17 @@ public String getEffectiveProperty(final String name) { return getEffectiveProperties().get(name); } + + @Override + public String removeProperty(final String name) + { + MavenFacet maven = getFaceted().getFacet(MavenFacet.class); + Model pom = maven.getPOM(); + + Properties properties = pom.getProperties(); + String result = (String) properties.remove(name); + maven.setPOM(pom); + return result; + } + } diff --git a/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/DependencyFacet.java b/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/DependencyFacet.java index 69f3e3bf6a..bd89d3c280 100644 --- a/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/DependencyFacet.java +++ b/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/DependencyFacet.java @@ -212,12 +212,6 @@ public interface DependencyFacet extends ProjectFacet */ public void removeManagedDependency(Dependency managedDependency); - /** - * Remove a build property by name. (Build properties, such as ${my.version}, can be used anywhere in a dependency, - * and will be expanded during building to their property value.) - */ - public String removeProperty(String name); - /** * Remove the given {@link DependencyRepository} from the current project. Return true if the repository was removed; * return false otherwise. Return the removed repository, or null if no repository was removed. diff --git a/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/MetadataFacet.java b/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/MetadataFacet.java index 24fa9ab6d9..0b28bb8b01 100644 --- a/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/MetadataFacet.java +++ b/projects/api/src/main/java/org/jboss/forge/addon/projects/facets/MetadataFacet.java @@ -97,5 +97,11 @@ public interface MetadataFacet extends ProjectFacet * during building to the resolved property value. */ public void setProperty(String name, String value); + + /** + * Remove a build property by name. (Build properties, such as ${my.version}, can be used anywhere in a dependency, + * and will be expanded during building to their property value.) + */ + public String removeProperty(String name); }