You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dw...@apache.org on 2008/09/02 17:21:58 UTC

svn commit: r691275 - in /geronimo/server/branches/2.1: buildsupport/car-maven-plugin/pom.xml buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java pom.xml

Author: dwoods
Date: Tue Sep  2 08:21:58 2008
New Revision: 691275

URL: http://svn.apache.org/viewvc?rev=691275&view=rev
Log:
GERONIMO-4272 Upgrade to geronimo-javamail_1.4_mail-1.6

Modified:
    geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml
    geronimo/server/branches/2.1/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml?rev=691275&r1=691274&r2=691275&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/buildsupport/car-maven-plugin/pom.xml Tue Sep  2 08:21:58 2008
@@ -48,10 +48,17 @@
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         </dependency>
+
         <dependency>
             <groupId>woodstox</groupId>
             <artifactId>wstx-asl</artifactId>

Modified: geronimo/server/branches/2.1/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java?rev=691275&r1=691274&r2=691275&view=diff
==============================================================================
--- geronimo/server/branches/2.1/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java (original)
+++ geronimo/server/branches/2.1/buildsupport/car-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/car/PackageMojo.java Tue Sep  2 08:21:58 2008
@@ -58,7 +58,7 @@
  * Build a Geronimo Configuration using the local Maven infrastructure.
  *
  * @goal package
- * @requiresDependencyResolution runtime
+ * @requiresDependencyResolution compile
  *
  * @version $Rev$ $Date$
  */

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=691275&r1=691274&r2=691275&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Tue Sep  2 08:21:58 2008
@@ -176,7 +176,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.6-SNAPSHOT</version>
+                <version>1.6</version>
             </dependency>
 
             <dependency>