From 16586a78f0cf4d163ccc4248c8567e9a9abb0f433c6edf9f4b219990394f6857 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 8 Nov 2019 10:41:46 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=11 --- jetty-minimal.changes | 1 + jetty-minimal.spec | 42 ++++++++++++------------- jetty-websocket-websocket-api-1.1.patch | 28 ----------------- jetty-websocket.spec | 20 ++++++------ 4 files changed, 32 insertions(+), 59 deletions(-) delete mode 100644 jetty-websocket-websocket-api-1.1.patch diff --git a/jetty-minimal.changes b/jetty-minimal.changes index 08320b1..bcbf5be 100644 --- a/jetty-minimal.changes +++ b/jetty-minimal.changes @@ -7,6 +7,7 @@ Fri Nov 8 06:52:36 UTC 2019 - Fridrich Strba * jetty-annotations-asm6.patch + adapt to changed context + build against asm6 instead of asm7 that we don't have +- Fix some rpmlint warnings and errors ------------------------------------------------------------------- Tue Nov 5 15:39:31 UTC 2019 - Fridrich Strba diff --git a/jetty-minimal.spec b/jetty-minimal.spec index ce66442..cecb665 100644 --- a/jetty-minimal.spec +++ b/jetty-minimal.spec @@ -27,7 +27,6 @@ License: Apache-2.0 OR EPL-1.0 URL: https://www.eclipse.org/jetty/ Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz Patch0: jetty-annotations-asm6.patch -Patch1: jetty-websocket-websocket-api-1.1.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(javax.annotation:javax.annotation-api) @@ -62,122 +61,122 @@ This package contains %{desc} %package -n %{base_name}-annotations -Summary: annotations module for Jetty +Summary: The annotations module for Jetty %description -n %{base_name}-annotations %{extdesc} %{summary}. %package -n %{base_name}-client -Summary: client module for Jetty +Summary: The client module for Jetty %description -n %{base_name}-client %{extdesc} %{summary}. %package -n %{base_name}-continuation -Summary: continuation module for Jetty +Summary: The continuation module for Jetty %description -n %{base_name}-continuation %{extdesc} %{summary}. %package -n %{base_name}-http -Summary: http module for Jetty +Summary: The http module for Jetty %description -n %{base_name}-http %{extdesc} %{summary}. %package -n %{base_name}-http-spi -Summary: http-spi module for Jetty +Summary: The http-spi module for Jetty %description -n %{base_name}-http-spi %{extdesc} %{summary}. %package -n %{base_name}-io -Summary: io module for Jetty +Summary: The io module for Jetty %description -n %{base_name}-io %{extdesc} %{summary}. %package -n %{base_name}-jaas -Summary: jaas module for Jetty +Summary: The jaas module for Jetty %description -n %{base_name}-jaas %{extdesc} %{summary}. %package -n %{base_name}-jndi -Summary: jndi module for Jetty +Summary: The jndi module for Jetty %description -n %{base_name}-jndi %{extdesc} %{summary}. %package -n %{base_name}-jsp -Summary: jsp module for Jetty +Summary: The jsp module for Jetty Requires: glassfish-el %description -n %{base_name}-jsp %{extdesc} %{summary}. %package -n %{base_name}-security -Summary: security module for Jetty +Summary: The security module for Jetty %description -n %{base_name}-security %{extdesc} %{summary}. %package -n %{base_name}-openid -Summary: openid module for Jetty +Summary: The openid module for Jetty %description -n %{base_name}-openid %{extdesc} %{summary}. %package -n %{base_name}-server -Summary: server module for Jetty +Summary: The server module for Jetty %description -n %{base_name}-server %{extdesc} %{summary}. %package -n %{base_name}-servlet -Summary: servlet module for Jetty +Summary: The servlet module for Jetty %description -n %{base_name}-servlet %{extdesc} %{summary}. %package -n %{base_name}-util -Summary: util module for Jetty +Summary: The util module for Jetty %description -n %{base_name}-util %{extdesc} %{summary}. %package -n %{base_name}-util-ajax -Summary: util-ajax module for Jetty +Summary: The util-ajax module for Jetty %description -n %{base_name}-util-ajax %{extdesc} %{summary}. %package -n %{base_name}-webapp -Summary: webapp module for Jetty +Summary: The webapp module for Jetty %description -n %{base_name}-webapp %{extdesc} %{summary}. %package -n %{base_name}-jmx -Summary: jmx module for Jetty +Summary: The jmx module for Jetty %description -n %{base_name}-jmx %{extdesc} %{summary}. %package -n %{base_name}-xml -Summary: xml module for Jetty +Summary: The xml module for Jetty %description -n %{base_name}-xml %{extdesc} %{summary}. %package -n %{base_name}-plus -Summary: plus module for Jetty +Summary: The plus module for Jetty %description -n %{base_name}-plus %{extdesc} %{summary}. %package -n %{base_name}-proxy -Summary: proxy module for Jetty +Summary: The proxy module for Jetty %description -n %{base_name}-proxy %{extdesc} %{summary}. @@ -192,7 +191,6 @@ Summary: Javadoc for %{name} %setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver} %patch0 -p1 -%patch1 -p1 find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \; diff --git a/jetty-websocket-websocket-api-1.1.patch b/jetty-websocket-websocket-api-1.1.patch deleted file mode 100644 index 5e019d0..0000000 --- a/jetty-websocket-websocket-api-1.1.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- jetty.project-jetty-9.4.22.v20191022/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSession.java 2019-11-08 08:24:57.576221260 +0100 -+++ jetty.project-jetty-9.4.22.v20191022/jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/JsrSession.java 2019-11-08 08:24:09.291930696 +0100 -@@ -33,6 +33,8 @@ - import javax.websocket.EndpointConfig; - import javax.websocket.Extension; - import javax.websocket.MessageHandler; -+import javax.websocket.MessageHandler.Partial; -+import javax.websocket.MessageHandler.Whole; - import javax.websocket.RemoteEndpoint.Async; - import javax.websocket.RemoteEndpoint.Basic; - import javax.websocket.Session; -@@ -94,6 +96,16 @@ - this.messageHandlerSet = new HashSet<>(); - } - -+ public void addMessageHandler(Class clazz, Partial handler) throws IllegalStateException -+ { -+ throw new IllegalStateException("Unimplemented addMessageHandler(Class clazz, Partial handler)"); -+ } -+ -+ public void addMessageHandler(Class clazz, Whole handler) throws IllegalStateException -+ { -+ throw new IllegalStateException("Unimplemented addMessageHandler(Class clazz, Whole handler)"); -+ } -+ - @Override - public void addMessageHandler(MessageHandler handler) throws IllegalStateException - { diff --git a/jetty-websocket.spec b/jetty-websocket.spec index 2a272c6..649b5b7 100644 --- a/jetty-websocket.spec +++ b/jetty-websocket.spec @@ -27,8 +27,10 @@ License: Apache-2.0 OR EPL-1.0 URL: https://www.eclipse.org/jetty/ Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_name}-%{version}%{addver}.tar.gz Patch0: jetty-annotations-asm6.patch -Patch1: jetty-websocket-websocket-api-1.1.patch BuildRequires: fdupes +# Multiple providers, chose the 1.0 one over 1.1, since +# the relevant artifacts assume the API version 1.0 +BuildRequires: jboss-websocket-1.0-api BuildRequires: maven-local BuildRequires: mvn(javax.servlet:javax.servlet-api) BuildRequires: mvn(javax.websocket:javax.websocket-api) @@ -44,6 +46,7 @@ BuildRequires: mvn(org.eclipse.jetty:jetty-server) >= %{version} BuildRequires: mvn(org.eclipse.jetty:jetty-servlet) >= %{version} BuildRequires: mvn(org.eclipse.jetty:jetty-util) >= %{version} BuildRequires: mvn(org.eclipse.jetty:jetty-xml) >= %{version} +Requires: jboss-websocket-1.0-api BuildArch: noarch # jp_minimal doesn't have main package @@ -61,43 +64,43 @@ Jetty is available on all Java supported platforms. This package contains the websocket modules for Jetty %package -n %{base_name}-websocket-api -Summary: websocket-api module for Jetty +Summary: The websocket-api module for Jetty %description -n %{base_name}-websocket-api %{extdesc} %{summary}. %package -n %{base_name}-websocket-client -Summary: websocket-client module for Jetty +Summary: The The websocket-client module for Jetty %description -n %{base_name}-websocket-client %{extdesc} %{summary}. %package -n %{base_name}-websocket-common -Summary: websocket-common module for Jetty +Summary: The websocket-common module for Jetty %description -n %{base_name}-websocket-common %{extdesc} %{summary}. %package -n %{base_name}-websocket-server -Summary: websocket-server module for Jetty +Summary: The websocket-server module for Jetty %description -n %{base_name}-websocket-server %{extdesc} %{summary}. %package -n %{base_name}-websocket-servlet -Summary: websocket-servlet module for Jetty +Summary: The websocket-servlet module for Jetty %description -n %{base_name}-websocket-servlet %{extdesc} %{summary}. %package -n %{base_name}-javax-websocket-client-impl -Summary: javax-websocket-client-impl module for Jetty +Summary: The javax-websocket-client-impl module for Jetty %description -n %{base_name}-javax-websocket-client-impl %{extdesc} %{summary}. %package -n %{base_name}-javax-websocket-server-impl -Summary: javax-websocket-server-impl module for Jetty +Summary: The javax-websocket-server-impl module for Jetty %description -n %{base_name}-javax-websocket-server-impl %{extdesc} %{summary}. @@ -112,7 +115,6 @@ Summary: Javadoc for %{name} %setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver} %patch0 -p1 -%patch1 -p1 find . -name "*.?ar" -exec rm {} \; find . -name "*.class" -exec rm {} \;