.gitignore

@@ -1,6 +1 @@
-/javax.servlet.jsp-api-2.2.1.tar.xz
+SOURCES/javax.servlet.jsp-api-2.3.3.tar.gz
-/javax.servlet.jsp-api-2.3.1.tar.xz
-/javax.servlet.jsp-api-2.3.2-b01.tar.xz
-/LICENSE-2.0.txt
-/cddllicense.txt
-/LICENSE.html

.glassfish-jsp-api.metadata

@@ -1,3 +1 @@
-ec7afc750d6e5d82a53274f4cb5bc9fbdf11361b javax.servlet.jsp-api-2.3.2-b01.tar.xz
+42403e71a01d55f1896f7dbd997bad545489a86b SOURCES/javax.servlet.jsp-api-2.3.3.tar.gz
-2b8b815229aa8a61e483fb4ba0588b8b6c491890 LICENSE-2.0.txt
-ca64acd6172eae17495f6f7598a891638fae0cd9 LICENSE.html

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.

SPECS/glassfish-jsp-api.spec

@@ -1,21 +1,14 @@
 %global artifactId javax.servlet.jsp-api
-%global jspspec 2.2
-%global reltag b01
-
 
 Name:       glassfish-jsp-api
-Version:    2.3.2
+Version:    2.3.3
-Release:    0.9.%{reltag}%{?dist}
+Release:    3%{?dist}
 Summary:    Glassfish J2EE JSP API specification
-
 License:    (CDDL-1.1 or GPLv2 with exceptions) and ASL 2.0
-URL:        http://java.net/jira/browse/JSP
+
-Source0:    %{artifactId}-%{version}-%{reltag}.tar.xz
+URL:        https://github.com/javaee/javaee-jsp-api
-# no source releases, but this will generate tarball for you from an
+Source0:    %{url}/archive/%{artifactId}-%{version}.tar.gz
-# SVN tag
+Source1:    http://www.apache.org/licenses/LICENSE-2.0.txt
-Source1:    generate_tarball.sh
-Source2:    http://www.apache.org/licenses/LICENSE-2.0.txt
-Source3:    https://javaee.github.io/glassfish/LICENSE.html
 
 BuildArch:  noarch
 
@@ -39,35 +32,59 @@ BuildArch:      noarch
 %{summary}.
 
 %prep
-%setup -q -n %{artifactId}-%{version}-%{reltag}
+%setup -q -n javaee-jsp-api-%{artifactId}-%{version}
 
-cp -p %{SOURCE2} LICENSE-ASL-2.0.txt
+cp -p %{SOURCE1} LICENSE-ASL-2.0.txt
-cp -p %{SOURCE3} LICENSE-CDDL+GPLv2.html
 
+pushd api
 # Submited upstream: http://java.net/jira/browse/JSP-31
 sed -i "/<bundle.symbolicName>/s/-api//" pom.xml
 
 %pom_xpath_remove "pom:dependency[pom:groupId='javax.el' or pom:groupId='javax.servlet']/pom:scope"
 
+%pom_remove_plugin :maven-gpg-plugin
 # javadoc generation fails due to strict doclint in JDK 8
 %pom_remove_plugin :maven-javadoc-plugin
 
 %mvn_alias : javax.servlet:jsp-api
+popd
 
 %build
+pushd api
 %mvn_build
+popd
 
 %install
+pushd api
 %mvn_install
+popd
 
-%files -f .mfiles
+%files -f api/.mfiles
-%license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html
+%license LICENSE-ASL-2.0.txt LICENSE
 
-%files javadoc -f .mfiles-javadoc
+%files javadoc -f api/.mfiles-javadoc
-%license LICENSE-ASL-2.0.txt LICENSE-CDDL+GPLv2.html
+%license LICENSE-ASL-2.0.txt LICENSE
 
 
 %changelog
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.3.3-3
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Oct 21 2019 Fabio Valentini <decathorpe@gmail.com> - 2.3.3-1
+- Update to version 2.3.3.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-0.12.b01
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-0.11.b01
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-0.10.b01
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.2-0.9.b01
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

generate_tarball.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-baseurl="https://svn.java.net/svn/jsp~svn/tags/"
-pkgname="javax.servlet.jsp-api"
-
-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}/

sources

@@ -1,3 +0,0 @@
-SHA512 (javax.servlet.jsp-api-2.3.2-b01.tar.xz) = 1e6c2b1c8455ae5a07741d5f1829895ee1eab80da03b035b7f902245389bfcec50b62ccf6bd1b898feb2d52dee220b7e199ad7deb862630e4a0450e9b813f6eb
-SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8
-SHA512 (LICENSE.html) = 176884e014c4bd0ecc002b0d3dc9a720ba1fa2fe1ca58afbcf9021faaa113bdaaac737e402ad881eab54816c1f5a366673bf46a541c7af2e723fb25768479126