Branch: refs/heads/2.0 Home: https://github.com/forge/core Commit: bb6083648af101efec2a6fc0951dd07d6a0602ec https://github.com/forge/core/commit/bb6083648af101efec2a6fc0951dd07d6a06... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com&gt; Date: 2013-07-31 (Wed, 31 Jul 2013) Changed paths: M javaee/impl/src/main/java/org/jboss/forge/addon/javaee/cdi/CDIFacetImpl.java M javaee/impl/src/main/java/org/jboss/forge/addon/javaee/jpa/PersistenceFacetImpl.java M javaee/impl/src/main/java/org/jboss/forge/addon/javaee/servlet/ServletFacetImpl.java M maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenResourceFacet.java M maven/impl-projects/src/main/java/org/jboss/forge/addon/maven/projects/facets/MavenWebResourceFacet.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenProjectLocatorTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/MavenWebResourceFacetTest.java M maven/tests/src/test/java/org/jboss/forge/addon/maven/projects/facets/MavenResourceFacetTest.java M projects/addon/pom.xml R projects/api/src/main/java/org/jboss/forge/addon/projects/facets/ResourceFacet.java A projects/api/src/main/java/org/jboss/forge/addon/projects/facets/ResourcesFacet.java R projects/api/src/main/java/org/jboss/forge/addon/projects/facets/WebResourceFacet.java A projects/api/src/main/java/org/jboss/forge/addon/projects/facets/WebResourcesFacet.java Log Message: ----------- ResourceFacet -> ResourcesFacet to avoid conflicts with Resources API. Convert addon should not be exported from projects addon