Return-Path: 
 <scm-return-39791-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 75988 invoked from network); 12 Jan 2010 02:32:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 12 Jan 2010 02:32:58 -0000
Received: (qmail 72904 invoked by uid 500); 12 Jan 2010 02:32:58 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 72783 invoked by uid 500); 12 Jan 2010 02:32:58 -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 72769 invoked by uid 99); 12 Jan 2010 02:32:58 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jan 2010 02:32:58 +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; Tue, 12 Jan 2010 02:32:57 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 32D0123888D1; Tue, 12 Jan 2010 02:32:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r898156 - in /geronimo/specs/trunk: geronimo-el_2.2_spec/
 geronimo-el_2.2_spec/pom.xml geronimo-jsp_2.1-MR2_spec/
 geronimo-jsp_2.2_spec/ geronimo-jsp_2.2_spec/pom.xml
Date: Tue, 12 Jan 2010 02:32:37 -0000
To: scm@geronimo.apache.org
From: xuhaihong@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100112023237.32D0123888D1@eris.apache.org>

Author: xuhaihong
Date: Tue Jan 12 02:32:36 2010
New Revision: 898156

URL: http://svn.apache.org/viewvc?rev=898156&view=rev
Log:
Rename JSP 2.1-MR2 to JSP 2.2, and create an EL 2.2 branch

Added:
    geronimo/specs/trunk/geronimo-el_2.2_spec/
      - copied from r897792, geronimo/specs/trunk/geronimo-el_1.0_spec/
    geronimo/specs/trunk/geronimo-jsp_2.2_spec/
      - copied from r898151, geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/
Removed:
    geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/
Modified:
    geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml
    geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml

Modified: geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml?rev=898156&r1=897792&r2=898156&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-el_2.2_spec/pom.xml Tue Jan 12 02:32:36 2010
@@ -31,11 +31,11 @@
     </parent>
 
     <groupId>org.apache.geronimo.specs</groupId>
-    <artifactId>geronimo-el_1.0_spec</artifactId>
+    <artifactId>geronimo-el_2.2_spec</artifactId>
     <packaging>bundle</packaging>
-    <name>Expression Language 1.0</name>
-    <version>1.0.2-SNAPSHOT</version>
-    <description>Expression Languague API 1.0</description>
+    <name>Expression Language 2.2</name>
+    <version>1.0-SNAPSHOT</version>
+    <description>Expression Languague API 2.2</description>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
     <distributionManagement>
@@ -50,9 +50,9 @@
     </properties>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_1.0_spec/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_1.0_spec/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-el_1.0_spec/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_2.2_spec/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-el_2.2_spec/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-el_2.2_spec/</url>
     </scm>
 
     <build>
@@ -62,7 +62,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>javax.el*;version=1.0</Export-Package>
+                        <Export-Package>javax.el*;version=2.2</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml?rev=898156&r1=898151&r2=898156&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-jsp_2.2_spec/pom.xml Tue Jan 12 02:32:36 2010
@@ -31,11 +31,11 @@
     </parent>
 
     <groupId>org.apache.geronimo.specs</groupId>
-    <artifactId>geronimo-jsp_2.1-MR2_spec</artifactId>
+    <artifactId>geronimo-jsp_2.2_spec</artifactId>
     <packaging>bundle</packaging>
-    <name>JSP 2.1</name>
+    <name>JSP 2.2</name>
     <version>1.0-SNAPSHOT</version>
-    <description>Java Server Pages 2.1 MR2 API</description>
+    <description>Java Server Pages 2.2 API</description>
 
     <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
     <distributionManagement>
@@ -58,16 +58,16 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_1.0_spec</artifactId>
-            <version>1.0.1</version>
+            <artifactId>geronimo-el_2.2_spec</artifactId>
+            <version>1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
     
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jsp_2.1-MR2_spec/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.2_spec/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/trunk/geronimo-jsp_2.2_spec/</developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/geronimo/specs/trunk/geronimo-jsp_2.2_spec/</url>
     </scm>
 
     <build>
@@ -77,7 +77,7 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <configuration>
                     <instructions>
-                        <Export-Package>javax.servlet.jsp*;version=2.1</Export-Package>
+                        <Export-Package>javax.servlet.jsp*;version=2.2</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>