pool/maven-plugin-bundle
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 961134 from Java:packages

Browse Source 
Fix build against the new reporting api

OBS-URL: https://build.opensuse.org/request/show/961134
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-plugin-bundle?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2022-03-11 20:41:23 +00:00 committed by Git OBS Bridge
commit 9b15900814
3 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
maven-plugin-bundle.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 11 19:15:17 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* new-reporting-api.patch
+ fix building with the new maven-reporting-api
-------------------------------------------------------------------
Sun Nov 24 17:27:56 UTC 2019 - Fridrich Strba <fstrba@suse.com>

6
maven-plugin-bundle.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package maven-plugin-bundle
#
# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,7 +26,7 @@ Summary: Maven Bundle Plugin
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://felix.apache.org
Source0: http://repo2.maven.org/maven2/org/apache/felix/%{site_name}/%{version}/%{site_name}-%{version}-source-release.tar.gz
Source0: https://repo1.maven.org/maven2/org/apache/felix/%{site_name}/%{version}/%{site_name}-%{version}-source-release.tar.gz
# Needs polishing to be sent upstream
Patch0: 0001-Port-to-current-maven-dependency-tree.patch
# New maven-archiver removed some deprecated methods we were using
@ -35,6 +35,7 @@ Patch1: 0002-Fix-for-new-maven-archiver.patch
Patch2: 0003-Port-to-plexus-utils-3.0.24.patch
# Port to newer Maven
Patch3: 0004-Use-Maven-3-APIs.patch
Patch4: new-reporting-api.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib)
@ -80,6 +81,7 @@ API documentation for %{name}.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
find -name '*.jar' -delete

15
new-reporting-api.patch Normal file
View File

@ -0,0 +1,15 @@
--- maven-bundle-plugin-5.1.1/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java 2020-07-09 18:44:18.000000000 +0200
+++ maven-bundle-plugin-5.1.1/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java 2022-03-11 07:46:59.951664164 +0100
@@ -324,6 +324,12 @@
return !skip && outputDirectory != null;
}
+ public void generate( org.apache.maven.doxia.sink.Sink sink, Locale locale )
+ throws MavenReportException
+ {
+ generate( (org.codehaus.doxia.sink.Sink) sink, locale );
+ }
+
public void generate( @SuppressWarnings( "deprecation" ) org.codehaus.doxia.sink.Sink sink, Locale locale )
throws MavenReportException
{