diff --git a/generate_tarball.sh b/generate_tarball.sh deleted file mode 100644 index 612ad6a886d746d3812e8ef788338e7b0cca8481..0000000000000000000000000000000000000000 --- a/generate_tarball.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -baseurl="https://svn.java.net/svn/jsp~svn/tags/" -pkgname="javax.servlet.jsp" - -version=`grep Version: *spec | sed -e 's/Version:\s*\(.*\)/\1/'` -version="$version`sed -n 's/%global\s\+reltag\s\+/-/p' *.spec`" -echo $version - -svn export "${baseurl}/${pkgname}-${version}" -tar cvJf ${pkgname}-${version}.tar.xz ${pkgname}-${version}/ diff --git a/glassfish-jsp-build-eclipse-compilers.patch b/glassfish-jsp-build-eclipse-compilers.patch index ac5d0618c850278860e8273faf32a65a2d40d6b6..90623427eaeb244ba0270601f1fd92c43e2b4155 100644 --- a/glassfish-jsp-build-eclipse-compilers.patch +++ b/glassfish-jsp-build-eclipse-compilers.patch @@ -1,31 +1,33 @@ +diff --git a/org/apache/jasper/compiler/JDTJavaCompiler.java b/org/apache/jasper/compiler/JDTJavaCompiler.java +index 9008e9b..04b7c11 100644 +--- a/org/apache/jasper/compiler/JDTJavaCompiler.java ++++ b/org/apache/jasper/compiler/JDTJavaCompiler.java +@@ -247,6 +247,8 @@ public class JDTJavaCompiler implements JavaCompiler { + public char[] getFileName() { + return className.toCharArray(); + } ++ ++ public boolean ignoreOptionalProblems() {return false;} + + public char[] getContents() { + char[] result = null; diff --git a/pom.xml b/pom.xml -index 53db856..cec146f 100644 +index d507923..a51b91f 100644 --- a/pom.xml +++ b/pom.xml -@@ -135,12 +135,9 @@ +@@ -138,11 +138,8 @@ 1.7 1.7 - -Xlint:unchecked + - +- - org/apache/jasper/compiler/JDTJavaCompiler.java - -- + org/apache/jasper/compiler/AntJavaCompiler.java - -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; +-- +2.33.0 + diff --git a/glassfish-jsp-port-to-servlet-3.1.patch b/glassfish-jsp-port-to-servlet-3.1.patch index 6736838926d82f6324c25f219f4443b6b0225f43..e5c33b0cca7c5fd499d94937cac648bb01f954cd 100644 --- a/glassfish-jsp-port-to-servlet-3.1.patch +++ b/glassfish-jsp-port-to-servlet-3.1.patch @@ -4,13 +4,13 @@ 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 +++++ + 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 +diff --git a/org/apache/jasper/servlet/JspCServletContext.java b/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 +--- a/org/apache/jasper/servlet/JspCServletContext.java ++++ b/org/apache/jasper/servlet/JspCServletContext.java @@ -883,4 +883,9 @@ public class JspCServletContext implements ServletContext { return this.jspPropertyGroups; } diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec index 2d56eef6b8092a3254707d5104a0a3ab655c3073..09b8abb3cdbf9fc24cde0d357ed9d7b74866ccad 100644 --- a/glassfish-jsp.spec +++ b/glassfish-jsp.spec @@ -1,16 +1,14 @@ %global artifactId javax.servlet.jsp %global jspspec 2.3 -%global reltag b02 Name: glassfish-jsp -Version: 2.3.3 +Version: 2.3.4 Release: 1 Summary: Glassfish J2EE JSP API implementation License: (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0 URL: http://glassfish.org -Source0: %{artifactId}-%{version}-%{reltag}.tar.xz -Source1: generate_tarball.sh -Source2: http://www.apache.org/licenses/LICENSE-2.0.txt -Source3: https://javaee.github.io/glassfish/LICENSE.html +Source0: https://repo1.maven.org/maven2/org/glassfish/web/%{artifactId}/%{version}/%{artifactId}-%{version}-sources.jar +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt +Source2: https://javaee.github.io/glassfish/LICENSE.html Patch0: %{name}-build-eclipse-compilers.patch Patch1: %{name}-port-to-servlet-3.1.patch BuildArch: noarch @@ -38,15 +36,19 @@ Summary: API documentation for %{name} %{summary}. %prep -%setup -q -n %{artifactId}-%{version}-%{reltag} +%setup -c %{artifactId}-%{version} %patch0 -p1 %patch1 -p1 +mkdir -p src/main/java +mv org src/main/java + %pom_add_dep org.eclipse.jdt:core::provided -cp -p %{SOURCE2} LICENSE-ASL-2.0.txt -cp -p %{SOURCE3} LICENSE-CDDL+GPLv2.html +cp -p %{SOURCE1} LICENSE-ASL-2.0.txt +cp -p %{SOURCE2} LICENSE-CDDL+GPLv2.html %mvn_alias : "org.eclipse.jetty.orbit:org.apache.jasper.glassfish" %mvn_file : %{name}/javax.servlet.jsp %{name} %pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin :maven-gpg-plugin %build %mvn_build @@ -70,5 +72,8 @@ popd %license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html %changelog +* Sat May 11 2024 Ge Wang - 2.3.4-1 +- Update to version 2.3.4 + * Sat Aug 1 2020 shaoqiang kang - 2.3.3-1 - Package init diff --git a/glassfish-jsp.yaml b/glassfish-jsp.yaml index e4f30a1e58b949e51403959ab59ba7f60933323d..00bbaf050db91e87f0ad529e5c29027a1bf150ae 100644 --- a/glassfish-jsp.yaml +++ b/glassfish-jsp.yaml @@ -1,4 +1,4 @@ -version_control: github -src_repo: paul-hammant/paranamer -tag_prefix: "paranamer-parent-" -seperator: "." +version_control: NA +src_repo: NA +tag_prefix: NA +seperator: NA diff --git a/javax.servlet.jsp-2.3.3-b02.tar.xz b/javax.servlet.jsp-2.3.3-b02.tar.xz deleted file mode 100644 index e73c212bbcbe8dfef72a9dd97c2305294202c579..0000000000000000000000000000000000000000 Binary files a/javax.servlet.jsp-2.3.3-b02.tar.xz and /dev/null differ diff --git a/javax.servlet.jsp-2.3.4-sources.jar b/javax.servlet.jsp-2.3.4-sources.jar new file mode 100644 index 0000000000000000000000000000000000000000..ee00e34e17c31e4738708a175149846579530bdc Binary files /dev/null and b/javax.servlet.jsp-2.3.4-sources.jar differ