[sling-slingstart-maven-plugin] branch master updated: Move feature model dependency to 0.1.0-SNAPSHOT

[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-slingstart-maven-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 0029bb4  Move feature model dependency to 0.1.0-SNAPSHOT
0029bb4 is described below

commit 0029bb46cc4f01f1626ffaadab31e10b22fcb27a
Author: David Bosschaert <david.bosscha...@gmail.com>
AuthorDate: Fri May 4 08:18:38 2018 +0100

    Move feature model dependency to 0.1.0-SNAPSHOT
---
 pom.xml                                                | 13 ++++---------
 .../sling/maven/slingstart/FeatureModelConverter.java  | 18 +++++++++---------
 .../sling/maven/slingstart/GenerateResourcesMojo.java  | 14 +++++++-------
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8e8f520..17209a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,22 +162,17 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.feature.analyser</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.feature.modelconverter</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.feature.io</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.feature.resolver</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
@@ -312,7 +307,7 @@
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.feature</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>0.1.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git 
a/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java 
b/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
index e39ad45..177773c 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
@@ -16,24 +16,24 @@
  */
 package org.apache.sling.maven.slingstart;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.maven.MavenExecutionException;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.project.MavenProject;
 import org.apache.sling.feature.io.ArtifactManager;
 import org.apache.sling.feature.io.ArtifactManagerConfig;
-import org.apache.sling.feature.modelconverter.impl.FeatureToProvisioning;
+import org.apache.sling.feature.modelconverter.FeatureToProvisioning;
 import org.apache.sling.maven.slingstart.ModelPreprocessor.Environment;
 import org.apache.sling.maven.slingstart.ModelPreprocessor.ProjectInfo;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
 public class FeatureModelConverter {
     static final String BUILD_DIR = "provisioning/converted";
 
diff --git 
a/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java 
b/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
index b0e4c47..fc8c4b6 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
@@ -16,12 +16,6 @@
  */
 package org.apache.sling.maven.slingstart;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -35,9 +29,15 @@ import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 import org.apache.sling.feature.io.ArtifactManager;
 import org.apache.sling.feature.io.ArtifactManagerConfig;
-import org.apache.sling.feature.modelconverter.impl.FeatureToProvisioning;
+import org.apache.sling.feature.modelconverter.FeatureToProvisioning;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 @Mojo(
         name = "generate-resources",
         defaultPhase = LifecyclePhase.GENERATE_RESOURCES,

-- 
To stop receiving notification emails like this one, please contact
dav...@apache.org.