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

davidb pushed a commit to branch flatcp
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/flatcp by this push:
     new e7e01357 Parameterize
e7e01357 is described below

commit e7e013577ea872e81d76732b12bba9cb71bde956
Author: David Bosschaert <[email protected]>
AuthorDate: Thu Sep 12 14:10:53 2024 +0100

    Parameterize
---
 sling-mini/pom.xml | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/sling-mini/pom.xml b/sling-mini/pom.xml
index d9edead0..fde6e1b2 100644
--- a/sling-mini/pom.xml
+++ b/sling-mini/pom.xml
@@ -218,37 +218,18 @@
                 <artifactId>exec-maven-plugin</artifactId>
                 <version>3.1.0</version>
                 <executions>
-                    <!-- run with  mvn exec:exec@run-launcher -->
-                    <!--
+                    <!-- run with  mvn exec:exec, configuration is below the 
<executions> section -->
                     <execution>
                         <id>run-launcher</id>
                         <goals>
                             <goal>exec</goal>
                         </goals>
-                        <configuration>
-                            
<executable>${basedir}/target/org.apache.sling.feature.launcher-${launcher.version}/bin/launcher</executable>
-                            <arguments>
-                                <argument>-f</argument>
-                                
<argument>mvn:${project.groupId}/${project.artifactId}/${project.version}/slingosgifeature/${feature}</argument>
-                                <argument>-p</argument>
-                                <argument>target/launcher</argument>
-                                <argument>-c</argument>
-                                <argument>target/launcher/cache</argument>
-                                <argument>-D</argument>
-                                <argument>SOURCE_DIR=${sourceDir}</argument>
-                                <argument>-D</argument>
-                                <argument>TARGET_DIR=${targetDir}</argument>
-                            </arguments>
-                        </configuration>
                     </execution>
-                    -->
                     <execution>
                         <goals>
                             <goal>exec</goal>
                         </goals>
                         <phase>package</phase>
-                    </execution>
-                </executions>
                         <configuration>
                             <executable>java</executable>
                             <arguments>
@@ -259,12 +240,30 @@
                                 <argument>-u</argument>
                                 
<argument>file:${build.directory}/artifacts</argument>
                                 <argument>-f</argument>
-                                
<argument>file:${build.directory}/slingfeature-tmp/feature-fullwebapp.json</argument>
+                                
<argument>file:${build.directory}/slingfeature-tmp/feature-${feature}.json</argument>
                             </arguments>
                             <inheritIo>true</inheritIo>
                             <addOutputToClasspath>false</addOutputToClasspath>
                             
<workingDirectory>${build.directory}</workingDirectory>
                         </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- This is the configuration for the exec:exec goal -->
+                    
<executable>${basedir}/target/org.apache.sling.feature.launcher-${launcher.version}/bin/launcher</executable>
+                    <arguments>
+                        <argument>-f</argument>
+                        
<argument>mvn:${project.groupId}/${project.artifactId}/${project.version}/slingosgifeature/${feature}</argument>
+                        <argument>-p</argument>
+                        <argument>target/launcher</argument>
+                        <argument>-c</argument>
+                        <argument>target/launcher/cache</argument>
+                        <argument>-D</argument>
+                        <argument>SOURCE_DIR=${sourceDir}</argument>
+                        <argument>-D</argument>
+                        <argument>TARGET_DIR=${targetDir}</argument>
+                    </arguments>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Reply via email to