sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1553570 - in /sis/branches/JDK7: application/sis-webapp/pom.xml pom.xml
Date Thu, 26 Dec 2013 20:03:18 GMT
Author: desruisseaux
Date: Thu Dec 26 20:03:18 2013
New Revision: 1553570

URL: http://svn.apache.org/r1553570
Log:
Added a "stop jetty" execution after tests in the hope to improve build stability.

Modified:
    sis/branches/JDK7/application/sis-webapp/pom.xml
    sis/branches/JDK7/pom.xml

Modified: sis/branches/JDK7/application/sis-webapp/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-webapp/pom.xml?rev=1553570&r1=1553569&r2=1553570&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-webapp/pom.xml (original)
+++ sis/branches/JDK7/application/sis-webapp/pom.xml Thu Dec 26 20:03:18 2013
@@ -70,6 +70,7 @@
             <configuration>
               <portNames>
                 <portName>jettyPort</portName>
+                <portName>stopPort</portName>
               </portNames>
             </configuration>
           </execution>
@@ -79,7 +80,8 @@
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <configuration>
-          <webApp>${basedir}/target/sis-webapp-${project.version}.war</webApp>
+          <stopKey>stopJetty</stopKey>
+          <stopPort>${stopPort}</stopPort>
         </configuration>
         <executions>
           <execution>
@@ -108,6 +110,13 @@
               </systemProperties>
             </configuration>
           </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
     </plugins>

Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1553570&r1=1553569&r2=1553570&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Thu Dec 26 20:03:18 2013
@@ -590,7 +590,7 @@ Apache SIS is a free software, Java lang
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
-          <version>8.0.1.v20110908</version>
+          <version>8.1.14.v20131031</version>
         </plugin>
       </plugins>
     </pluginManagement>



Mime
View raw message