continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From och...@apache.org
Subject svn commit: r820151 - in /continuum/trunk: continuum-webapp/pom.xml pom.xml
Date Wed, 30 Sep 2009 02:33:36 GMT
Author: oching
Date: Wed Sep 30 02:33:36 2009
New Revision: 820151

URL: http://svn.apache.org/viewvc?rev=820151&view=rev
Log:
[CONTINUUM-2374] Configure code coverage for 1.3.x branch and trunk
merge from 1.3.x branch -r820139:
o remove war:inplace execution
o remove antrun config for removing struts jars resulting from war:inplace
o add emma plugin config in build and reporting

Modified:
    continuum/trunk/continuum-webapp/pom.xml
    continuum/trunk/pom.xml

Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=820151&r1=820150&r2=820151&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Wed Sep 30 02:33:36 2009
@@ -107,46 +107,7 @@
           <archiveClasses>false</archiveClasses>
           <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**</dependentWarExcludes>
         </configuration>
-        <!-- TODO: would be good to make the jetty plugin aware of these and remove the
below -->
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <goals>
-              <!-- Needed to get the plexus-security war overlay to do its thing before
jetty:run -->
-              <goal>inplace</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
-		
-      <!-- 
-        here an hack to prevent multiple struts core in classpath
-        which prevent struts start 
-        and same struts.xml in the classpath too
-      -->
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>cleanup-struts-jar-in-webapp</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <tasks>
-                <delete includeemptydirs="true">
-                  <fileset dir="${basedir}/src/main/webapp/WEB-INF/lib" includes="struts2*.jar"
/>
-                </delete>
-                <delete includeemptydirs="true">
-                  <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes" includes="struts.xml,struts-security.xml"
/>
-                </delete>
-              </tasks>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>		
-
       <plugin>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-maven-plugin</artifactId>

Modified: continuum/trunk/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/pom.xml?rev=820151&r1=820150&r2=820151&view=diff
==============================================================================
--- continuum/trunk/pom.xml (original)
+++ continuum/trunk/pom.xml Wed Sep 30 02:33:36 2009
@@ -95,7 +95,19 @@
           <targetJdk>1.5</targetJdk>
         </configuration>
       </plugin>
-    </plugins>
+      <plugin>      
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>emma-maven-plugin</artifactId>
+        <version>1.0-alpha-2</version>
+        <inherited>true</inherited>          
+      </plugin>
+      <plugin> 
+        <groupId>org.apache.maven.plugins</groupId> 
+        <artifactId>maven-surefire-report-plugin</artifactId> 
+        <version>2.4.3</version>
+        <inherited>true</inherited>
+      </plugin>    
+    </plugins> 
   </reporting>
   <build>
     <pluginManagement>
@@ -217,6 +229,12 @@
             </manifestEntries>
           </archive>
         </configuration>
+      </plugin>           
+      <plugin>      
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>emma-maven-plugin</artifactId>
+        <version>1.0-alpha-2</version>
+        <inherited>true</inherited>          
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>



Mime
View raw message