You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2021/11/12 16:49:57 UTC
[sling-org-apache-sling-starter] 03/04: SLING-9638 - Update Starter
Docker image to be based on the feature model
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch issue/SLING-9638
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter.git
commit 224757735f87270770de3118d1184293a499dc4c
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Nov 12 16:53:01 2021 +0100
SLING-9638 - Update Starter Docker image to be based on the feature model
Move antrun warning next to the plugin execution that it 'guards'.
---
pom.xml | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index bcf9272..5c86b79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,22 +57,6 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target if="${docker.skip}">
- <echo>WARNING: docker.skip is ${docker.skip}, Docker-based tests will not be executed.</echo>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>ianal-maven-plugin</artifactId>
<executions>
@@ -216,6 +200,22 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target if="${docker.skip}">
+ <echo>WARNING: docker.skip is ${docker.skip}, Docker-based tests will not be executed.</echo>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!--
Start a MongoDB container for the corresponding tests.
Must be declared before the feature-launcher-maven-plugin