From 65742201361c109f674721e3a17a429b22132b15 Mon Sep 17 00:00:00 2001
From: wang_yue111 <648774160@qq.com>
Date: Fri, 13 Nov 2020 15:46:13 +0800
Subject: [PATCH] Change dependence: replace jetty-alpn with openjdk-1.8.0
---
jetty.spec | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/jetty.spec b/jetty.spec
index a991119..6bb83d6 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -14,7 +14,7 @@
%bcond_with spring
Name: jetty
Version: 9.4.15
-Release: 4
+Release: 5
Summary: Java Webserver and Servlet Container
License: ASL 2.0 or EPL-1.0
URL: http://www.eclipse.org/jetty/
@@ -67,13 +67,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.ow2.asm:asm-commons) mvn(org.slf4j:slf4j-api)
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-distribution-remote-resources)
BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-test-policy) maven-javadoc-plugin
BuildRequires: glassfish-el systemd junit5
BuildRequires: jboss-websocket-1.0-api
Requires: jboss-websocket-1.0-api
+Requires: java-1.8.0-openjdk-headless
%endif # without jp_minimal
BuildArch: noarch
%if %{without jp_minimal}
@@ -474,6 +475,10 @@ find . -name "*.class" -exec rm {} \;
%pom_remove_plugin -r :buildnumber-maven-plugin
%pom_remove_plugin -r :h2spec-maven-plugin
%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_xpath_replace "pom:groupId[text()='ant']" "org.apache.ant" jetty-ant/pom.xml
%pom_remove_dep "com.sun.net.httpserver:http" jetty-http-spi
@@ -798,6 +803,9 @@ exit 0
%license LICENSE NOTICE.txt LICENSE-MIT
%changelog
+* Fri Nov 13 2020 wangyue - 9.4.15-5
+- Change dependence: replace jetty-alpn with openjdk-1.8.0
+
* Mon Sep 21 2020 huanghaitao - 9.4.15-4
- disable infinispan and spring
--
Gitee