Return-Path: 
 <scm-return-31413-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 13080 invoked from network); 3 Sep 2008 16:52:54 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 3 Sep 2008 16:52:54 -0000
Received: (qmail 62792 invoked by uid 500); 3 Sep 2008 16:52:52 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 62655 invoked by uid 500); 3 Sep 2008 16:52:51 -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 62646 invoked by uid 99); 3 Sep 2008 16:52:51 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Sep 2008 09:52:51 -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; Wed, 03 Sep 2008 16:52:02 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id CAD1323889E3; Wed,  3 Sep 2008 09:52:32 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r691683 - in /geronimo/server/branches/2.1:
 plugins/jetty/geronimo-jetty6-builder/src/test/resources/plans/plan-convert.xml
 plugins/tomcat/geronimo-tomcat6-builder/src/test/resources/plans/plan-convert.xml
 pom.xml
Date: Wed, 03 Sep 2008 16:52:31 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080903165232.CAD1323889E3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dwoods
Date: Wed Sep  3 09:52:31 2008
New Revision: 691683

URL: http://svn.apache.org/viewvc?rev=691683&view=rev
Log:
GERONIMO-4278 Upgrade to OpenJPA 1.2.0

Modified:
    geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/test/resources/plans/plan-convert.xml
    geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/test/resources/plans/plan-convert.xml
    geronimo/server/branches/2.1/pom.xml

Modified: geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/test/resources/plans/plan-convert.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/test/resources/plans/plan-convert.xml?rev=691683&r1=691682&r2=691683&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/test/resources/plans/plan-convert.xml (original)
+++ geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/test/resources/plans/plan-convert.xml Wed Sep  3 09:52:31 2008
@@ -33,7 +33,7 @@
                        <dep:dependency>
                                <dep:groupId>org.apache.openjpa</dep:groupId>
                                <dep:artifactId>openjpa</dep:artifactId>
-                               <dep:version>1.0.2</dep:version>
+                               <dep:version>1.2.0</dep:version>
                                <dep:type>jar</dep:type>
                        </dep:dependency>
 

Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/test/resources/plans/plan-convert.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/test/resources/plans/plan-convert.xml?rev=691683&r1=691682&r2=691683&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/test/resources/plans/plan-convert.xml (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/test/resources/plans/plan-convert.xml Wed Sep  3 09:52:31 2008
@@ -33,7 +33,7 @@
                        <dep:dependency>
                                <dep:groupId>org.apache.openjpa</dep:groupId>
                                <dep:artifactId>openjpa</dep:artifactId>
-                               <dep:version>1.0.2</dep:version>
+                               <dep:version>1.2.0</dep:version>
                                <dep:type>jar</dep:type>
                        </dep:dependency>
 

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=691683&r1=691682&r2=691683&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Wed Sep  3 09:52:31 2008
@@ -81,7 +81,7 @@
         <axiomVersion>1.2.5</axiomVersion>
         <springVersion>2.0.5</springVersion>
         <plutoVersion>1.1.6-G643117</plutoVersion>
-        <openjpaVersion>1.0.2</openjpaVersion>
+        <openjpaVersion>1.2.0</openjpaVersion>
         <xbeanVersion>3.3</xbeanVersion>
         <wadiVersion>2.0</wadiVersion>