[sling-slingfeature-maven-plugin] branch master updated: Rename osgifeature to slingfeature in the plugin code

[davidb]

This is an automated email from the ASF dual-hosted git repository.

davidb pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-slingfeature-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 086cbb8  Rename osgifeature to slingfeature in the plugin code
086cbb8 is described below

commit 086cbb858be59b4820c4bd43dcafa7cddb587f62
Author: David Bosschaert <bossc...@adobe.com>
AuthorDate: Tue Jul 3 11:35:14 2018 +0100

    Rename osgifeature to slingfeature in the plugin code
---
 .../feature/maven/mojos/AbstractFeatureMojo.java   |  2 +-
 .../mojos/DependencyLifecycleParticipant.java      |  2 +-
 src/main/resources/META-INF/plexus/components.xml  | 29 ++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git 
a/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java 
b/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
index 7c7e2ea..13912b3 100644
--- 
a/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
+++ 
b/src/main/java/org/apache/sling/feature/maven/mojos/AbstractFeatureMojo.java
@@ -111,6 +111,6 @@ public abstract class AbstractFeatureMojo extends 
AbstractMojo {
     protected MavenProjectHelper projectHelper;
 
     protected File getTmpDir() {
-        return new File(this.project.getBuild().getDirectory(), 
"osgifeature-tmp");
+        return new File(this.project.getBuild().getDirectory(), 
"slingfeature-tmp");
     }
 }
diff --git 
a/src/main/java/org/apache/sling/feature/maven/mojos/DependencyLifecycleParticipant.java
 
b/src/main/java/org/apache/sling/feature/maven/mojos/DependencyLifecycleParticipant.java
index ba53623..7b23920 100644
--- 
a/src/main/java/org/apache/sling/feature/maven/mojos/DependencyLifecycleParticipant.java
+++ 
b/src/main/java/org/apache/sling/feature/maven/mojos/DependencyLifecycleParticipant.java
@@ -42,7 +42,7 @@ public class DependencyLifecycleParticipant extends 
AbstractMavenLifecyclePartic
     /**
      * The plugin ID consists of <code>groupId:artifactId</code>, see {@link 
Plugin#constructKey(String, String)}
      */
-    private static final String PLUGIN_ID = 
"org.apache.sling:osgifeature-maven-plugin";
+    private static final String PLUGIN_ID = 
"org.apache.sling:slingfeature-maven-plugin";
 
     @Requirement
     private Logger logger;
diff --git a/src/main/resources/META-INF/plexus/components.xml 
b/src/main/resources/META-INF/plexus/components.xml
index 6933d3b..4c32bad 100644
--- a/src/main/resources/META-INF/plexus/components.xml
+++ b/src/main/resources/META-INF/plexus/components.xml
@@ -20,6 +20,23 @@
   <components>
     <component>
       <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>slingfeature</role-hint>
+      
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <phases>
+              
<package>org.apache.sling:slingstart-maven-plugin:attach-slingfeature</package>
+              
<install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              
<deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+            </phases>
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
       <role-hint>osgifeature</role-hint>
       
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
       <configuration>
@@ -77,6 +94,18 @@
     </component>
     <component>
       <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>slingfeature</role-hint>
+      
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <type>slingfeature</type>
+        <includesDependencies>false</includesDependencies>
+        <language>json</language>
+        <extension>json</extension>
+        <addedToClasspath>false</addedToClasspath>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
       <role-hint>osgiapp</role-hint>
       
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
       <configuration>