You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/04/21 13:01:39 UTC

svn commit: r650096 - in /geronimo/genesis/branches/genesis-1.x: config/pom.xml config/project-config/pom.xml pom.xml

Author: jdillon
Date: Mon Apr 21 04:01:26 2008
New Revision: 650096

URL: http://svn.apache.org/viewvc?rev=650096&view=rev
Log:
More plugin updates

Modified:
    geronimo/genesis/branches/genesis-1.x/config/pom.xml
    geronimo/genesis/branches/genesis-1.x/config/project-config/pom.xml
    geronimo/genesis/branches/genesis-1.x/pom.xml

Modified: geronimo/genesis/branches/genesis-1.x/config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/branches/genesis-1.x/config/pom.xml?rev=650096&r1=650095&r2=650096&view=diff
==============================================================================
--- geronimo/genesis/branches/genesis-1.x/config/pom.xml (original)
+++ geronimo/genesis/branches/genesis-1.x/config/pom.xml Mon Apr 21 04:01:26 2008
@@ -41,7 +41,6 @@
     </modules>
     
     <build>
-
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -51,6 +50,7 @@
                 </plugin>
             </plugins>
         </pluginManagement>
+        
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>

Modified: geronimo/genesis/branches/genesis-1.x/config/project-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/branches/genesis-1.x/config/project-config/pom.xml?rev=650096&r1=650095&r2=650096&view=diff
==============================================================================
--- geronimo/genesis/branches/genesis-1.x/config/project-config/pom.xml (original)
+++ geronimo/genesis/branches/genesis-1.x/config/project-config/pom.xml Mon Apr 21 04:01:26 2008
@@ -109,31 +109,17 @@
         <url>http://issues.apache.org/jira/browse/GERONIMO</url>
     </issueManagement>
     
-    <ciManagement>
-        <system>continuum</system>
-        <notifiers>
-            <notifier>
-                <type>mail</type>
-                <sendOnError />
-                <sendOnFailure />
-                <address>dev@geronimo.apache.org</address>
-            </notifier>
-        </notifiers>
-    </ciManagement>
-    
     <dependencyManagement>
         <dependencies>
-            
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>3.8.1</version>
             </dependency>
-
         </dependencies>
     </dependencyManagement>
     
-    <dependencies>        
+    <dependencies>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -144,22 +130,6 @@
     <build>
         <defaultGoal>install</defaultGoal>
         
-        <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
-        <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
-        
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-            </resource>
-        </resources>
-
-        <testResources>
-            <testResource>
-                <directory>${pom.basedir}/src/test/resources</directory>
-            </testResource>
-            
-        </testResources>
-        
         <extensions>
             <extension>
                 <groupId>org.apache.maven.wagon</groupId>
@@ -167,7 +137,7 @@
                 <version>1.0-beta-2</version>
             </extension>
         </extensions>
-            
+        
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -200,13 +170,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
+                    <version>2.0</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.5.1</version>
                 </plugin>
 
                 <plugin>
@@ -218,13 +188,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>2.2</version>
                 </plugin>
 
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-one-plugin</artifactId>
-                    <version>1.1</version>
+                    <version>1.2</version>
                 </plugin>
 
                 <plugin>
@@ -242,10 +212,11 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3</version>
+                    <version>2.4.2</version>
                     <configuration>
+                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         <forkMode>once</forkMode>
-                        <argLine>-enableassertions -Dgeronimo.bootstrap.logging.enabled=false -Dlog4j.configuration=org/apache/geronimo/test-log4j.properties</argLine>
+                        <argLine>-enableassertions</argLine>
                         <workingDirectory>${project.build.directory}</workingDirectory>
                         
                         <!-- Override the default, do not accept Test* as test classes -->
@@ -425,7 +396,6 @@
     <profiles>
         <profile>
             <id>tools</id>
-
             <build>
                 <plugins>
                     <plugin>
@@ -442,7 +412,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-report-plugin</artifactId>
-                <version>2.3</version>
+                <version>2.4.2</version>
             </plugin>
             
             <plugin>
@@ -463,23 +433,8 @@
                     -->
                     <linksource>true</linksource>
                     <links>
-                        <!-- J2SE -->
                         <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                        <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
-                        <link>http://java.sun.com/j2se/1.3/docs/api/</link>
-                        
-                        <!-- JavaEE -->
                         <link>http://java.sun.com/javaee/5/docs/api/</link>
-                        <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
-                        <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
-                        
-                        <!-- Libraries -->
-                        <link>http://jakarta.apache.org/commons/collections/apidocs</link>
-                        <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
-                        <link>http://www.junit.org/junit/javadoc/</link>
-                        <link>http://logging.apache.org/log4j/docs/api/</link>
-                        <link>http://jakarta.apache.org/regexp/apidocs/</link>
-                        <link>http://jakarta.apache.org/velocity/api/</link>
                     </links>
                 </configuration>
             </plugin>
@@ -493,7 +448,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>2.2</version>
+                <version>2.3</version>
             </plugin>
             
             <plugin>

Modified: geronimo/genesis/branches/genesis-1.x/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/branches/genesis-1.x/pom.xml?rev=650096&r1=650095&r2=650096&view=diff
==============================================================================
--- geronimo/genesis/branches/genesis-1.x/pom.xml (original)
+++ geronimo/genesis/branches/genesis-1.x/pom.xml Mon Apr 21 04:01:26 2008
@@ -162,7 +162,6 @@
                         <excludeSubProjects>false</excludeSubProjects>
                     </configuration>
                 </plugin>
-
             </plugins>
         </pluginManagement>
 
@@ -200,7 +199,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-stage-plugin</artifactId>
             </plugin>
-
         </plugins>
     </build>