commit dc53d5de17411699431f0e3983bf8b972f34de57
Author: Michal Srb <msrb(a)redhat.com>
Date: Thu Jan 2 16:43:45 2014 +0100
Update to upstream version 2.3.2
- Port to servlet 3.1
- Drop group tag
glassfish-jsp-build-eclipse-compilers.patch | 26 +++++++++++++++-----------
glassfish-jsp-port-to-servlet-3.1.patch | 26 ++++++++++++++++++++++++++
glassfish-jsp.spec | 19 ++++++++++++-------
sources | 2 +-
4 files changed, 54 insertions(+), 19 deletions(-)
---
diff --git a/generate_tarball.sh b/generate_tarball.sh
old mode 100644
new mode 100755
diff --git a/glassfish-jsp-build-eclipse-compilers.patch
b/glassfish-jsp-build-eclipse-compilers.patch
index 62114dd..c4ddf16 100644
--- a/glassfish-jsp-build-eclipse-compilers.patch
+++ b/glassfish-jsp-build-eclipse-compilers.patch
@@ -1,9 +1,11 @@
---- pom.xml.bak 2012-08-29 08:25:47.000000000 +0200
-+++ pom.xml 2012-08-30 10:08:53.758735211 +0200
-@@ -134,12 +134,9 @@
+diff --git a/pom.xml b/pom.xml
+index 53db856..cec146f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -135,12 +135,9 @@
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
- <compilerArgument>-Xlint:unchecked</compilerArgument>
+ <!-- compilerArgument>-Xlint:unchecked</compilerArgument
-->
<excludes>
@@ -15,7 +17,7 @@
</exclude>
<exclude>
@@ -299,14 +296,13 @@
- <version>2.2.1</version>
+ <version>2.3.1</version>
</dependency>
-<!--
@@ -27,21 +29,23 @@
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
<version>3.1.0</version>
-+ <scope>provided</scope>
- <scope>compile</scope>
++ <scope>provided</scope>
</dependency>
--->
+
</dependencies>
</project>
---- src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java.bak 2010-10-13
00:41:40.000000000 +0200
-+++ src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java 2012-08-30
10:13:25.619637005 +0200
-@@ -248,6 +248,8 @@
+diff --git a/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
b/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
+index 9008e9b..33b925e 100644
+--- a/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
++++ b/src/main/java/org/apache/jasper/compiler/JDTJavaCompiler.java
+@@ -248,6 +248,8 @@ public class JDTJavaCompiler implements JavaCompiler {
return className.toCharArray();
}
+ public boolean ignoreOptionalProblems() {return false;}
-+
++
public char[] getContents() {
char[] result = null;
Reader reader = null;
diff --git a/glassfish-jsp-port-to-servlet-3.1.patch
b/glassfish-jsp-port-to-servlet-3.1.patch
new file mode 100644
index 0000000..6736838
--- /dev/null
+++ b/glassfish-jsp-port-to-servlet-3.1.patch
@@ -0,0 +1,26 @@
+From c1b2515c5994ba581827e9543ffa10897ab1f035 Mon Sep 17 00:00:00 2001
+From: Michal Srb <msrb(a)redhat.com>
+Date: Thu, 2 Jan 2014 16:20:40 +0100
+Subject: [PATCH] Port to servlet 3.1
+
+---
+ src/main/java/org/apache/jasper/servlet/JspCServletContext.java | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/main/java/org/apache/jasper/servlet/JspCServletContext.java
b/src/main/java/org/apache/jasper/servlet/JspCServletContext.java
+index ff89225..01cd21a 100644
+--- a/src/main/java/org/apache/jasper/servlet/JspCServletContext.java
++++ b/src/main/java/org/apache/jasper/servlet/JspCServletContext.java
+@@ -883,4 +883,9 @@ public class JspCServletContext implements ServletContext {
+ return this.jspPropertyGroups;
+ }
+ }
++
++ @Override
++ public String getVirtualServerName() {
++ throw new UnsupportedOperationException("Not implemented yet");
++ }
+ }
+--
+1.8.3.1
+
diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec
index 9bc0ec3..367a3e4 100644
--- a/glassfish-jsp.spec
+++ b/glassfish-jsp.spec
@@ -1,13 +1,12 @@
%global artifactId javax.servlet.jsp
-%global jspspec 2.2
+%global jspspec 2.3
Name: glassfish-jsp
-Version: 2.2.6
-Release: 11%{?dist}
+Version: 2.3.2
+Release: 1%{?dist}
Summary: Glassfish J2EE JSP API implementation
-Group: Development/Libraries
License: (CDDL or GPLv2 with exceptions) and ASL 2.0
URL:
http://glassfish.org
Source0: %{artifactId}-%{version}.tar.xz
@@ -18,6 +17,7 @@ Source2:
http://www.apache.org/licenses/LICENSE-2.0.txt
Source3:
https://svn.java.net/svn/glassfish~svn/tags/legal-1.1/src/main/resources/...
Patch0: %{name}-build-eclipse-compilers.patch
+Patch1: %{name}-port-to-servlet-3.1.patch
BuildArch: noarch
@@ -37,7 +37,7 @@ Requires: glassfish-jsp-api
%description
This project provides a container independent implementation of JSP
-2.2. The main goals are:
+2.3. The main goals are:
* Improves current implementation: bug fixes and performance
improvements
* Provides API for use by other tools, such as Netbeans
@@ -47,14 +47,14 @@ This project provides a container independent implementation of JSP
%package javadoc
Summary: API documentation for %{name}
-Group: Documentation
%description javadoc
%{summary}.
%prep
%setup -q -n %{artifactId}-%{version}
-%patch0
+%patch0 -p1
+%patch1 -p1
cp -p %{SOURCE2} LICENSE
cp -p %{SOURCE3} cddllicense.txt
@@ -94,6 +94,11 @@ popd
%changelog
+* Thu Jan 02 2014 Michal Srb <msrb(a)redhat.com> - 2.3.2-1
+- Update to upstream version 2.3.2
+- Port to servlet 3.1
+- Drop group tag
+
* Mon Aug 05 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 2.2.6-11
- Add javax.servlet.jsp directory and provides
diff --git a/sources b/sources
index 7bcc4fd..a73c21b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f5cb9c16d3de1d7c548d52dc2c8a8c78 javax.servlet.jsp-2.2.6.tar.xz
3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
750f58ec5aa643312ec92473fe229fe5 LICENSE.txt
+265e3e379568abfce46dc731dbad9ef0 javax.servlet.jsp-2.3.2.tar.xz