Return-Path: 
 <scm-return-38628-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 8401 invoked from network); 24 Sep 2009 21:22:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 24 Sep 2009 21:22:06 -0000
Received: (qmail 58067 invoked by uid 500); 24 Sep 2009 21:22:06 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 57990 invoked by uid 500); 24 Sep 2009 21:22:06 -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 57981 invoked by uid 99); 24 Sep 2009 21:22:06 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 21:22:06 +0000
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; Thu, 24 Sep 2009 21:22:04 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 5023423888D4; Thu, 24 Sep 2009 21:21:44 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r818630 - in /geronimo/server/branches/2.2: ./
 framework/configs/jee-specs/ framework/configs/jee-specs/src/main/history/
 plugins/openjpa/geronimo-persistence-jpa10/
 plugins/tomcat/tomcat6/src/main/history/ testsuite/enterprise-testsuite/jp...
Date: Thu, 24 Sep 2009 21:21:43 -0000
To: scm@geronimo.apache.org
From: dwoods@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090924212144.5023423888D4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dwoods
Date: Thu Sep 24 21:21:41 2009
New Revision: 818630

URL: http://svn.apache.org/viewvc?rev=818630&view=rev
Log:
switch to released geronimo-jpa_1.0_spec artifact and fix tomcat6 dependency change

Modified:
    geronimo/server/branches/2.2/framework/configs/jee-specs/pom.xml
    geronimo/server/branches/2.2/framework/configs/jee-specs/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
    geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
    geronimo/server/branches/2.2/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
    geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml

Modified: geronimo/server/branches/2.2/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/jee-specs/pom.xml?rev=818630&r1=818629&r2=818630&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/jee-specs/pom.xml Thu Sep 24 21:21:41 2009
@@ -116,7 +116,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/branches/2.2/framework/configs/jee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=818630&r1=818629&r2=818630&view=diff
==============================================================================
--- geronimo/server/branches/2.2/framework/configs/jee-specs/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/2.2/framework/configs/jee-specs/src/main/history/dependencies.xml Thu Sep 24 21:21:41 2009
@@ -93,7 +93,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jpa_3.0_spec</artifactId>
+        <artifactId>geronimo-jpa_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10/pom.xml?rev=818630&r1=818629&r2=818630&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10/pom.xml (original)
+++ geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10/pom.xml Thu Sep 24 21:21:41 2009
@@ -55,7 +55,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/history/dependencies.xml?rev=818630&r1=818629&r2=818630&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/history/dependencies.xml (original)
+++ geronimo/server/branches/2.2/plugins/tomcat/tomcat6/src/main/history/dependencies.xml Thu Sep 24 21:21:41 2009
@@ -66,9 +66,4 @@
         <artifactId>geronimo-javamail_1.4_spec</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jpa_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=818630&r1=818629&r2=818630&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Thu Sep 24 21:21:41 2009
@@ -252,8 +252,8 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_3.0_spec</artifactId>
-                <version>1.1.1</version>
+                <artifactId>geronimo-jpa_1.0_spec</artifactId>
+                <version>1.1.2</version>
             </dependency>
 
             <dependency>
@@ -409,6 +409,10 @@
                         <groupId>org.apache.geronimo.specs</groupId>
                         <artifactId>geronimo-jpa_3.0_spec</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-jpa_1.0_spec</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>

Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml?rev=818630&r1=818629&r2=818630&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/jpa-tests/jpa-ejb/pom.xml Thu Sep 24 21:21:41 2009
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml?rev=818630&r1=818629&r2=818630&view=diff
==============================================================================
--- geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml (original)
+++ geronimo/server/branches/2.2/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml Thu Sep 24 21:21:41 2009
@@ -37,7 +37,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <artifactId>geronimo-jpa_1.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>