Hello community,
here is the log from the commit of package jetty-minimal for openSUSE:Factory
checked in at 2019-11-10 22:42:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jetty-minimal (Old)
and /work/SRC/openSUSE:Factory/.jetty-minimal.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jetty-minimal"
Sun Nov 10 22:42:51 2019 rev:2 rq:747070 version:9.4.22
Changes:
--------
--- /work/SRC/openSUSE:Factory/jetty-minimal/jetty-minimal.changes
2019-11-07 23:17:32.328601303 +0100
+++ /work/SRC/openSUSE:Factory/.jetty-minimal.new.2990/jetty-minimal.changes
2019-11-10 22:42:53.225514869 +0100
@@ -1,0 +2,11 @@
+Fri Nov 8 06:52:36 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- 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
+- Fix some rpmlint warnings and errors
+
+-------------------------------------------------------------------
New Changes file:
--- /dev/null 2019-10-24 10:19:07.066239389 +0200
+++ /work/SRC/openSUSE:Factory/.jetty-minimal.new.2990/jetty-websocket.changes
2019-11-10 22:42:53.289514951 +0100
@@ -0,0 +1,5 @@
+-------------------------------------------------------------------
+Fri Nov 8 10:42:50 UTC 2019 - Fridrich Strba <fst...@suse.com>
+
+- Initial packaging of the websocket submodules of jetty
+ 9.4.22.v20191022
Old:
----
jetty-9.4.19.v20190610.tar.gz
New:
----
jetty-9.4.22.v20191022.tar.gz
jetty-websocket.changes
jetty-websocket.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jetty-minimal.spec ++++++
--- /var/tmp/diff_new_pack.ebSNLX/_old 2019-11-10 22:42:54.661516732 +0100
+++ /var/tmp/diff_new_pack.ebSNLX/_new 2019-11-10 22:42:54.661516732 +0100
@@ -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 @@
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
@@ -61,136 +61,128 @@
%{desc}
%package -n %{base_name}-annotations
-Summary: annotations module for Jetty
-License: Apache-2.0 OR EPL-1.0
+Summary: The annotations module for Jetty
%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
+Summary: The client module for Jetty
%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
+Summary: The continuation module for Jetty
%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
+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
-License: Apache-2.0 OR EPL-1.0
+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
-License: Apache-2.0 OR EPL-1.0
+Summary: The io module for Jetty
%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
+Summary: The jaas module for Jetty
%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
+Summary: The jndi module for Jetty
%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
+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
-License: Apache-2.0 OR EPL-1.0
+Summary: The security module for Jetty
%description -n %{base_name}-security
%{extdesc} %{summary}.
+%package -n %{base_name}-openid
+Summary: The 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
+Summary: The server module for Jetty
%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
+Summary: The servlet module for Jetty
%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
+Summary: The util module for Jetty
%description -n %{base_name}-util
%{extdesc} %{summary}.
+%package -n %{base_name}-util-ajax
+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
-License: Apache-2.0 OR EPL-1.0
+Summary: The webapp module for Jetty
%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
+Summary: The jmx module for Jetty
%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
+Summary: The xml module for Jetty
%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
+Summary: The plus module for Jetty
%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
+Summary: The proxy module for Jetty
%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 @@
%pom_disable_module jetty-fcgi
%pom_disable_module jetty-websocket
%pom_disable_module jetty-servlets
-%pom_disable_module jetty-util-ajax
%pom_disable_module apache-jstl
%pom_disable_module jetty-maven-plugin
%pom_disable_module jetty-jspc-maven-plugin
@@ -360,6 +351,7 @@
%{mvn_package} org.eclipse.jetty.tests: __noinstall
%{mvn_package} ::war: __noinstall
%{mvn_package} :jetty-runner __noinstall
+%{mvn_package} :build-resources __noinstall
%{mvn_package} org.eclipse.jetty.cdi: jetty-cdi
@@ -391,12 +383,16 @@
%files -n %{base_name}-io -f .mfiles-jetty-io
+%files -n %{base_name}-openid -f .mfiles-jetty-openid
+
%files -n %{base_name}-server -f .mfiles-jetty-server
%files -n %{base_name}-servlet -f .mfiles-jetty-servlet
%files -n %{base_name}-util -f .mfiles-jetty-util
+%files -n %{base_name}-util-ajax -f .mfiles-jetty-util-ajax
+
%files -n %{base_name}-webapp -f .mfiles-jetty-webapp
%files -n %{base_name}-jmx -f .mfiles-jetty-jmx
++++++ jetty-websocket.spec ++++++
#
# spec file for package jetty
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2007, JPackage Project
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%global base_name jetty
%global addver .v20191022
Name: %{base_name}-websocket
Version: 9.4.22
Release: 0
Summary: The websocket modules for Jetty
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
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)
BuildRequires: mvn(javax.websocket:javax.websocket-client-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(org.eclipse.jetty:jetty-annotations) >= %{version}
BuildRequires: mvn(org.eclipse.jetty:jetty-client) >= %{version}
BuildRequires: mvn(org.eclipse.jetty:jetty-http) >= %{version}
BuildRequires: mvn(org.eclipse.jetty:jetty-io) >= %{version}
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
%description
Jetty is a 100% Java HTTP Server and Servlet Container. This means that you\
do not need to configure and run a separate web server (like Apache) in order\
to use Java, servlets and JSPs to generate dynamic content. Jetty is a fully\
featured web server for static and dynamic content. Unlike separate\
server/container solutions, this means that your web server and web\
application run in the same process, without interconnection overheads\
and complications. Furthermore, as a pure java component, Jetty can be simply\
included in your application for demonstration, distribution or deployment.\
Jetty is available on all Java supported platforms.
This package contains the websocket modules for Jetty
%package -n %{base_name}-websocket-api
Summary: The websocket-api module for Jetty
%description -n %{base_name}-websocket-api
%{extdesc} %{summary}.
%package -n %{base_name}-websocket-client
Summary: The The websocket-client module for Jetty
%description -n %{base_name}-websocket-client
%{extdesc} %{summary}.
%package -n %{base_name}-websocket-common
Summary: The websocket-common module for Jetty
%description -n %{base_name}-websocket-common
%{extdesc} %{summary}.
%package -n %{base_name}-websocket-server
Summary: The websocket-server module for Jetty
%description -n %{base_name}-websocket-server
%{extdesc} %{summary}.
%package -n %{base_name}-websocket-servlet
Summary: The websocket-servlet module for Jetty
%description -n %{base_name}-websocket-servlet
%{extdesc} %{summary}.
%package -n %{base_name}-javax-websocket-client-impl
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: The javax-websocket-server-impl module for Jetty
%description -n %{base_name}-javax-websocket-server-impl
%{extdesc} %{summary}.
%package javadoc
Summary: Javadoc for %{name}
%description javadoc
%{summary}.
%prep
%setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver}
%patch0 -p1
find . -name "*.?ar" -exec rm {} \;
find . -name "*.class" -exec rm {} \;
# Plugins irrelevant or harmful to building the package
%pom_remove_plugin -r :findbugs-maven-plugin
%pom_remove_plugin -r :maven-enforcer-plugin
%pom_remove_plugin -r :clirr-maven-plugin
%pom_remove_plugin -r :maven-eclipse-plugin
%pom_remove_plugin -r :maven-pmd-plugin
%pom_remove_plugin -r :license-maven-plugin
%pom_remove_plugin -r :maven-site-plugin
%pom_remove_plugin -r :maven-source-plugin
%pom_remove_plugin -r :maven-deploy-plugin
%pom_remove_plugin -r :jacoco-maven-plugin
%pom_remove_plugin -r :maven-release-plugin
%pom_remove_plugin -r :buildnumber-maven-plugin
%pom_remove_plugin -r :h2spec-maven-plugin
# Unnecessary pom flattening can be skipped
%pom_remove_plugin -r :flatten-maven-plugin jetty-bom
%pom_disable_module aggregates/jetty-all
# Use proper groupId for apache ant
%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_change_dep -r org.mortbay.jasper:apache-jsp org.apache.tomcat:tomcat-jasper
%pom_add_dep 'org.junit.jupiter:junit-jupiter-engine:${junit.version}'
tests/test-sessions/test-sessions-common
# Old version of jetty not available for tests, so use this version
%pom_change_dep 'org.eclipse.jetty:jetty-util'
'org.eclipse.jetty:jetty-util:${project.version}'
tests/test-webapps/test-servlet-spec/test-spec-webapp
# provided by glassfish-jsp-api that has newer version
%pom_change_dep -r javax.servlet.jsp:jsp-api
javax.servlet.jsp:javax.servlet.jsp-api
# txt artifact - not installable
%pom_remove_plugin ":jetty-version-maven-plugin"
%pom_xpath_remove "pom:artifactItem[pom:classifier='version']" jetty-home
# Disable building source release
%pom_xpath_remove 'pom:execution[pom:id="sources"]' jetty-home
# Unwanted JS in javadoc
sed -i '/^\s*\*.*<script>/d'
jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
# only used for integration tests
%pom_remove_plugin :maven-invoker-plugin jetty-jspc-maven-plugin
# These bundles have a dep on Eclipse that is not available on every arch
%pom_disable_module jetty-osgi
# We don't have asciidoctor-maven-plugin
%pom_disable_module jetty-documentation
%pom_remove_dep -r :jetty-documentation
%pom_xpath_remove 'pom:execution[pom:id="unpack-documentation"]'
jetty-distribution
%pom_xpath_remove 'pom:artifactItem[pom:artifactId="libsetuid-osx"]'
jetty-home/pom.xml
# TODO remove when jetty-setuid is packaged
%pom_xpath_remove "pom:execution[pom:id[text()='copy-setuid-deps']]"
jetty-home/pom.xml
# We don't have gcloud-java-datastore in Fedora
%pom_disable_module jetty-gcloud
%pom_disable_module test-gcloud-sessions tests/test-sessions
%pom_remove_dep :jetty-gcloud-session-manager jetty-home
# we don't have com.googlecode.xmemcached:xmemcached yet
%pom_disable_module jetty-memcached
%pom_disable_module test-memcached-sessions tests/test-sessions
%pom_remove_dep :jetty-memcached-sessions jetty-home
# Hazelcast in Fedora is too old to build against
%pom_disable_module jetty-hazelcast
%pom_disable_module test-hazelcast-sessions tests/test-sessions
%pom_remove_dep :jetty-hazelcast jetty-home
# Infinispan in Fedora is too old to build against
%pom_disable_module jetty-infinispan
%pom_disable_module test-infinispan-sessions tests/test-sessions
%pom_remove_dep :infinispan-embedded jetty-home
%pom_remove_dep :infinispan-embedded-query jetty-home
%pom_remove_dep :infinispan-remote jetty-home
%pom_remove_dep :infinispan-remote-query jetty-home
%pom_xpath_remove "pom:execution[pom:id='unpack-infinispan-config']" jetty-home
# Not currently able to build tests, so can't build benchmarks
%pom_disable_module jetty-jmh
# Distribution tests require internet access, so disable
%pom_disable_module test-distribution tests
# missing conscrypt
%pom_disable_module jetty-alpn-conscrypt-server jetty-alpn
%pom_disable_module jetty-alpn-conscrypt-client jetty-alpn
%pom_remove_dep -r :jetty-alpn-conscrypt-server
%pom_remove_dep -r :jetty-alpn-conscrypt-client
rm -fr
examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
# the default location is not allowed by SELinux
sed -i '/<SystemProperty name="jetty.state"/d' \
jetty-home/src/main/resources%{_sysconfdir}/jetty-started.xml
# remote-resources only copies about.html
%pom_remove_plugin :maven-remote-resources-plugin
# packages module configs, we don't need those in minimal
%pom_remove_plugin -r :maven-assembly-plugin
# only useful when tests are enabled (copies test deps)
%pom_remove_plugin :maven-dependency-plugin jetty-client
# all modules besides the current jetty-websocket
%pom_disable_module jetty-ant
%pom_disable_module jetty-http2
%pom_disable_module jetty-fcgi
%pom_disable_module jetty-servlets
%pom_disable_module apache-jstl
%pom_disable_module jetty-maven-plugin
%pom_disable_module jetty-jspc-maven-plugin
%pom_disable_module jetty-deploy
%pom_disable_module jetty-start
%pom_disable_module jetty-cdi
%pom_disable_module jetty-spring
%pom_disable_module jetty-jaspi
%pom_disable_module jetty-rewrite
%pom_disable_module jetty-nosql
%pom_disable_module jetty-unixsocket
%pom_disable_module tests
%pom_disable_module examples
%pom_disable_module jetty-quickstart
%pom_disable_module jetty-distribution
%pom_disable_module jetty-runner
%pom_disable_module jetty-http-spi
%pom_disable_module jetty-alpn
%pom_disable_module jetty-home
# minimal modules built in jetty-minimal package
%pom_disable_module jetty-annotations
%pom_disable_module jetty-client
%pom_disable_module jetty-continuation
%pom_disable_module jetty-http
%pom_disable_module jetty-io
%pom_disable_module jetty-jaas
%pom_disable_module jetty-jmx
%pom_disable_module jetty-jndi
%pom_disable_module apache-jsp
%pom_disable_module jetty-openid
%pom_disable_module jetty-plus
%pom_disable_module jetty-proxy
%pom_disable_module jetty-security
%pom_disable_module jetty-server
%pom_disable_module jetty-servlet
%pom_disable_module jetty-util
%pom_disable_module jetty-util-ajax
%pom_disable_module jetty-xml
%pom_disable_module jetty-webapp
%mvn_file :{*} %{base_name}/@1
%build
%{mvn_package} :jetty-home __noinstall
%{mvn_package} :jetty-distribution __noinstall
# Separate package for POMs
%{mvn_package} ':*-project' __noinstall
%{mvn_package} ':*-parent' __noinstall
%{mvn_package} ':*-bom' __noinstall
# artifact used by demo
%{mvn_package} :test-mock-resources
%{mvn_package} ':test-*' __noinstall
%{mvn_package} ':*-tests' __noinstall
%{mvn_package} ':*-it' __noinstall
%{mvn_package} ':example-*' __noinstall
%{mvn_package} org.eclipse.jetty.tests: __noinstall
%{mvn_package} ::war: __noinstall
%{mvn_package} :jetty-runner __noinstall
%{mvn_package} :build-resources __noinstall
%{mvn_package} org.eclipse.jetty.cdi: jetty-cdi
%{mvn_package} ':jetty-alpn*-client' jetty-alpn-client
%{mvn_package} ':jetty-alpn*-server' jetty-alpn-server
%{mvn_package} :apache-jsp jetty-jsp
%{mvn_alias} :apache-jsp :jetty-jsp
# we don't have all necessary dependencies to run tests
# missing test dep: org.eclipse.jetty.toolchain:jetty-perf-helper
%{mvn_build} -f -s
%install
%mvn_install
%fdupes -s %{buildroot}%{_javadocdir}
%files -n %{base_name}-websocket-api -f .mfiles-websocket-api
%files -n %{base_name}-websocket-client -f .mfiles-websocket-client
%files -n %{base_name}-websocket-common -f .mfiles-websocket-common
%files -n %{base_name}-websocket-server -f .mfiles-websocket-server
%files -n %{base_name}-websocket-servlet -f .mfiles-websocket-servlet
%files -n %{base_name}-javax-websocket-client-impl -f
.mfiles-javax-websocket-client-impl
%files -n %{base_name}-javax-websocket-server-impl -f
.mfiles-javax-websocket-server-impl
%files javadoc -f .mfiles-javadoc
%license LICENSE NOTICE.txt
%changelog
++++++ jetty-9.4.19.v20190610.tar.gz -> jetty-9.4.22.v20191022.tar.gz ++++++
/work/SRC/openSUSE:Factory/jetty-minimal/jetty-9.4.19.v20190610.tar.gz
/work/SRC/openSUSE:Factory/.jetty-minimal.new.2990/jetty-9.4.22.v20191022.tar.gz
differ: char 13, line 1
++++++ jetty-annotations-asm6.patch ++++++
--- /var/tmp/diff_new_pack.ebSNLX/_old 2019-11-10 22:42:54.697516779 +0100
+++ /var/tmp/diff_new_pack.ebSNLX/_new 2019-11-10 22:42:54.697516779 +0100
@@ -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;
}
