You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by pa...@apache.org on 2019/06/13 11:06:33 UTC
[sling-slingstart-maven-plugin] branch master updated: SLING-8488:
delete target/processed if present in the DependencyLifecycleParticipant to
make sure we are not running on stale models
This is an automated email from the ASF dual-hosted git repository.
pauls 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 3c697e5 SLING-8488: delete target/processed if present in the DependencyLifecycleParticipant to make sure we are not running on stale models
3c697e5 is described below
commit 3c697e5ffde911a111546ab9080ef5fa8a89ca66
Author: Karl Pauls <ka...@gmail.com>
AuthorDate: Thu Jun 13 13:06:25 2019 +0200
SLING-8488: delete target/processed if present in the DependencyLifecycleParticipant to make sure we are not running on stale models
---
pom.xml | 8 ++++----
.../sling/maven/slingstart/DependencyLifecycleParticipant.java | 8 ++++++++
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index f9dc051..5ce0be1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,22 +155,22 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.analyser</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.modelconverter</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.feature.io</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
diff --git a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
index 72db714..70a690a 100644
--- a/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
+++ b/src/main/java/org/apache/sling/maven/slingstart/DependencyLifecycleParticipant.java
@@ -16,10 +16,12 @@
*/
package org.apache.sling.maven.slingstart;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
+import org.apache.commons.io.FileUtils;
import org.apache.maven.AbstractMavenLifecycleParticipant;
import org.apache.maven.MavenExecutionException;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -91,6 +93,12 @@ public class DependencyLifecycleParticipant extends AbstractMavenLifecyclePartic
info.plugin = plugin;
info.project = project;
env.modelProjects.put(project.getGroupId() + ":" + project.getArtifactId(), info);
+ File processed = new File(project.getBuild().getDirectory(), "features/processed");
+ try {
+ FileUtils.forceDelete(processed);
+ } catch (IOException e) {
+ throw new MavenExecutionException("Failed to delete: " + processed.getPath(), e);
+ }
} else {
logger.debug("Skipping project " + project + " leveraging " + PLUGIN_ID +" in another version "+ project.getVersion() + ".");
}