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 2013/07/09 10:36:30 UTC

svn commit: r1501133 - /sling/trunk/bundles/extensions/event/pom.xml

Author: rombert
Date: Tue Jul  9 08:36:30 2013
New Revision: 1501133

URL: http://svn.apache.org/r1501133
Log:
SLING-2954 - Event ITs spuriosly fail on Jenkins

Assign a random port for the OSGi HTTP service when running Event ITs to
prevent collisions.

Modified:
    sling/trunk/bundles/extensions/event/pom.xml

Modified: sling/trunk/bundles/extensions/event/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/pom.xml?rev=1501133&r1=1501132&r2=1501133&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/pom.xml (original)
+++ sling/trunk/bundles/extensions/event/pom.xml Tue Jul  9 08:36:30 2013
@@ -106,6 +106,10 @@
                             <name>project.bundle.file</name>
                             <value>${bundle.file.name}</value>
                         </property>
+                        <property>
+                            <name>org.osgi.service.http.port</name>
+                            <value>${http.port}</value>
+                        </property>
                     </systemProperties>
                     <argLine>
                         -Xmx1024m -XX:MaxPermSize=368m
@@ -116,6 +120,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>pre-integration-test</phase>
+                        <configuration>
+                            <portNames>
+                                <portName>http.port</portName>
+                            </portNames>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>            
+            <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>
                     <filesets>