Index: appserver/pom.xml
===================================================================
--- appserver/pom.xml	(revision 61658)
+++ appserver/pom.xml	(working copy)
@@ -63,8 +63,8 @@
         <jms-api.version>2.0</jms-api.version>
         <jsp-api.version>2.3.1</jsp-api.version>
         <jsp-impl.version>2.3.1</jsp-impl.version>
-        <javax.el.version>3.0-b07</javax.el.version>
-        <javax.el-api.version>3.0-b08</javax.el-api.version>
+        <javax.el.version>3.0.0</javax.el.version>
+        <javax.el-api.version>3.0.0</javax.el-api.version>
         <jstl-impl.version>1.2.2</jstl-impl.version>
         <jstl-api.version>1.2.1</jstl-api.version>
         <mojarra.version>2.2.0-m14</mojarra.version>
@@ -186,7 +186,7 @@
                 <version>1.2</version>
                 <configuration>
                     <dir>${stage.dir}/${install.dir.name}/glassfish/modules</dir>
-                    <excludes>javax.inject.jar,javax.servlet.jsp.jstl.jar,javax.servlet.jsp.jar,javax.el.jar,javax.enterprise.concurrent.jar, javax.persistence-api.jar</excludes>
+                    <excludes>javax.inject.jar,javax.servlet.jsp.jstl.jar,javax.servlet.jsp.jar,javax.enterprise.concurrent.jar, javax.persistence-api.jar</excludes>
                     <specs>
                         <spec>
                             <artifact>
@@ -354,11 +354,10 @@
                                 <artifactId>javax.ws.rs-api</artifactId>
                                 <version>${jax-rs-api.version}</version>
                             </artifact>
-                            <nonFinal>true</nonFinal>
+                            <nonFinal>false</nonFinal>
                             <jarType>api</jarType>
-                            <specVersion>1.1</specVersion>
-                            <newSpecVersion>2.0</newSpecVersion>
-                            <specBuild>19</specBuild>
+                            <specVersion>${jax-rs-api.version}</specVersion>
+                            <specImplVersion>${jax-rs-api.version}</specImplVersion>
                             <apiPackage>javax.ws.rs</apiPackage>
                         </spec>
                         <spec>
@@ -460,6 +459,18 @@
                             <specImplVersion>2.3.1</specImplVersion>
                             <apiPackage>javax.servlet.jsp</apiPackage>
                         </spec>
+                        <spec>
+                            <artifact>
+                                <groupId>org.glassfish</groupId>
+                                <artifactId>javax.el</artifactId>
+                                <version>${javax.el.version}</version>
+                            </artifact>
+                            <jarType>impl</jarType>
+                            <specVersion>3.0</specVersion>
+                            <implVersion>3.0.0</implVersion>
+                            <apiPackage>javax.el</apiPackage>
+                            <implNamespace>com.sun.el</implNamespace>
+                        </spec>
                     </specs>
                 </configuration>
             </plugin>            
Index: appserver/admingui/war/pom.xml
===================================================================
--- appserver/admingui/war/pom.xml	(revision 61658)
+++ appserver/admingui/war/pom.xml	(working copy)
@@ -71,7 +71,7 @@
                             <archive>
                                 <manifestEntries>
                                     <Glassfish-require-services>org.glassfish.api.admingui.ConsoleProvider</Glassfish-require-services>
-                                    <HK2-Import-Bundles>org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, org.glassfish.main.deployment.deployment-client,org.glassfish.main.registration.registration-api,org.glassfish.main.registration.registration-impl, javax.servlet-api, javax.servlet.jsp-api, org.glassfish.javax.el, com.sun.jsftemplating, org.glassfish.main.admingui.dataprovider, com.sun.pkg.client  </HK2-Import-Bundles>
+                                    <HK2-Import-Bundles>org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, org.glassfish.main.deployment.deployment-client,org.glassfish.main.registration.registration-api,org.glassfish.main.registration.registration-impl, javax.servlet-api, javax.servlet.jsp-api, com.sun.el.javax.el, com.sun.jsftemplating, org.glassfish.main.admingui.dataprovider, com.sun.pkg.client  </HK2-Import-Bundles>
                                 </manifestEntries>
                             </archive>
                         </configuration>
@@ -98,7 +98,7 @@
                                <jar jarfile="target/admingui.war" basedir="target/temp">
                                     <manifest>
                                       <attribute name="Glassfish-require-services" value="org.glassfish.api.admingui.ConsoleProvider" />
-                                      <attribute name="HK2-Import-Bundles" value="org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, org.glassfish.main.deployment.deployment-client,org.glassfish.main.registration.registration-api,org.glassfish.main.registration.registration-impl, javax.servlet-api, javax.servlet.jsp-api, org.glassfish.javax.el, com.sun.jsftemplating, org.glassfish.main.admingui.dataprovider, com.sun.pkg.client " />
+                                      <attribute name="HK2-Import-Bundles" value="org.glassfish.main.admingui.console-common,org.glassfish.hk2.hk2,org.glassfish.main.admingui.console-plugin-service, org.glassfish.main.deployment.deployment-client,org.glassfish.main.registration.registration-api,org.glassfish.main.registration.registration-impl, javax.servlet-api, javax.servlet.jsp-api, com.sun.el.javax.el, com.sun.jsftemplating, org.glassfish.main.admingui.dataprovider, com.sun.pkg.client " />
                                     </manifest>
                                 </jar>
                                 <delete dir="target/temp" />