From: @caodongxia Reviewed-by: @cherry530 Signed-off-by: @cherry530
This commit is contained in:
openeuler-ci-bot
Gitee
commit
f9239175a8
@ -1,58 +0,0 @@
|
||||
From d3374c65f5473ab8aefbdd355235884babef9e69 Mon Sep 17 00:00:00 2001
|
||||
From: wang--ge <wang__ge@126.com>
|
||||
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 @@
|
||||
<url>http://java.net/projects/glassfish/sources/svn/show/tags/javax.servlet-api-3.1.0</url>
|
||||
</scm>
|
||||
|
||||
+ <dependencies>
|
||||
+ <dependency>
|
||||
+ <groupId>jakarta.servlet</groupId>
|
||||
+ <artifactId>jakarta.servlet-api</artifactId>
|
||||
+ <version>5.0.0</version>
|
||||
+ </dependency>
|
||||
+ </dependencies>
|
||||
+
|
||||
<build>
|
||||
<plugins>
|
||||
+ <plugin>
|
||||
+ <groupId>org.apache.maven.plugins</groupId>
|
||||
+ <artifactId>maven-dependency-plugin</artifactId>
|
||||
+ <version>3.0.2</version>
|
||||
+ <executions>
|
||||
+ <execution>
|
||||
+ <phase>prepare-package</phase>
|
||||
+ <goals>
|
||||
+ <goal>copy</goal>
|
||||
+ </goals>
|
||||
+ <configuration>
|
||||
+ <artifactItems>
|
||||
+ <artifactItem>
|
||||
+ <groupId>jakarta.servlet</groupId>
|
||||
+ <artifactId>jakarta.servlet-api</artifactId>
|
||||
+ <version>5.0.0</version>
|
||||
+ <overWrite>false</overWrite>
|
||||
+ <outputDirectory>${project.build.directory}</outputDirectory>
|
||||
+ <destFileName></destFileName>
|
||||
+ </artifactItem>
|
||||
+ </artifactItems>
|
||||
+ </configuration>
|
||||
+ </execution>
|
||||
+ </executions>
|
||||
+ </plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>2.0.2</version>
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@ -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 '/<dependencies>/,+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 <wang__ge@126.com> - 3.1.0-18
|
||||
- Add third part dependency
|
||||
|
||||
* Mon Nov 14 2022 wulei <wulei80@h-partners.com> - 3.1.0-17
|
||||
- Updating the source code package
|
||||
|
||||
|
||||
@ -1,438 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!--
|
||||
|
||||
Copyright (c) 1997, 2020 Oracle and/or its affiliates and others.
|
||||
All rights reserved.
|
||||
|
||||
This program and the accompanying materials are made available under the
|
||||
terms of the Eclipse Public License v. 2.0, which is available at
|
||||
http://www.eclipse.org/legal/epl-2.0.
|
||||
|
||||
This Source Code may also be made available under the following Secondary
|
||||
Licenses when the conditions for such availability set forth in the
|
||||
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
|
||||
version 2 with the GNU Classpath Exception, which is available at
|
||||
https://www.gnu.org/software/classpath/license.html.
|
||||
|
||||
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
||||
|
||||
-->
|
||||
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<parent>
|
||||
<groupId>org.eclipse.ee4j</groupId>
|
||||
<artifactId>project</artifactId>
|
||||
<version>1.0.6</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
|
||||
<groupId>jakarta.servlet</groupId>
|
||||
<artifactId>jakarta.servlet-api</artifactId>
|
||||
<version>5.0.0</version>
|
||||
|
||||
<name>Jakarta Servlet</name>
|
||||
<url>https://projects.eclipse.org/projects/ee4j.servlet</url>
|
||||
<licenses>
|
||||
<license>
|
||||
<name>EPL 2.0</name>
|
||||
<url>http://www.eclipse.org/legal/epl-2.0</url>
|
||||
<distribution>repo</distribution>
|
||||
</license>
|
||||
<license>
|
||||
<name>GPL2 w/ CPE</name>
|
||||
<url>https://www.gnu.org/software/classpath/license.html</url>
|
||||
<distribution>repo</distribution>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>yaminikb</id>
|
||||
<name>Yamini K B</name>
|
||||
<organization>Oracle Corporation</organization>
|
||||
<organizationUrl>http://www.oracle.com/</organizationUrl>
|
||||
</developer>
|
||||
</developers>
|
||||
<contributors>
|
||||
<contributor>
|
||||
<name>Ed Burns</name>
|
||||
</contributor>
|
||||
<contributor>
|
||||
<name>Shing Wai Chan</name>
|
||||
</contributor>
|
||||
</contributors>
|
||||
|
||||
<mailingLists>
|
||||
<mailingList>
|
||||
<name>Servlet mailing list</name>
|
||||
<post>servlet-dev@eclipse.org</post>
|
||||
<subscribe>https://dev.eclipse.org/mailman/listinfo/servlet-dev</subscribe>
|
||||
<unsubscribe>https://dev.eclipse.org/mailman/listinfo/servlet-dev</unsubscribe>
|
||||
<archive>https://dev.eclipse.org/mhonarc/lists/servlet-dev</archive>
|
||||
</mailingList>
|
||||
</mailingLists>
|
||||
|
||||
<scm>
|
||||
<connection>scm:git:https://github.com/eclipse-ee4j/servlet-api.git</connection>
|
||||
<developerConnection>scm:git:git@github.com:eclipse-ee4j/servlet-api.git</developerConnection>
|
||||
<url>https://github.com/eclipse-ee4j/servlet-api</url>
|
||||
<tag>HEAD</tag>
|
||||
</scm>
|
||||
<issueManagement>
|
||||
<system>github</system>
|
||||
<url>https://github.com/eclipse-ee4j/servlet-api/issues</url>
|
||||
</issueManagement>
|
||||
|
||||
<build>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>src/main/java</directory>
|
||||
<includes>
|
||||
<include>**/*.properties</include>
|
||||
<include>**/*.html</include>
|
||||
</includes>
|
||||
</resource>
|
||||
<resource>
|
||||
<directory>src/main/resources</directory>
|
||||
<excludes>
|
||||
<exclude>META-INF/README</exclude>
|
||||
</excludes>
|
||||
</resource>
|
||||
</resources>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>net.revelc.code.formatter</groupId>
|
||||
<artifactId>formatter-maven-plugin</artifactId>
|
||||
<version>2.11.0</version>
|
||||
<configuration>
|
||||
<configFile>${project.basedir}/etc/config/ee4j-eclipse-formatting.xml</configFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>net.revelc.code</groupId>
|
||||
<artifactId>impsort-maven-plugin</artifactId>
|
||||
<version>1.4.1</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
<plugins>
|
||||
<!-- Sets minimal Maven version to 3.5.4 -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-enforcer-plugin</artifactId>
|
||||
<version>3.0.0-M3</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>enforce-maven</id>
|
||||
<goals>
|
||||
<goal>enforce</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<rules>
|
||||
<requireMavenVersion>
|
||||
<version>3.5.4</version>
|
||||
</requireMavenVersion>
|
||||
</rules>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- Restricts the Java version to 1.8 -->
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.1</version>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<target>1.8</target>
|
||||
<compilerArgument>-Xlint:all</compilerArgument>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Checks copyright / license headers -->
|
||||
<plugin>
|
||||
<groupId>org.glassfish.copyright</groupId>
|
||||
<artifactId>glassfish-copyright-maven-plugin</artifactId>
|
||||
<version>2.3</version>
|
||||
<configuration>
|
||||
<excludeFile>etc/config/copyright-exclude</excludeFile>
|
||||
<!--svn|mercurial|git - defaults to svn-->
|
||||
<scm>git</scm>
|
||||
<!-- turn on/off debugging -->
|
||||
<debug>off</debug>
|
||||
<!-- skip files not under SCM-->
|
||||
<scmOnly>true</scmOnly>
|
||||
<!-- turn off warnings -->
|
||||
<warn>true</warn>
|
||||
<!-- for use with repair -->
|
||||
<update>false</update>
|
||||
<!-- check that year is correct -->
|
||||
<ignoreYear>false</ignoreYear>
|
||||
<templateFile>etc/config/copyright.txt</templateFile>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!--
|
||||
spec-version-maven-plugin would normally appear here.
|
||||
But somehow is missing for Servlet.
|
||||
-->
|
||||
|
||||
<!-- Creates the OSGi MANIFEST.MF file -->
|
||||
<plugin>
|
||||
<groupId>org.apache.felix</groupId>
|
||||
<artifactId>maven-bundle-plugin</artifactId>
|
||||
<version>4.2.1</version>
|
||||
<configuration>
|
||||
<supportedProjectTypes>
|
||||
<supportedProjectType>jar</supportedProjectType>
|
||||
</supportedProjectTypes>
|
||||
<instructions>
|
||||
<Bundle-Version>5.0.0</Bundle-Version>
|
||||
<Bundle-SymbolicName>jakarta.servlet-api</Bundle-SymbolicName>
|
||||
<Bundle-Description>
|
||||
Jakarta Servlet 5.0
|
||||
</Bundle-Description>
|
||||
<Extension-Name>jakarta.servlet</Extension-Name>
|
||||
<Specification-Version>5.0</Specification-Version>
|
||||
<Specification-Vendor>Eclipse Foundation</Specification-Vendor>
|
||||
<Implementation-Version>${project.version}</Implementation-Version>
|
||||
<Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
|
||||
<Implementation-Vendor-Id>org.eclipse</Implementation-Vendor-Id>
|
||||
<Export-Package>jakarta.servlet.*</Export-Package>
|
||||
</instructions>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>bundle-manifest</id>
|
||||
<phase>process-classes</phase>
|
||||
<goals>
|
||||
<goal>manifest</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!-- Adds the manifest file created by the org.apache.felix:maven-bundle-plugin -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
|
||||
<manifestEntries>
|
||||
<Automatic-Module-Name>jakarta.servlet</Automatic-Module-Name>
|
||||
</manifestEntries>
|
||||
</archive>
|
||||
<excludes>
|
||||
<exclude>**/*.java</exclude>
|
||||
</excludes>
|
||||
</configuration>
|
||||
</plugin>
|
||||
|
||||
<!-- Creates the source jar -->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>3.0.1</version>
|
||||
<configuration>
|
||||
<includePom>true</includePom>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-sources</id>
|
||||
<goals>
|
||||
<goal>jar-no-fork</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<!--
|
||||
Create Javadoc for API jar
|
||||
-->
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.2.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>attach-api-javadocs</id>
|
||||
<goals>
|
||||
<goal>jar</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<source>1.8</source>
|
||||
<additionalJOption>-Xdoclint:none</additionalJOption>
|
||||
<description>Jakarta Servlet API documentation</description>
|
||||
<doctitle>Jakarta Servlet API documentation</doctitle>
|
||||
<windowtitle>Jakarta Servlet API documentation</windowtitle>
|
||||
<header><![CDATA[<br>Jakarta Servlet API v${project.version}]]></header>
|
||||
<bottom><![CDATA[
|
||||
Comments to: <a href="mailto:servlet-dev@eclipse.org">servlet-dev@eclipse.org</a>.<br>
|
||||
Copyright © 2019, 2020 Eclipse Foundation. All rights reserved.<br>
|
||||
Use is subject to <a href="{@docRoot}/doc-files/speclicense.html" target="_top">license terms</a>.]]>
|
||||
</bottom>
|
||||
<docfilessubdirs>true</docfilessubdirs>
|
||||
<groups>
|
||||
<group>
|
||||
<title>Jakarta Servlet API Documentation</title>
|
||||
<packages>
|
||||
jakarta.servlet.*
|
||||
</packages>
|
||||
</group>
|
||||
</groups>
|
||||
<tags>
|
||||
<tag>
|
||||
<name>implSpec</name>
|
||||
<placement>a</placement>
|
||||
<head>Implementation Requirements:</head>
|
||||
</tag>
|
||||
<tag>
|
||||
<name>param</name>
|
||||
</tag>
|
||||
<tag>
|
||||
<name>return</name>
|
||||
</tag>
|
||||
<tag>
|
||||
<name>throws</name>
|
||||
</tag>
|
||||
<tag>
|
||||
<name>since</name>
|
||||
</tag>
|
||||
<tag>
|
||||
<name>version</name>
|
||||
</tag>
|
||||
<tag>
|
||||
<name>serialData</name>
|
||||
</tag>
|
||||
<tag>
|
||||
<name>factory</name>
|
||||
</tag>
|
||||
<tag>
|
||||
<name>see</name>
|
||||
</tag>
|
||||
</tags>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>build-helper-maven-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>add-resource</id>
|
||||
<phase>generate-resources</phase>
|
||||
<goals>
|
||||
<goal>add-resource</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>${maven.multiModuleProjectDirectory}</directory>
|
||||
<targetPath>META-INF</targetPath>
|
||||
<includes>
|
||||
<include>LICENSE.md</include>
|
||||
<include>NOTICE.md</include>
|
||||
</includes>
|
||||
</resource>
|
||||
</resources>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>format</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
<property>
|
||||
<name>!validate-format</name>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>net.revelc.code.formatter</groupId>
|
||||
<artifactId>formatter-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>process-sources</phase>
|
||||
<goals>
|
||||
<goal>format</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>net.revelc.code</groupId>
|
||||
<artifactId>impsort-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<removeUnused>true</removeUnused>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>sort-imports</id>
|
||||
<goals>
|
||||
<goal>sort</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
<profile>
|
||||
<id>validate</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
<property>
|
||||
<name>validate-format</name>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>net.revelc.code.formatter</groupId>
|
||||
<artifactId>formatter-maven-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>process-sources</phase>
|
||||
<goals>
|
||||
<goal>validate</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>net.revelc.code</groupId>
|
||||
<artifactId>impsort-maven-plugin</artifactId>
|
||||
<configuration>
|
||||
<removeUnused>true</removeUnused>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>check-imports</id>
|
||||
<goals>
|
||||
<goal>check</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
</profiles>
|
||||
</project>
|
||||
Loading…
x
Reference in New Issue
Block a user