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,10 @@
+-------------------------------------------------------------------
+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>
 

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
@@ -25,7 +25,6 @@ Group:          Development/Libraries/Java
 URL:            https://felix.apache.org
 Source0:        https://repo1.maven.org/maven2/org/apache/felix/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz
 Patch0:         new-reporting-api.patch
-Patch1:         reproducible-from-environment.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  mvn(biz.aQute.bnd:biz.aQute.bndlib)
@@ -70,7 +69,6 @@ API documentation for %{name}.
 %prep
 %setup -q
 %patch -P 0 -p1
-%patch -P 1 -p1
 
 find -name '*.jar' -delete
 
@@ -78,12 +76,13 @@ 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}
     -Dmaven.compiler.release=8 \
 %endif
-    -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date +%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
     -Dsource=8
 
 %install

reproducible-from-environment.patch

@@ -1,11 +0,0 @@
---- 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" );
-         }