Looks fine. Thanks.
On 11/29/11 9:52 AM, Kin-man Chung wrote:
> For the trunk and branch 3.1.2.
>
> The module appserver/javaee-api/javax.servlet.jsp, which is a
> repackaging of jsp-api, is also removed, since it is no longer needed.
>
> misto:v3%svn diff
> Index: appserver/javaee-api/pom.xml
> ===================================================================
> --- appserver/javaee-api/pom.xml (revision 51177)
> +++ appserver/javaee-api/pom.xml (working copy)
> @@ -149,7 +149,6 @@
> <module>javax.annotation</module>
> <module>javax.jms</module>
> <module>javax.jws</module>
> - <module>javax.servlet.jsp</module>
> <module>javax.servlet.jsp.jstl</module>
> <module>javax.xml.rpc</module>
> <module>javax.xml.soap</module>
> Index: appserver/web/web-glue/pom.xml
> ===================================================================
> --- appserver/web/web-glue/pom.xml (revision 51177)
> +++ appserver/web/web-glue/pom.xml (working copy)
> @@ -171,11 +171,11 @@
>
> <dependency>
> <groupId>org.glassfish.web</groupId>
> - <artifactId>jsp-impl</artifactId>
> + <artifactId>javax.servlet.jsp</artifactId>
> </dependency>
> <dependency>
> <groupId>org.glassfish.web</groupId>
> - <artifactId>el-impl</artifactId>
> + <artifactId>javax.el</artifactId>
> </dependency>
> <dependency>
> <groupId>org.glassfish.admin</groupId>
> Index: appserver/verifier/verifier-impl/pom.xml
> ===================================================================
> --- appserver/verifier/verifier-impl/pom.xml (revision 51177)
> +++ appserver/verifier/verifier-impl/pom.xml (working copy)
> @@ -147,7 +147,7 @@
> </dependency>
> <dependency>
> <groupId>org.glassfish.web</groupId>
> - <artifactId>jsp-impl</artifactId>
> + <artifactId>javax.servlet.jsp</artifactId>
> <optional>true</optional>
> <scope>provided</scope>
> </dependency>
> Index: pom.xml
> ===================================================================
> --- pom.xml (revision 50574)
> +++ pom.xml (working copy)
> @@ -99,10 +99,10 @@
> <management-api.version>1.1-rev-1</management-api.version>
> <jms-api.version>1.1-rev-1</jms-api.version>
> <servlet-api.version>3.0.1</servlet-api.version>
> - <jsp-api.version>2.2.1-b02</jsp-api.version>
> - <jsp-impl.version>2.2.2-b06</jsp-impl.version>
> - <el-api.version>2.2.1-b03</el-api.version>
> - <el-impl.version>2.2.1-b03</el-impl.version>
> + <jsp-api.version>2.2.1</jsp-api.version>
> + <jsp-impl.version>2.2.3</jsp-impl.version>
> + <el-api.version>2.2.3</el-api.version>
> + <el-impl.version>2.2.2</el-impl.version>
> <jstl-impl.version>1.2</jstl-impl.version>
> <jstl-api.version>1.2</jstl-api.version>
> <jsf-api.version>2.1.3-b02</jsf-api.version>
> @@ -947,13 +947,13 @@
>
> <dependency>
> <groupId>org.glassfish.web</groupId>
> - <artifactId>jsp-impl</artifactId>
> + <artifactId>javax.servlet.jsp</artifactId>
> <version>${jsp-impl.version}</version>
> </dependency>
>
> <dependency>
> <groupId>org.glassfish.web</groupId>
> - <artifactId>el-impl</artifactId>
> + <artifactId>javax.el</artifactId>
> <version>${el-impl.version}</version>
> </dependency>
>
> @@ -1283,12 +1283,12 @@
> </dependency>
> <dependency>
> <groupId>javax.servlet.jsp</groupId>
> - <artifactId>jsp-api</artifactId>
> + <artifactId>javax.servlet.jsp-api</artifactId>
> <version>${jsp-api.version}</version>
> </dependency>
> <dependency>
> <groupId>javax.el</groupId>
> - <artifactId>el-api</artifactId>
> + <artifactId>javax.el-api</artifactId>
> <version>${el-api.version}</version>
> </dependency>
> <dependency>
>