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

Sync from SUSE:SLFO:Main maven-bundle-plugin revision 0cc56e0764a9e2e4a4717970e010b0ce

Browse Source
This commit is contained in:
Adrian Schröter 2025-02-20 09:50:35 +01:00
parent 501c1b69bc
commit 3513672465
4 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
maven-bundle-plugin.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Thu Oct 3 10:26:07 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Build against maven-doxia >= 2.0.0
- Modified patch:
* new-reporting-api.patch
+ adapt to the maven-doxia 2.0.0 APIs
-------------------------------------------------------------------
Mon Sep 23 09:42:01 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use SOURCE_DATE_EPOCH for reproducible builds
- Added patch:
* reproducible-from-environment.patch
+ SOURCE_DATE_EPOCH environmental variable triggers reproducible
use of the maven-bundle-plugin if it is not requested already
using the project.build.outputTimestamp option.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Feb 21 10:49:57 UTC 2024 - Gus Kenion <gus.kenion@suse.com> Wed Feb 21 10:49:57 UTC 2024 - Gus Kenion <gus.kenion@suse.com>

5
maven-bundle-plugin.spec
View File

@ -25,13 +25,14 @@ Group: Development/Libraries/Java
URL: https://felix.apache.org URL: https://felix.apache.org
Source0: https://repo1.maven.org/maven2/org/apache/felix/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz Source0: https://repo1.maven.org/maven2/org/apache/felix/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz
Patch0: new-reporting-api.patch Patch0: new-reporting-api.patch
Patch1: reproducible-from-environment.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib)
BuildRequires: mvn(org.apache.felix:felix-parent:pom:) BuildRequires: mvn(org.apache.felix:felix-parent:pom:)
BuildRequires: mvn(org.apache.felix:org.apache.felix.bundlerepository) BuildRequires: mvn(org.apache.felix:org.apache.felix.bundlerepository)
BuildRequires: mvn(org.apache.felix:org.apache.felix.utils) BuildRequires: mvn(org.apache.felix:org.apache.felix.utils)
BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) BuildRequires: mvn(org.apache.maven.doxia:doxia-sink-api) >= 2.0.0
BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer)
BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
@ -69,6 +70,7 @@ API documentation for %{name}.
%prep %prep
%setup -q %setup -q
%patch -P 0 -p1 %patch -P 0 -p1
%patch -P 1 -p1
find -name '*.jar' -delete find -name '*.jar' -delete
@ -81,6 +83,7 @@ find -name '*.jar' -delete
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=8 \ -Dmaven.compiler.release=8 \
%endif %endif
-Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
-Dsource=8 -Dsource=8
%install %install

14
new-reporting-api.patch
View File

@ -1,15 +1,11 @@
--- 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.9/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java 2024-09-30 22:01:52.149300507 +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 +++ maven-bundle-plugin-5.1.9/src/main/java/org/apache/felix/bundleplugin/baseline/BaselineReport.java 2024-09-30 22:03:05.556458439 +0200
@@ -324,6 +324,12 @@ @@ -324,7 +324,7 @@
return !skip && outputDirectory != null; return !skip && outputDirectory != null;
} }
- public void generate( @SuppressWarnings( "deprecation" ) org.codehaus.doxia.sink.Sink sink, Locale locale )
+ public void generate( org.apache.maven.doxia.sink.Sink sink, Locale locale ) + 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 throws MavenReportException
{ {
final Context ctx = new Context();

11
reproducible-from-environment.patch Normal file
View File

@ -0,0 +1,11 @@
--- maven-bundle-plugin-5.1.9/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java 2024-09-23 11:31:10.426888887 +0200
+++ maven-bundle-plugin-5.1.9/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java 2024-09-23 11:35:04.561855048 +0200
@@ -551,7 +551,7 @@
properties.putAll( getDefaultProperties( currentProject ) );
properties.putAll( transformDirectives( originalInstructions ) );
- if ( new MavenArchiver().parseOutputTimestamp( outputTimestamp ) != null )
+ if ( new MavenArchiver().parseOutputTimestamp( outputTimestamp ) != null || System.getenv( "SOURCE_DATE_EPOCH" ) != null )
{
properties.put( Constants.REPRODUCIBLE, "true" );
}