Return-Path: 
 <scm-return-28350-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 4588 invoked from network); 21 May 2008 15:13:39 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 21 May 2008 15:13:39 -0000
Received: (qmail 4470 invoked by uid 500); 21 May 2008 15:13:41 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 4320 invoked by uid 500); 21 May 2008 15:13:40 -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 4271 invoked by uid 99); 21 May 2008 15:13:40 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 21 May 2008 08:13:40 -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, 21 May 2008 15:12:54 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7FC8423889FF; Wed, 21 May 2008 08:13:15 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r658723 - in /geronimo/server/branches/2.1: pom.xml
 repository/org/apache/yoko/ repository/pom.xml
Date: Wed, 21 May 2008 15:13:15 -0000
To: scm@geronimo.apache.org
From: rickmcguire@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080521151315.7FC8423889FF@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rickmcguire
Date: Wed May 21 08:13:14 2008
New Revision: 658723

URL: http://svn.apache.org/viewvc?rev=658723&view=rev
Log:
GERONIMO-4038 Change the yoko version to the 1.0 release


Removed:
    geronimo/server/branches/2.1/repository/org/apache/yoko/
Modified:
    geronimo/server/branches/2.1/pom.xml
    geronimo/server/branches/2.1/repository/pom.xml

Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=658723&r1=658722&r2=658723&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Wed May 21 08:13:14 2008
@@ -71,7 +71,6 @@
         Having a single well named version properties makes automatic updating for the weekly build much easier.
         -->
         <openejbVersion>3.0</openejbVersion>
-        <yokoVersion>1.0-r646887</yokoVersion>
         <derbyVersion>10.2.2.0</derbyVersion>
         <tomcatVersion>6.0.14</tomcatVersion>
         <tranqlVendorsVersion>1.4</tranqlVendorsVersion>
@@ -620,25 +619,25 @@
             <dependency>
                 <groupId>org.apache.yoko</groupId>
                 <artifactId>yoko-core</artifactId>
-                <version>${yokoVersion}</version>
+                <version>1.0</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.yoko</groupId>
                 <artifactId>yoko-spec-corba</artifactId>
-                <version>${yokoVersion}</version>
+                <version>1.0</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.yoko</groupId>
                 <artifactId>yoko-rmi-spec</artifactId>
-                <version>${yokoVersion}</version>
+                <version>1.0</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.yoko</groupId>
                 <artifactId>yoko-rmi-impl</artifactId>
-                <version>${yokoVersion}</version>
+                <version>1.0</version>
             </dependency>
 
             <dependency>

Modified: geronimo/server/branches/2.1/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/repository/pom.xml?rev=658723&r1=658722&r2=658723&view=diff
==============================================================================
--- geronimo/server/branches/2.1/repository/pom.xml (original)
+++ geronimo/server/branches/2.1/repository/pom.xml Wed May 21 08:13:14 2008
@@ -92,23 +92,6 @@
         </dependency>
         <!--end add for wsgen-->
         
-        <dependency>
-            <groupId>org.apache.yoko</groupId>
-            <artifactId>yoko-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.yoko</groupId>
-            <artifactId>yoko-rmi-impl</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.yoko</groupId>
-            <artifactId>yoko-rmi-spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.yoko</groupId>
-            <artifactId>yoko-spec-corba</artifactId>
-        </dependency>
-
         <!-- See GERONIMO-3410 -->
         <dependency>
             <groupId>org.codehaus.mojo.jspc</groupId>