You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2018/01/23 14:42:23 UTC

[sling-org-apache-sling-scripting-sightly-testing] branch master updated: SLING-7431 - Allow the HTL IT to run against the latest stable launchpad artifact and against the latest snapshot

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

radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-sightly-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new f650f92  SLING-7431 - Allow the HTL IT to run against the latest stable launchpad artifact and against the latest snapshot
f650f92 is described below

commit f650f92b5bbc24a40c3c3e11813b9cd5019ef555
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Tue Jan 23 16:37:38 2018 +0200

    SLING-7431 - Allow the HTL IT to run against the latest stable launchpad artifact and against the latest snapshot
---
 pom.xml                         | 106 +++++++++++++++++++++++++++++++---------
 src/main/provisioning/model.txt |   2 -
 2 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0cbf5ae..97ab47a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,6 +84,39 @@
     </properties>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.sling</groupId>
+                    <artifactId>slingstart-maven-plugin</artifactId>
+                    <version>1.7.16</version>
+                    <extensions>true</extensions>
+                    <executions>
+                        <execution>
+                            <id>start-container</id>
+                            <goals>
+                                <goal>start</goal>
+                                <goal>stop</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <usePomDependencies>true</usePomDependencies>
+                        <servers>
+                            <server>
+                                <port>${http.port}</port>
+                                <controlPort>${sling.control.port}</controlPort>
+                                <runmode>${sling.run.modes}</runmode>
+                                <contextPath>${http.base.path}</contextPath>
+                                <debug>${debug.options}</debug>
+                            </server>
+                        </servers>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+
+
         <plugins>
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
@@ -152,37 +185,64 @@
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>org.apache.sling</groupId>
-                <artifactId>slingstart-maven-plugin</artifactId>
-                <version>1.7.16</version>
-                <extensions>true</extensions>
-                <executions>
-                    <execution>
-                        <id>start-container</id>
-                        <goals>
-                            <goal>start</goal>
-                            <goal>stop</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
                 <configuration>
-                    <usePomDependencies>true</usePomDependencies>
-                    <servers>
-                        <server>
-                            <port>${http.port}</port>
-                            <controlPort>${sling.control.port}</controlPort>
-                            <runmode>${sling.run.modes}</runmode>
-                            <contextPath>${http.base.path}</contextPath>
-                            <debug>${debug.options}</debug>
-                        </server>
-                    </servers>
+                    <releaseProfiles>release</releaseProfiles>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
+
+
     <profiles>
         <profile>
+            <id>snapshot-launchpad</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>slingstart-maven-plugin</artifactId>
+                        <configuration>
+                            <model>
+                                [feature name=sling]
+                                # Dependencies
+                                [artifacts]
+                                org.apache.sling/org.apache.sling.starter/11-SNAPSHOT/slingstart
+                            </model>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>release</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.sling</groupId>
+                        <artifactId>slingstart-maven-plugin</artifactId>
+                        <configuration>
+                            <model>
+                                [feature name=sling]
+                                # Dependencies
+                                [artifacts]
+                                org.apache.sling/org.apache.sling.launchpad/9/slingstart
+                                org.apache.sling/org.apache.sling.scripting.javascript/3.0.4
+                            </model>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
             <!--
                 This profile allows running code coverage reports for the integration tests. In addition, if the other modules have been
                 built from the reactor, their jacoco reports will be merged to produce a report containing coverage information about
diff --git a/src/main/provisioning/model.txt b/src/main/provisioning/model.txt
index 860b694..9f79d80 100644
--- a/src/main/provisioning/model.txt
+++ b/src/main/provisioning/model.txt
@@ -20,8 +20,6 @@
 [feature name=sling]
 # Dependencies
 [artifacts]
-  org.apache.sling/org.apache.sling.starter/10-SNAPSHOT/slingstart
-  org.apache.sling/org.apache.sling.scripting.javascript/3.0.3-SNAPSHOT
   org.apache.sling/org.apache.sling.scripting.sightly.compiler
   org.apache.sling/org.apache.sling.scripting.sightly.compiler.java
   org.apache.sling/org.apache.sling.scripting.sightly

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