Accepting request 1294858 from Java:packages

reproducible: another solution

OBS-URL: https://build.opensuse.org/request/show/1294858
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-bundle-plugin?expand=0&rev=5

maven-bundle-plugin.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Mon Jul 21 14:19:23 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Removed patch:
+  * reproducible-from-environment.patch
+    + patched in a more central place in maven-archiver
+
+-------------------------------------------------------------------
+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>
 

maven-bundle-plugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-bundle-plugin
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,7 +31,7 @@ BuildRequires:  mvn(biz.aQute.bnd:biz.aQute.bndlib)
 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.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.plugin-tools:maven-plugin-annotations)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
@@ -76,6 +76,8 @@ find -name '*.jar' -delete
 
 %pom_remove_plugin :maven-invoker-plugin
 
+%pom_xpath_remove pom:project/pom:parent/pom:relativePath
+
 %build
 %{mvn_build} -f -- \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}

new-reporting-api.patch

@@ -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;
      }
  
+-    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 )
-+        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
      {
+         final Context ctx = new Context();