commit c35317fe7f051688671029839e1096ac3cfc8811 Author: CentOS Sources Date: Tue Mar 30 10:48:36 2021 -0400 import glassfish-jsp-2.3.4-6.module+el8.2.1+7436+4afdca1f diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..72cc997 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/javax.servlet.jsp-2.3.4.tar.gz diff --git a/.glassfish-jsp.metadata b/.glassfish-jsp.metadata new file mode 100644 index 0000000..4f2c42b --- /dev/null +++ b/.glassfish-jsp.metadata @@ -0,0 +1 @@ +0ae5081e9806d6a71ff9de3cacd34e048d5051f9 SOURCES/javax.servlet.jsp-2.3.4.tar.gz diff --git a/SOURCES/LICENSE-2.0.txt b/SOURCES/LICENSE-2.0.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/SOURCES/LICENSE-2.0.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/SOURCES/glassfish-jsp-build-eclipse-compilers.patch b/SOURCES/glassfish-jsp-build-eclipse-compilers.patch new file mode 100644 index 0000000..ac5d061 --- /dev/null +++ b/SOURCES/glassfish-jsp-build-eclipse-compilers.patch @@ -0,0 +1,31 @@ +diff --git a/pom.xml b/pom.xml +index 53db856..cec146f 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -135,12 +135,9 @@ + + 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; diff --git a/SOURCES/glassfish-jsp-port-to-servlet-3.1.patch b/SOURCES/glassfish-jsp-port-to-servlet-3.1.patch new file mode 100644 index 0000000..6736838 --- /dev/null +++ b/SOURCES/glassfish-jsp-port-to-servlet-3.1.patch @@ -0,0 +1,26 @@ +From c1b2515c5994ba581827e9543ffa10897ab1f035 Mon Sep 17 00:00:00 2001 +From: Michal Srb +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/SPECS/glassfish-jsp.spec b/SPECS/glassfish-jsp.spec new file mode 100644 index 0000000..518d7ef --- /dev/null +++ b/SPECS/glassfish-jsp.spec @@ -0,0 +1,233 @@ +%global artifactId javax.servlet.jsp +%global jspspec 2.3 + +Name: glassfish-jsp +Version: 2.3.4 +Release: 6%{?dist} +Summary: Glassfish J2EE JSP API implementation +# Classes in package "org.apache.jasper" are Apache licensed +License: (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0 +URL: https://github.com/javaee/javaee-jsp-api + +Source0: https://github.com/javaee/javaee-jsp-api/archive/%{artifactId}-%{version}.tar.gz +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt + +# JSP can do byte-code compilation at runtime, if we enable the Eclipse compiler support +Patch0: %{name}-build-eclipse-compilers.patch +# Fix compilation errors due to unimplemented interfaces in newer servlet APIs +Patch1: %{name}-port-to-servlet-3.1.patch + +BuildArch: noarch + +BuildRequires: maven-local +BuildRequires: mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api) +BuildRequires: mvn(net.java:jvnet-parent:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.eclipse.jdt:core) +BuildRequires: mvn(org.glassfish:javax.el) + +Provides: jsp = %{jspspec} +Provides: jsp%{jspspec} +Provides: javax.servlet.jsp + +%description +This project provides a container independent implementation of JSP +specification %{jspspec}. + +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +%{summary}. + +%prep +%setup -q -n javaee-jsp-api-%{artifactId}-%{version} + +cp -p %{SOURCE1} LICENSE-ASL-2.0.txt + +pushd impl +%patch0 -p1 +%patch1 -p1 + +%pom_xpath_set "/pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:source" "1.8" +%pom_xpath_set "/pom:project/pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-compiler-plugin']/pom:configuration/pom:target" "1.8" +%pom_add_dep org.eclipse.jdt:core::provided + +%mvn_alias : "org.eclipse.jetty.orbit:org.apache.jasper.glassfish" + +# compat symlink +%mvn_file : %{name}/javax.servlet.jsp %{name} + +# Plugins not needed for RPM builds: +%pom_remove_plugin :maven-javadoc-plugin +%pom_remove_plugin :maven-gpg-plugin +%pom_remove_plugin :maven-source-plugin + +# These three files are excluded from compilation by upstream, delete them to avoid javadoc problems +rm src/main/java/org/apache/jasper/compiler/AntJavaCompiler.java \ + src/main/java/org/apache/jasper/util/SystemLogHandler.java \ + src/main/java/org/apache/jasper/runtime/PerThreadTagHandlerPool.java + +popd + +%build +pushd impl +%mvn_build -- -Dsource=1.8 -Ddoclint=none +popd + +%install +pushd impl +%mvn_install +popd + +# Install j2ee api symlinks +install -d -m 755 %{buildroot}%{_javadir}/javax.servlet.jsp/ +pushd %{buildroot}%{_javadir}/javax.servlet.jsp/ +for jar in ../%{name}/*jar; do + ln -sf $jar . +done +# Copy jsp-api so that deps can be included as well +build-jar-repository -p . glassfish-jsp-api +xmvn-subst -R %{buildroot} -s . +popd + +%files -f impl/.mfiles +%{_javadir}/javax.servlet.jsp +%license LICENSE-ASL-2.0.txt LICENSE + +%files javadoc -f impl/.mfiles-javadoc +%license LICENSE-ASL-2.0.txt LICENSE + +%changelog +* Fri Jul 10 2020 Jiri Vanek - 2.3.4-6 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jul 07 2020 Mat Booth - 2.3.4-5 +- Avoid javadoc problems restricting build to Java 8 + +* Fri Jun 26 2020 Jeff Johnston - 2.3.4-4 +- Set to use Java 1.8 as package needs javax.servlet + +* Tue Jan 28 2020 Fedora Release Engineering - 2.3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Dec 17 2019 Mat Booth - 2.3.4-2 +- Add extra license and patch comments + +* Tue Dec 17 2019 Mat Booth - 2.3.4-1 +- Update to version 2.3.4 + +* Thu Jul 25 2019 Fedora Release Engineering - 2.3.3-0.15.b02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 2.3.3-0.14.b02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.3.3-0.13.b02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.3.3-0.12.b02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Nov 09 2017 Michael Simacek - 2.3.3-0.11.b02 +- Specify CDDL license version +- Include correct license file for CDDL + +* Wed Jul 26 2017 Fedora Release Engineering - 2.3.3-0.10.b02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu May 25 2017 Mikolaj Izdebski - 2.3.3-0.9.b02 +- Drop javax.servlet:jsp-api alias (it's for API, not impl) + +* Fri Feb 24 2017 Mikolaj Izdebski - 2.3.3-0.8.b02 +- Fix xmvn-subst invocation + +* Thu Feb 23 2017 Mikolaj Izdebski - 2.3.3-0.7.b02 +- Simplify J2EE symlink installation + +* Fri Feb 10 2017 Fedora Release Engineering - 2.3.3-0.6.b02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jun 15 2016 Mikolaj Izdebski - 2.3.3-0.5.b02 +- Add missing build-requires + +* Wed Feb 03 2016 Fedora Release Engineering - 2.3.3-0.4.b02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 2.3.3-0.3.b02 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Mikolaj Izdebski - 2.3.3-0.2.b02 +- Remove maven-javadoc-plugin execution + +* Mon Jan 19 2015 Michael Simacek - 2.3.3-0.1.b02 +- Update to upstream version 2.3.3-b02 + +* Mon Jun 9 2014 Alexander Kurtakov 2.3.2-5 +- Rebuild to regen osgi metadata. + +* Sat Jun 07 2014 Fedora Release Engineering - 2.3.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 2.3.2-3 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Jan 02 2014 Michal Srb - 2.3.2-2 +- Regenerate BR + +* Thu Jan 02 2014 Michal Srb - 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 - 2.2.6-11 +- Add javax.servlet.jsp directory and provides + +* Sat Aug 03 2013 Fedora Release Engineering - 2.2.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Mon Jun 17 2013 Michal Srb - 2.2.6-9 +- Add compat symlink + +* Fri Jun 07 2013 Michal Srb - 2.2.6-8 +- Build with XMvn +- Fix URL for CDDL license + +* Mon Mar 4 2013 Mikolaj Izdebski - 2.2.6-7 +- Add depmap for org.eclipse.jetty.orbit +- Resolves: rhbz#917623 + +* Tue Feb 26 2013 Mikolaj Izdebski - 2.2.6-6 +- Change scope of Eclipse JDT dependency from compile to provided +- Fix eclipse patch + +* Wed Feb 13 2013 Fedora Release Engineering - 2.2.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 2.2.6-4 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Tue Sep 4 2012 Mikolaj Izdebski - 2.2.6-3 +- Fix license tag +- Install license files + +* Thu Aug 30 2012 Krzysztof Daniel 2.2.6-2 +- Build Eclipse compiler adapters. + +* Wed Aug 29 2012 Mikolaj Izdebski - 2.2.6-1 +- Update to upstream version 2.2.6 + +* Mon Jul 23 2012 Mikolaj Izdebski - 2.2.5-1 +- Update to upstream version 2.2.5 + +* Thu Jul 19 2012 Fedora Release Engineering - 2.2.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 11 2012 Stanislav Ochotnicky - 2.2.3-2 +- Add explicit BR/R on java and jpackage-utils +- Fix whitespace + +* Wed Mar 21 2012 Stanislav Ochotnicky - 2.2.1-1 +- Initial version of the package \ No newline at end of file