packages/jetty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change dependence: replace jetty-alpn with openjdk-1.8.0

Browse Source
This commit is contained in:
wang_yue111 2020-11-10 16:48:29 +08:00
parent d660a4f041
commit 6c9547ac1e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty.spec
View File

@ -12,7 +12,7 @@
%bcond_with jp_minimal %bcond_with jp_minimal
Name: jetty Name: jetty
Version: 9.4.15 Version: 9.4.15
Release: 3 Release: 4
Summary: Java Webserver and Servlet Container Summary: Java Webserver and Servlet Container
License: ASL 2.0 or EPL-1.0 License: ASL 2.0 or EPL-1.0
URL: http://www.eclipse.org/jetty/ URL: http://www.eclipse.org/jetty/
@ -65,13 +65,14 @@ BuildRequires: mvn(org.jboss.weld.servlet:weld-servlet-core)
BuildRequires: mvn(org.mongodb:mongo-java-driver) mvn(org.ow2.asm:asm) BuildRequires: mvn(org.mongodb:mongo-java-driver) mvn(org.ow2.asm:asm)
BuildRequires: mvn(org.ow2.asm:asm-commons) mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.ow2.asm:asm-commons) mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.springframework:spring-beans) BuildRequires: mvn(org.springframework:spring-beans)
BuildRequires: mvn(org.mortbay.jetty.alpn:alpn-boot) BuildRequires: java-1.8.0-openjdk-headless java-1.8.0-openjdk
BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-artifact-remote-resources)
BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-distribution-remote-resources) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-distribution-remote-resources)
BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-policy) maven-javadoc-plugin BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-policy) maven-javadoc-plugin
BuildRequires: glassfish-el systemd junit5 BuildRequires: glassfish-el systemd junit5
BuildRequires: jboss-websocket-1.0-api BuildRequires: jboss-websocket-1.0-api
Requires: jboss-websocket-1.0-api Requires: jboss-websocket-1.0-api
Requires: java-1.8.0-openjdk-headless
%endif # without jp_minimal %endif # without jp_minimal
BuildArch: noarch BuildArch: noarch
%if %{without jp_minimal} %if %{without jp_minimal}
@ -462,6 +463,10 @@ find . -name "*.class" -exec rm {} \;
%pom_remove_plugin -r :buildnumber-maven-plugin %pom_remove_plugin -r :buildnumber-maven-plugin
%pom_remove_plugin -r :h2spec-maven-plugin %pom_remove_plugin -r :h2spec-maven-plugin
%pom_remove_plugin -r :flatten-maven-plugin jetty-bom %pom_remove_plugin -r :flatten-maven-plugin jetty-bom
%pom_remove_plugin -r :maven-dependency-plugin jetty-http2/http2-http-client-transport
%pom_remove_plugin -r :maven-dependency-plugin jetty-http2/http2-alpn-tests
%pom_remove_plugin -r :maven-dependency-plugin tests/test-http-client-transport
%pom_remove_plugin -r :maven-dependency-plugin tests/test-webapps/test-http2-webapp
%pom_disable_module aggregates/jetty-all %pom_disable_module aggregates/jetty-all
%pom_xpath_replace "pom:groupId[text()='ant']" "<groupId>org.apache.ant</groupId>" jetty-ant/pom.xml %pom_xpath_replace "pom:groupId[text()='ant']" "<groupId>org.apache.ant</groupId>" jetty-ant/pom.xml
%pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi %pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi
@ -774,6 +779,9 @@ exit 0
%license LICENSE NOTICE.txt LICENSE-MIT %license LICENSE NOTICE.txt LICENSE-MIT
%changelog %changelog
* Tue Nov 10 2020 wangyue <wangyue92@huawei.com> - 9.4.15-4
- Change dependence: replace jetty-alpn with openjdk-1.8.0
* Fri Sep 12 2020 chengzihan2 <chengzihan2@huawei.com> - 9.4.15-3 * Fri Sep 12 2020 chengzihan2 <chengzihan2@huawei.com> - 9.4.15-3
- disable jp_minimal - disable jp_minimal