10 Commits

Author SHA256 Message Date
Fridrich Štrba
f01a5e60fb Remove filtering workaround 2025-11-09 17:49:39 +01:00
bc2c98ab71 Accepting request 1287972 from Java:packages
Fix build with up-coming maven 4

OBS-URL: https://build.opensuse.org/request/show/1287972
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/antlr3?expand=0&rev=10
2025-06-24 18:48:01 +00:00
7cd35d0f63 OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=53 2025-06-23 14:43:18 +00:00
3bf35deb4e OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=52 2025-06-23 12:27:41 +00:00
3b7d8d0c33 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
2024-09-23 13:19:59 +00:00
cdbb891295 OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=50 2024-09-21 14:50:33 +00:00
f0a1843f34 OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=49 2024-09-21 11:42:37 +00:00
235ccb8182 OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=48 2024-09-21 11:41:19 +00:00
54ebeac90f OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=47 2024-09-21 11:38:54 +00:00
61a6edfa2d OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=46 2024-09-21 11:06:41 +00:00
3 changed files with 37 additions and 5 deletions

View File

@@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun Nov 9 16:49:03 UTC 2025 - Fridrich Strba <fstrba@suse.com>
- Filtering workaround not needed any more
-------------------------------------------------------------------
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>

View File

@@ -1,7 +1,7 @@
#
# spec file for package antlr3
#
# 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
@@ -39,6 +39,7 @@ 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
@@ -134,6 +135,7 @@ 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
@@ -164,9 +166,6 @@ sed -i 's/jsr14/1.8/' antlr3-maven-archetype/src/main/resources/archetype-resour
runtime/Java/pom.xml \
tool/pom.xml
# workarounds bug in filtering (Mark invalid)
%pom_xpath_remove pom:resource/pom:filtering
%{mvn_package} :antlr-master __noinstall
%if %{without runtime}
%{mvn_package} : tool
@@ -185,7 +184,6 @@ 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}

View File

@@ -0,0 +1,20 @@
--- 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>