Accepting request 1202357 from Java:packages

reproducible labels order

OBS-URL: https://build.opensuse.org/request/show/1202357
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/antlr3?expand=0&rev=9

antlr3.changes

@@ -1,12 +1,3 @@
--------------------------------------------------------------------
-Mon Jun 23 14:42:09 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Added patch:
-  * duplicate-dependency.patch
-    + de-duplicate a dependency
-    + duplicate dependency is fatal with maven 4 that is more
-      strict
-
 -------------------------------------------------------------------
 Sat Sep 21 11:04:46 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

antlr3.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package antlr3
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -39,7 +39,6 @@ Patch0:         antlr3-java8-fix.patch
 Patch1:         antlr3-osgi-manifest.patch
 Patch2:         reproducible-order.patch
 Patch3:         reproducible-timestamp.patch
-Patch4:         duplicate-dependency.patch
 Patch100:       antlr3-generated_sources.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
@@ -135,7 +134,6 @@ sed -i "s,\${buildNumber},`date -u -d@${SOURCE_DATE_EPOCH:-$(date +%%s)}`," tool
 %patch -P 1
 %patch -P 2 -p1
 %patch -P 3 -p1
-%patch -P 4 -p1
 
 # remove pre-built artifacts
 find -type f -a -name *.jar -delete
@@ -187,6 +185,7 @@ sed -i 's/jsr14/1.8/' antlr3-maven-archetype/src/main/resources/archetype-resour
 %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
 
 %if %{without runtime} &&  %{without bootstrap}

duplicate-dependency.patch

@@ -1,20 +0,0 @@
---- antlr3-3.5.3/antlr3-maven-plugin/pom.xml	2025-03-22 14:18:39.217579927 +0100
-+++ antlr3-3.5.3/antlr3-maven-plugin/pom.xml	2025-03-22 14:18:57.138055571 +0100
-@@ -203,17 +203,6 @@
-             <artifactId>slf4j-simple</artifactId>
-             <version>1.7.32</version>
-         </dependency>
--        <!--
--         The version of ANTLR tool that this version of the plugin controls.
--         We have decided that this should be in lockstep with ANTLR itself, other
--         than -1 -2 -3 etc patch releases.
--          -->
--        <dependency>
--            <groupId>org.antlr</groupId>
--            <artifactId>antlr</artifactId>
--            <version>${project.version}</version>
--        </dependency>
--
-         <dependency>
-             <groupId>org.apache.maven.shared</groupId>
-             <artifactId>maven-plugin-testing-harness</artifactId>