diff --git a/maven-source-plugin.changes b/maven-source-plugin.changes index 8ea4b96..fd1934c 100644 --- a/maven-source-plugin.changes +++ b/maven-source-plugin.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 21 14:40:41 UTC 2025 - Fridrich Strba + +- Removed patch: + * reproducible-from-environment.patch + + patched in a more central place in maven-archiver + ------------------------------------------------------------------- Tue Sep 24 09:38:55 UTC 2024 - Fridrich Strba diff --git a/maven-source-plugin.spec b/maven-source-plugin.spec index b5e7d44..e968861 100644 --- a/maven-source-plugin.spec +++ b/maven-source-plugin.spec @@ -1,7 +1,7 @@ # # spec file for package maven-source-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 @@ -24,7 +24,6 @@ License: Apache-2.0 Group: Development/Libraries/Java URL: https://maven.apache.org/plugins/maven-source-plugin/ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip -Patch0: reproducible-from-environment.patch BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: maven-local @@ -54,7 +53,6 @@ API documentation for %{name}. %prep %setup -q -%patch -P 0 -p1 %{mvn_file} : %{name} diff --git a/reproducible-from-environment.patch b/reproducible-from-environment.patch deleted file mode 100644 index 4cd4a33..0000000 --- a/reproducible-from-environment.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urEbwB maven-source-plugin-3.3.1.orig/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java maven-source-plugin-3.3.1/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java ---- maven-source-plugin-3.3.1.orig/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java 2024-09-24 08:52:01.065274036 +0200 -+++ maven-source-plugin-3.3.1/src/main/java/org/apache/maven/plugins/source/AbstractSourceJarMojo.java 2024-09-24 08:52:08.211989382 +0200 -@@ -390,6 +390,14 @@ - archiver.setCreatedBy("Maven Source Plugin", "org.apache.maven.plugins", "maven-source-plugin"); - archiver.setBuildJdkSpecDefaultEntry(false); - -+ if ( outputTimestamp == null || -+ outputTimestamp.length() < 1 || -+ ( ( outputTimestamp.length() == 1 ) -+ && !Character.isDigit( outputTimestamp.charAt(0) ) ) ) -+ { -+ outputTimestamp = System.getenv("SOURCE_DATE_EPOCH"); -+ } -+ - // configure for Reproducible Builds based on outputTimestamp value - archiver.configureReproducibleBuild(outputTimestamp); -