incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r915282 - in /sling/trunk: contrib/launchpad/testing/pom.xml launchpad/testing/pom.xml parent/pom.xml samples/inplace-integration-test/pom.xml
Date Tue, 23 Feb 2010 11:08:17 GMT
Author: bdelacretaz
Date: Tue Feb 23 11:08:17 2010
New Revision: 915282

URL: http://svn.apache.org/viewvc?rev=915282&view=rev
Log:
SLING-1404 - use build-helper-maven-plugin to select ports in all modules that do integration
testing

Modified:
    sling/trunk/contrib/launchpad/testing/pom.xml
    sling/trunk/launchpad/testing/pom.xml
    sling/trunk/parent/pom.xml
    sling/trunk/samples/inplace-integration-test/pom.xml

Modified: sling/trunk/contrib/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/launchpad/testing/pom.xml?rev=915282&r1=915281&r2=915282&view=diff
==============================================================================
--- sling/trunk/contrib/launchpad/testing/pom.xml (original)
+++ sling/trunk/contrib/launchpad/testing/pom.xml Tue Feb 23 11:08:17 2010
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.sling</groupId>
         <artifactId>sling</artifactId>
-        <version>8</version>
+        <version>9-SNAPSHOT</version>
         <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
@@ -52,11 +52,6 @@
     </scm>
 
     <properties>
-        <!--
-            Jetty default port (override with -D)
-        -->
-        <http.port>8888</http.port>
-        
         <!-- path suffix for HTTP access to Sling -->
         <http.base.path />
 
@@ -113,6 +108,24 @@
                 </configuration>
             </plugin>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>reserve-network-port</id>
+                        <goals>
+                            <goal>reserve-network-port</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <portNames>
+                                <portName>http.port</portName>
+                            </portNames>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>maven-jetty-plugin</artifactId>
                 <configuration>

Modified: sling/trunk/launchpad/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/testing/pom.xml?rev=915282&r1=915281&r2=915282&view=diff
==============================================================================
--- sling/trunk/launchpad/testing/pom.xml (original)
+++ sling/trunk/launchpad/testing/pom.xml Tue Feb 23 11:08:17 2010
@@ -101,7 +101,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.5</version>
                 <executions>
                     <execution>
                         <id>reserve-network-port</id>

Modified: sling/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/parent/pom.xml?rev=915282&r1=915281&r2=915282&view=diff
==============================================================================
--- sling/trunk/parent/pom.xml (original)
+++ sling/trunk/parent/pom.xml Tue Feb 23 11:08:17 2010
@@ -310,6 +310,11 @@
                         </signature>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.5</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

Modified: sling/trunk/samples/inplace-integration-test/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/samples/inplace-integration-test/pom.xml?rev=915282&r1=915281&r2=915282&view=diff
==============================================================================
--- sling/trunk/samples/inplace-integration-test/pom.xml (original)
+++ sling/trunk/samples/inplace-integration-test/pom.xml Tue Feb 23 11:08:17 2010
@@ -27,7 +27,6 @@
     <name>Sample In-Place Integration Test</name>
     <description>Sling Integration Test Demo Project</description>
     <properties>
-        <http.port>8888</http.port>
         <jetty.scan.interval.seconds>0</jetty.scan.interval.seconds>
         <jetty.sling.home>target/sling</jetty.sling.home>
         <test.host>localhost</test.host>
@@ -45,6 +44,25 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.5</version>
+                <executions>
+                    <execution>
+                        <id>reserve-network-port</id>
+                        <goals>
+                            <goal>reserve-network-port</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <portNames>
+                                <portName>http.port</portName>
+                            </portNames>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <version>2.0.1</version>



Mime
View raw message