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 b5536ced Move to Model Converter 0.1.1-SNAPSHOT
b5536ced is described below
commit b5536cedd275c196347cddc209326485986d1865
Author: David Bosschaert <[email protected]>
AuthorDate: Wed May 16 16:17:38 2018 +0200
Move to Model Converter 0.1.1-SNAPSHOT
---
pom.xml | 2 +-
.../java/org/apache/sling/maven/slingstart/FeatureModelConverter.java | 4 ++--
.../java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7fd50c6..e9436bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -167,7 +167,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.modelconverter</artifactId>
- <version>0.1.0</version>
+ <version>0.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
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 177773c..0e84fec 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/FeatureModelConverter.java
@@ -64,8 +64,8 @@ public class FeatureModelConverter {
try {
ArtifactManager am = getArtifactManager(project, session);
for (File f : files) {
- String fn = targetDir.getAbsolutePath() + "/" + f.getName() +
".txt";
- FeatureToProvisioning.convert(f, fn, am);
+ File genFile = new File(targetDir, f.getName() + ".txt");
+ FeatureToProvisioning.convert(f, genFile, am);
}
} catch (Exception e) {
throw new MavenExecutionException("Cannot convert feature files to
provisioning model", e);
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 fc8c4b6..81629c4 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/GenerateResourcesMojo.java
@@ -79,8 +79,8 @@ public class GenerateResourcesMojo extends
AbstractSlingStartMojo {
ArtifactManager am = getArtifactManager();
List<File> files = Arrays.asList(featureFiles);
for (File f : files) {
- String fn = targetDir.getAbsolutePath() + "/" + f.getName() +
".txt";
- FeatureToProvisioning.convert(f, fn, am);
+ File genFile = new File(targetDir, f.getName() + ".txt");
+ FeatureToProvisioning.convert(f, genFile, am);
}
} catch (Exception e) {
throw new MojoExecutionException("Cannot convert feature files to
provisioning model", e);
--
To stop receiving notification emails like this one, please contact
[email protected].
