Accepting request 888573 from Java:packages

Fix build breakage

OBS-URL: https://build.opensuse.org/request/show/888573
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-artifact-transfer?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2021-04-27 19:34:24 +00:00 committed by Git OBS Bridge
commit 07531b5b9f
3 changed files with 29 additions and 1 deletions

View File

@ -0,0 +1,19 @@
--- maven-artifact-transfer-0.11.0/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java 2019-02-24 20:59:10.000000000 +0100
+++ maven-artifact-transfer-0.11.0/src/main/java/org/apache/maven/shared/transfer/dependencies/collect/internal/Maven31ArtifactRepositoryAdapter.java 2021-04-26 19:37:43.495274547 +0200
@@ -206,6 +206,16 @@
throw new UnsupportedOperationException();
}
+ public void setBlocked( boolean blocked )
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ public boolean isBlocked()
+ {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public String toString()
{

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Apr 26 14:57:21 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* maven-artifact-transfer-blocked.patch
+ Fix build against newer maven
-------------------------------------------------------------------
Thu Nov 21 18:59:34 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package maven-artifact-transfer
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -27,6 +27,7 @@ URL: http://maven.apache.org/shared/maven-artifact-transfer
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source1: %{name}-build.xml
Patch0: 0001-Compatibility-with-Maven-3.0.3-and-later.patch
Patch1: %{name}-blocked.patch
BuildRequires: ant
BuildRequires: apache-commons-cli
BuildRequires: apache-commons-codec
@ -75,6 +76,7 @@ This package provides %{summary}.
%setup -q
cp %{SOURCE1} build.xml
%patch0 -p1
%patch1 -p1
%pom_remove_plugin :maven-shade-plugin
%pom_remove_plugin :apache-rat-plugin