From e1b3b7442e432ea64b5fbbdd114158a6c88f4e9bbdee89660bddee0f98dfd643 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 8 Nov 2019 06:55:28 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jetty-minimal?expand=0&rev=9 --- jetty-9.4.19.v20190610.tar.gz | 3 -- jetty-9.4.22.v20191022.tar.gz | 3 ++ jetty-annotations-asm6.patch | 10 +++---- jetty-minimal.changes | 10 +++++++ jetty-minimal.spec | 54 ++++++++++++++++------------------- 5 files changed, 43 insertions(+), 37 deletions(-) delete mode 100644 jetty-9.4.19.v20190610.tar.gz create mode 100644 jetty-9.4.22.v20191022.tar.gz diff --git a/jetty-9.4.19.v20190610.tar.gz b/jetty-9.4.19.v20190610.tar.gz deleted file mode 100644 index 27e7471..0000000 --- a/jetty-9.4.19.v20190610.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:320b6741aee16710e3139a7a09b5eb3f7ec1af5b251e2472056e6856f3231ebe -size 18947159 diff --git a/jetty-9.4.22.v20191022.tar.gz b/jetty-9.4.22.v20191022.tar.gz new file mode 100644 index 0000000..258c8c6 --- /dev/null +++ b/jetty-9.4.22.v20191022.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d37a4cbc1e321542d5ba3d5f2307c6214032d370a16955db19dc0aea2b7cc3b6 +size 19203205 diff --git a/jetty-annotations-asm6.patch b/jetty-annotations-asm6.patch index 40fdfd7..b4b8ceb 100644 --- a/jetty-annotations-asm6.patch +++ b/jetty-annotations-asm6.patch @@ -1,6 +1,6 @@ ---- jetty.project-jetty-9.4.19.v20190610/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java 2019-06-10 18:17:56.000000000 +0200 -+++ jetty.project-jetty-9.4.19.v20190610/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java 2019-10-04 15:08:54.874014725 +0200 -@@ -69,8 +69,8 @@ +--- jetty.project-jetty-9.4.22.v20191022/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java 2019-10-22 15:20:50.000000000 +0200 ++++ jetty.project-jetty-9.4.22.v20191022/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java 2019-11-07 17:07:33.334457334 +0100 +@@ -71,8 +71,8 @@ public class AnnotationParser { private static final Logger LOG = Log.getLogger(AnnotationParser.class); @@ -8,10 +8,10 @@ - private static final String ASM_OPCODE_VERSION_STR = "ASM7"; + private static final int ASM_OPCODE_VERSION = Opcodes.ASM6; //compatibility of api + private static final String ASM_OPCODE_VERSION_STR = "ASM6"; - + /** * Map of classnames scanned and the first location from which scan occurred -@@ -115,11 +115,6 @@ +@@ -118,11 +118,6 @@ asmVersion = Opcodes.ASM6; break; } diff --git a/jetty-minimal.changes b/jetty-minimal.changes index 885c0c4..08320b1 100644 --- a/jetty-minimal.changes +++ b/jetty-minimal.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Nov 8 06:52:36 UTC 2019 - Fridrich Strba + +- Upgrade to upstream version 2.9.22.v20191022 + * new jetty-openid amd jetty-util-ajax sub-packages +- Modified patch: + * jetty-annotations-asm6.patch + + adapt to changed context + + build against asm6 instead of asm7 that we don't have + ------------------------------------------------------------------- Tue Nov 5 15:39:31 UTC 2019 - Fridrich Strba diff --git a/jetty-minimal.spec b/jetty-minimal.spec index 8a365df..2baadb1 100644 --- a/jetty-minimal.spec +++ b/jetty-minimal.spec @@ -18,9 +18,9 @@ %global base_name jetty -%global addver .v20190610 +%global addver .v20191022 Name: %{base_name}-minimal -Version: 9.4.19 +Version: 9.4.22 Release: 0 Summary: Java Webserver and Servlet Container License: Apache-2.0 OR EPL-1.0 @@ -29,18 +29,18 @@ Source0: https://github.com/eclipse/%{base_name}.project/archive/%{base_n Patch0: jetty-annotations-asm6.patch BuildRequires: fdupes BuildRequires: maven-local +BuildRequires: mvn(javax.annotation:javax.annotation-api) BuildRequires: mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(javax.transaction:javax.transaction-api) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(javax.transaction:javax.transaction-api) -BuildRequires: mvn(javax.annotation:javax.annotation-api) -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.ow2.asm:asm) -BuildRequires: mvn(org.ow2.asm:asm-commons) BuildRequires: mvn(org.apache.tomcat:tomcat-jasper) BuildRequires: mvn(org.apache.tomcat:tomcat-util-scan) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.eclipse.jetty.toolchain:jetty-schemas) +BuildRequires: mvn(org.ow2.asm:asm) +BuildRequires: mvn(org.ow2.asm:asm-commons) +BuildRequires: mvn(org.slf4j:slf4j-api) BuildArch: noarch %description @@ -62,64 +62,54 @@ This package contains %package -n %{base_name}-annotations Summary: annotations module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-annotations %{extdesc} %{summary}. %package -n %{base_name}-client Summary: client module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-client %{extdesc} %{summary}. %package -n %{base_name}-continuation Summary: continuation module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-continuation %{extdesc} %{summary}. %package -n %{base_name}-http Summary: http module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-http %{extdesc} %{summary}. %package -n %{base_name}-http-spi Summary: http-spi module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-http-spi %{extdesc} %{summary}. %package -n %{base_name}-io Summary: io module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-io %{extdesc} %{summary}. %package -n %{base_name}-jaas Summary: jaas module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-jaas %{extdesc} %{summary}. %package -n %{base_name}-jndi Summary: jndi module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-jndi %{extdesc} %{summary}. - %package -n %{base_name}-jsp Summary: jsp module for Jetty -License: Apache-2.0 OR EPL-1.0 Requires: glassfish-el %description -n %{base_name}-jsp @@ -127,70 +117,72 @@ Requires: glassfish-el %package -n %{base_name}-security Summary: security module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-security %{extdesc} %{summary}. +%package -n %{base_name}-openid +Summary: openid module for Jetty + +%description -n %{base_name}-openid +%{extdesc} %{summary}. + %package -n %{base_name}-server Summary: server module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-server %{extdesc} %{summary}. %package -n %{base_name}-servlet Summary: servlet module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-servlet %{extdesc} %{summary}. %package -n %{base_name}-util Summary: util module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-util %{extdesc} %{summary}. +%package -n %{base_name}-util-ajax +Summary: util-ajax module for Jetty + +%description -n %{base_name}-util-ajax +%{extdesc} %{summary}. + %package -n %{base_name}-webapp Summary: webapp module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-webapp %{extdesc} %{summary}. %package -n %{base_name}-jmx Summary: jmx module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-jmx %{extdesc} %{summary}. %package -n %{base_name}-xml Summary: xml module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-xml %{extdesc} %{summary}. %package -n %{base_name}-plus Summary: plus module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-plus %{extdesc} %{summary}. %package -n %{base_name}-proxy Summary: proxy module for Jetty -License: Apache-2.0 OR EPL-1.0 %description -n %{base_name}-proxy %{extdesc} %{summary}. %package javadoc Summary: Javadoc for %{name} -License: Apache-2.0 OR EPL-1.0 %description javadoc %{summary}. @@ -317,7 +309,6 @@ sed -i '/