Accepting request 751538 from Java:packages
remove obsolete patch OBS-URL: https://build.opensuse.org/request/show/751538 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jetty-minimal?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
32ec8e7578
@ -1,25 +0,0 @@
|
||||
--- 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);
|
||||
- private static final int ASM_OPCODE_VERSION = Opcodes.ASM7; //compatibility of api
|
||||
- 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
|
||||
@@ -118,11 +118,6 @@
|
||||
asmVersion = Opcodes.ASM6;
|
||||
break;
|
||||
}
|
||||
- case 7:
|
||||
- {
|
||||
- asmVersion = Opcodes.ASM7;
|
||||
- break;
|
||||
- }
|
||||
default:
|
||||
{
|
||||
LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR);
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 28 09:02:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Removed patch:
|
||||
* jetty-annotations-asm6.patch
|
||||
+ not needed when building against ASM7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 8 06:52:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package jetty
|
||||
# spec file for package jetty-minimal
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LLC
|
||||
# Copyright (c) 2000-2007, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -26,7 +26,6 @@ Summary: Java Webserver and Servlet Container
|
||||
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
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(javax.annotation:javax.annotation-api)
|
||||
@ -190,8 +189,6 @@ Summary: Javadoc for %{name}
|
||||
%prep
|
||||
%setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver}
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
find . -name "*.?ar" -exec rm {} \;
|
||||
find . -name "*.class" -exec rm {} \;
|
||||
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
Thu Nov 28 09:02:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Removed patch:
|
||||
* jetty-annotations-asm6.patch
|
||||
+ not needed when building against ASM7
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 8 10:42:50 UTC 2019 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package jetty
|
||||
# spec file for package jetty-websocket
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2019 SUSE LLC
|
||||
# Copyright (c) 2000-2007, JPackage Project
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@ -26,7 +26,6 @@ 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
|
||||
@ -114,8 +113,6 @@ Summary: Javadoc for %{name}
|
||||
%prep
|
||||
%setup -q -n %{base_name}.project-%{base_name}-%{version}%{addver}
|
||||
|
||||
%patch0 -p1
|
||||
|
||||
find . -name "*.?ar" -exec rm {} \;
|
||||
find . -name "*.class" -exec rm {} \;
|
||||
|
||||
@ -180,7 +177,7 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
|
||||
# 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
|
||||
# We don't have gcloud-java-datastore
|
||||
%pom_disable_module jetty-gcloud
|
||||
%pom_disable_module test-gcloud-sessions tests/test-sessions
|
||||
%pom_remove_dep :jetty-gcloud-session-manager jetty-home
|
||||
@ -190,12 +187,12 @@ sed -i '/^\s*\*.*<script>/d' jetty-util/src/main/java/org/eclipse/jetty/util/res
|
||||
%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
|
||||
# We don't have hazelcast
|
||||
%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
|
||||
# We don't have infinispan
|
||||
%pom_disable_module jetty-infinispan
|
||||
%pom_disable_module test-infinispan-sessions tests/test-sessions
|
||||
%pom_remove_dep :infinispan-embedded jetty-home
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user