Return-Path: 
 <scm-return-29526-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 18765 invoked from network); 24 Jun 2008 18:33:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 24 Jun 2008 18:33:00 -0000
Received: (qmail 52314 invoked by uid 500); 24 Jun 2008 18:33:01 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 52176 invoked by uid 500); 24 Jun 2008 18:33:01 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 52167 invoked by uid 99); 24 Jun 2008 18:33:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2008 11:33:01 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Jun 2008 18:32:19 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 21F9A2388A02; Tue, 24 Jun 2008 11:32:09 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r671287 - in /geronimo/server/branches/2.1:
 framework/modules/geronimo-plugin/pom.xml pom.xml
Date: Tue, 24 Jun 2008 18:32:08 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080624183209.21F9A2388A02@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Tue Jun 24 11:32:08 2008
New Revision: 671287

URL: http://svn.apache.org/viewvc?rev=671287&view=rev
Log:
better tie jaxb2 plugin version down

Modified:
    geronimo/server/branches/2.1/framework/modules/geronimo-plugin/pom.xml
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-plugin/pom.xml?rev=671287&r1=671286&r2=671287&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-plugin/pom.xml (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-plugin/pom.xml Tue Jun 24 11:32:08 2008
@@ -53,27 +53,4 @@
         </dependency>
     </dependencies>
 
-    <!--
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jaxb2-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xjc</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <packageName>org.apache.geronimo.system.plugin.model</packageName>
-                    <extension>true</extension>
-                </configuration>
-            </plugin>
-
-        </plugins>
-    </build>
-    -->
-
 </project>

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=671287&r1=671286&r2=671287&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Tue Jun 24 11:32:08 2008
@@ -2003,6 +2003,12 @@
                     <version>1.0</version>
                 </plugin>
                 
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>jaxb2-maven-plugin</artifactId>
+                    <version>1.2</version>
+                </plugin>
+
                 <!--
                 FIXME: Should not configure war to assume jsp by default
                 -->