diff --git a/add-third-party-dependencies.patch b/add-third-party-dependencies.patch deleted file mode 100644 index 04b8190..0000000 --- a/add-third-party-dependencies.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d3374c65f5473ab8aefbdd355235884babef9e69 Mon Sep 17 00:00:00 2001 -From: wang--ge -Date: Tue, 7 Nov 2023 10:24:36 +0800 -Subject: [PATCH] add third party dependencies - ---- - pom.xml | 33 +++++++++++++++++++++++++++++++++ - 1 file changed, 33 insertions(+) - -diff --git a/pom.xml b/pom.xml -index 3d0169b..901652c 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -123,8 +123,41 @@ - http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-3.1.0 - - -+ -+ -+ jakarta.servlet -+ jakarta.servlet-api -+ 5.0.0 -+ -+ -+ - - -+ -+ org.apache.maven.plugins -+ maven-dependency-plugin -+ 3.0.2 -+ -+ -+ prepare-package -+ -+ copy -+ -+ -+ -+ -+ jakarta.servlet -+ jakarta.servlet-api -+ 5.0.0 -+ false -+ ${project.build.directory} -+ -+ -+ -+ -+ -+ -+ - - maven-compiler-plugin - 2.0.2 --- -2.33.0 - diff --git a/glassfish-servlet-api.spec b/glassfish-servlet-api.spec index 0db2cc9..329034c 100644 --- a/glassfish-servlet-api.spec +++ b/glassfish-servlet-api.spec @@ -1,22 +1,15 @@ Name: glassfish-servlet-api Version: 3.1.0 -Release: 18 +Release: 17 Summary: API of Java Servlet License: (CDDL-1.1 OR GPL-2.0-with-classpath-exception) AND Apache-2.0 URL: http://servlet-spec.java.net Source0: https://github.com/javaee/servlet-spec/archive/%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -Source2: https://repo.maven.apache.org/maven2/jakarta/servlet/jakarta.servlet-api/5.0.0/jakarta.servlet-api-5.0.0.pom -Patch0: add-third-party-dependencies.patch BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 jvnet-parent maven-local maven-plugin-bundle maven-source-plugin -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.eclipse.aether:aether-connector-basic) -BuildRequires: mvn(org.eclipse.aether:aether-transport-wagon) -BuildRequires: mvn(org.apache.maven.wagon:wagon-http) -BuildRequires: mvn(org.apache.maven.wagon:wagon-provider-api) %description Java Servlets is a JCP Standard technology for interacting with the web on the Java EE platform. @@ -44,16 +37,10 @@ cp -p %{SOURCE1} . %mvn_alias : javax.servlet:servlet-api %mvn_alias : org.apache.geronimo.specs:geronimo-servlet_3.0_spec %mvn_alias : org.eclipse.jetty.orbit:javax.servlet -%mvn_build -b -sed -i '//,+6 d' .xmvn-reactor +%mvn_build %install %mvn_install -install -d -m 0755 %{buildroot}%{_javadir}/jakarta-servlet -install -d -m 0755 %{buildroot}%{_mavenpomdir} -install -pm 0644 target/jakarta.servlet-api-5.0.0.jar %{buildroot}%{_javadir}/jakarta-servlet/jakarta.servlet-api.jar -install -pm 0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/jakarta.servlet-api.pom -%add_maven_depmap jakarta.servlet-api.pom jakarta-servlet/jakarta.servlet-api.jar %files %doc src/main/resources/META-INF/README @@ -65,9 +52,6 @@ install -pm 0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/jakarta.servlet-api.pom %_javadocdir/%{name} %changelog -* Tue Nov 07 2023 Ge Wang - 3.1.0-18 -- Add third part dependency - * Mon Nov 14 2022 wulei - 3.1.0-17 - Updating the source code package diff --git a/jakarta.servlet-api-5.0.0.pom b/jakarta.servlet-api-5.0.0.pom deleted file mode 100644 index d3c1e33..0000000 --- a/jakarta.servlet-api-5.0.0.pom +++ /dev/null @@ -1,438 +0,0 @@ - - - - - 4.0.0 - - - org.eclipse.ee4j - project - 1.0.6 - - - - jakarta.servlet - jakarta.servlet-api - 5.0.0 - - Jakarta Servlet - https://projects.eclipse.org/projects/ee4j.servlet - - - EPL 2.0 - http://www.eclipse.org/legal/epl-2.0 - repo - - - GPL2 w/ CPE - https://www.gnu.org/software/classpath/license.html - repo - - - - - - yaminikb - Yamini K B - Oracle Corporation - http://www.oracle.com/ - - - - - Ed Burns - - - Shing Wai Chan - - - - - - Servlet mailing list - servlet-dev@eclipse.org - https://dev.eclipse.org/mailman/listinfo/servlet-dev - https://dev.eclipse.org/mailman/listinfo/servlet-dev - https://dev.eclipse.org/mhonarc/lists/servlet-dev - - - - - scm:git:https://github.com/eclipse-ee4j/servlet-api.git - scm:git:git@github.com:eclipse-ee4j/servlet-api.git - https://github.com/eclipse-ee4j/servlet-api - HEAD - - - github - https://github.com/eclipse-ee4j/servlet-api/issues - - - - - - src/main/java - - **/*.properties - **/*.html - - - - src/main/resources - - META-INF/README - - - - - - - net.revelc.code.formatter - formatter-maven-plugin - 2.11.0 - - ${project.basedir}/etc/config/ee4j-eclipse-formatting.xml - - - - net.revelc.code - impsort-maven-plugin - 1.4.1 - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 3.0.0-M3 - - - enforce-maven - - enforce - - - - - 3.5.4 - - - - - - - - - - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - -Xlint:all - - - - - - org.glassfish.copyright - glassfish-copyright-maven-plugin - 2.3 - - etc/config/copyright-exclude - - git - - off - - true - - true - - false - - false - etc/config/copyright.txt - - - - - - - - org.apache.felix - maven-bundle-plugin - 4.2.1 - - - jar - - - 5.0.0 - jakarta.servlet-api - - Jakarta Servlet 5.0 - - jakarta.servlet - 5.0 - Eclipse Foundation - ${project.version} - ${project.organization.name} - org.eclipse - jakarta.servlet.* - - - - - bundle-manifest - process-classes - - manifest - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - jakarta.servlet - - - - **/*.java - - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - true - - - - attach-sources - - jar-no-fork - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.2.0 - - - attach-api-javadocs - - jar - - - 1.8 - -Xdoclint:none - Jakarta Servlet API documentation - Jakarta Servlet API documentation - Jakarta Servlet API documentation -
Jakarta Servlet API v${project.version}]]>
- servlet-dev@eclipse.org.
-Copyright © 2019, 2020 Eclipse Foundation. All rights reserved.
-Use is subject to license terms.]]> - - true - - - Jakarta Servlet API Documentation - - jakarta.servlet.* - - - - - - implSpec - a - Implementation Requirements: - - - param - - - return - - - throws - - - since - - - version - - - serialData - - - factory - - - see - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - 3.1.0 - - - add-resource - generate-resources - - add-resource - - - - - ${maven.multiModuleProjectDirectory} - META-INF - - LICENSE.md - NOTICE.md - - - - - - - - - - - - - - - format - - true - - !validate-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - format - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - sort-imports - - sort - - - - - - - - - validate - - true - - validate-format - - - - - - net.revelc.code.formatter - formatter-maven-plugin - - - process-sources - - validate - - - - - - net.revelc.code - impsort-maven-plugin - - true - - - - check-imports - - check - - - - - - - - - -