11
0

12 Commits

Author SHA256 Message Date
6043595c2a 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
2025-07-22 10:54:18 +00:00
d0da90073d OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-bundle-plugin?expand=0&rev=17 2025-07-21 14:21:07 +00:00
d28309c92d OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-bundle-plugin?expand=0&rev=16 2025-07-17 05:34:12 +00:00
8765a05312 OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-bundle-plugin?expand=0&rev=15 2025-07-17 04:42:10 +00:00
0f58b5cc6a OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-bundle-plugin?expand=0&rev=14 2025-06-23 20:55:18 +00:00
e8c59dfee2 Accepting request 1208218 from Java:packages
Build against maven-doxia 2.0.0+

OBS-URL: https://build.opensuse.org/request/show/1208218
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-bundle-plugin?expand=0&rev=4
2024-10-16 21:46:55 +00:00
fef7f06f50 OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-bundle-plugin?expand=0&rev=12 2024-10-03 10:27:56 +00:00
f7311d0ee6 Accepting request 1205008 from Java:packages:test
move out of test

OBS-URL: https://build.opensuse.org/request/show/1205008
OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-bundle-plugin?expand=0&rev=11
2024-10-01 22:40:05 +00:00
4ff0005513 OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-bundle-plugin?expand=0&rev=10 2024-09-30 20:00:30 +00:00
6c733c7cba OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-bundle-plugin?expand=0&rev=9 2024-09-30 20:00:07 +00:00
c431f82c55 Accepting request 1202686 from Java:packages
switch on reproducible also with SOURCE_DATE_EPOCH in the plugin

OBS-URL: https://build.opensuse.org/request/show/1202686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-bundle-plugin?expand=0&rev=3
2024-09-24 15:32:41 +00:00
af96e505e9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-bundle-plugin?expand=0&rev=7 2024-09-23 09:43:26 +00:00
3 changed files with 10 additions and 15 deletions

View File

@@ -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>

View File

@@ -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

View File

@@ -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" );
}