From bd92babb8d70f589daf40cf22a8c2adf87f603f4e1da8c807f40cb6b3bcc86bf Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 21 Nov 2022 12:29:24 +0000
Subject: [PATCH] Accepting request 1037074 from
 home:pmonrealgonzalez:branches:Java:packages

- Update to 3.5.3:
  * change source compatibility to 1.8 and enable github workflows
  * Change Wiki URLs to theantlrguy.atlassian.net in README.txt
  * Bazel support
  * Modify patches:
    - Rebase osgi-manifest.patch and rename to antlr3-osgi-manifest.patch
    - Rename 0001-java8-fix.patch to antlr3-java8-fix.patch

OBS-URL: https://build.opensuse.org/request/show/1037074
OBS-URL: https://build.opensuse.org/package/show/Java:packages/antlr3?expand=0&rev=20
---
 3.5.2.tar.gz                                  |  3 ---
 3.5.3.tar.gz                                  |  3 +++
 ...-java8-fix.patch => antlr3-java8-fix.patch |  0
 antlr3-osgi-manifest.patch                    | 25 +++++++++++++++++++
 antlr3.changes                                | 11 ++++++++
 antlr3.spec                                   | 17 +++++++------
 osgi-manifest.patch                           | 25 -------------------
 7 files changed, 48 insertions(+), 36 deletions(-)
 delete mode 100644 3.5.2.tar.gz
 create mode 100644 3.5.3.tar.gz
 rename 0001-java8-fix.patch => antlr3-java8-fix.patch (100%)
 create mode 100644 antlr3-osgi-manifest.patch
 delete mode 100644 osgi-manifest.patch

diff --git a/3.5.2.tar.gz b/3.5.2.tar.gz
deleted file mode 100644
index 44eacd9..0000000
--- a/3.5.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a66d12fd5ca052fdd2b0a64b70d0c58db40e6dec72c3f4497934203090d92808
-size 6927136
diff --git a/3.5.3.tar.gz b/3.5.3.tar.gz
new file mode 100644
index 0000000..71c98d3
--- /dev/null
+++ b/3.5.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a0892bcf164573d539b930e57a87ea45333141863a0dd3a49e5d8c919c8a58ab
+size 6752328
diff --git a/0001-java8-fix.patch b/antlr3-java8-fix.patch
similarity index 100%
rename from 0001-java8-fix.patch
rename to antlr3-java8-fix.patch
diff --git a/antlr3-osgi-manifest.patch b/antlr3-osgi-manifest.patch
new file mode 100644
index 0000000..dabf7d4
--- /dev/null
+++ b/antlr3-osgi-manifest.patch
@@ -0,0 +1,25 @@
+Index: runtime/Java/pom.xml
+===================================================================
+--- runtime/Java/pom.xml.orig
++++ runtime/Java/pom.xml
+@@ -81,6 +81,20 @@
+                     </execution>
+                 </executions>
+             </plugin>
++            <plugin>
++              <groupId>org.apache.felix</groupId><artifactId>maven-bundle-plugin</artifactId>
++              <executions><execution><id>bundle-manifest</id><phase>process-classes</phase><goals><goal>manifest</goal></goals></execution></executions>
++              <configuration>
++                <manifestLocation>${project.build.directory}/osgi</manifestLocation>
++                <instructions><Bundle-SymbolicName>org.antlr.runtime</Bundle-SymbolicName><Import-Package>!org.antlr.stringtemplate,*</Import-Package></instructions>
++              </configuration>
++            </plugin>
++            <plugin>
++              <groupId>org.apache.maven.plugins</groupId><artifactId>maven-jar-plugin</artifactId>
++              <configuration>
++                <archive><manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile></archive>
++              </configuration>
++            </plugin>
+         </plugins>
+     </build>
+ </project>
diff --git a/antlr3.changes b/antlr3.changes
index 4c3c385..fbf082f 100644
--- a/antlr3.changes
+++ b/antlr3.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Nov 18 21:43:50 UTC 2022 - Pedro Monreal <pmonreal@suse.com>
+
+- Update to 3.5.3:
+  * change source compatibility to 1.8 and enable github workflows
+  * Change Wiki URLs to theantlrguy.atlassian.net in README.txt
+  * Bazel support
+  * Modify patches:
+    - Rebase osgi-manifest.patch and rename to antlr3-osgi-manifest.patch
+    - Rename 0001-java8-fix.patch to antlr3-java8-fix.patch
+
 -------------------------------------------------------------------
 Mon Mar 21 14:54:29 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/antlr3.spec b/antlr3.spec
index 7dd4d5e..7b03375 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -17,7 +17,7 @@
 
 
 %global flavor @BUILD_FLAVOR@%{nil}
-%global antlr_version 3.5.2
+%global antlr_version 3.5.3
 %global c_runtime_version 3.4
 %global javascript_runtime_version 3.1
 %if "%{flavor}" == "bootstrap"
@@ -34,12 +34,13 @@ Version:        %{antlr_version}
 Release:        0
 URL:            https://www.antlr3.org/
 Source0:        https://github.com/antlr/antlr3/archive/%{antlr_version}.tar.gz
-Patch0:         0001-java8-fix.patch
+Patch0:         antlr3-java8-fix.patch
 # Generate OSGi metadata
-Patch1:         osgi-manifest.patch
+Patch1:         antlr3-osgi-manifest.patch
 Patch100:       antlr3-generated_sources.patch
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
+BuildRequires:  maven-enforcer-plugin
 BuildRequires:  maven-local
 BuildRequires:  unzip
 BuildRequires:  mvn(antlr:antlr)
@@ -154,11 +155,11 @@ find -type f -a -name *.class -delete
 # compile for target 1.8
 sed -i 's/jsr14/1.8/' antlr3-maven-archetype/src/main/resources/archetype-resources/pom.xml \
                       antlr3-maven-plugin/pom.xml \
-                                          gunit/pom.xml \
-                                          gunit-maven-plugin/pom.xml \
-                                          pom.xml \
-                                          runtime/Java/pom.xml \
-                                          tool/pom.xml
+                      gunit/pom.xml \
+                      gunit-maven-plugin/pom.xml \
+                      pom.xml \
+                      runtime/Java/pom.xml \
+                      tool/pom.xml
 
 # workarounds bug in filtering (Mark invalid)
 %pom_xpath_remove pom:resource/pom:filtering
diff --git a/osgi-manifest.patch b/osgi-manifest.patch
deleted file mode 100644
index e505c41..0000000
--- a/osgi-manifest.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- runtime/Java/pom.xml.orig	2015-11-24 22:48:17.908747868 +0000
-+++ runtime/Java/pom.xml	2015-11-24 22:48:37.201489113 +0000
-@@ -64,4 +64,22 @@
- 
-   </dependencies>
- 
-+<build>
-+    <plugins>
-+        <plugin>
-+            <groupId>org.apache.felix</groupId><artifactId>maven-bundle-plugin</artifactId>
-+            <executions><execution><id>bundle-manifest</id><phase>process-classes</phase><goals><goal>manifest</goal></goals></execution></executions>
-+            <configuration>
-+                <manifestLocation>${project.build.directory}/osgi</manifestLocation>
-+                <instructions><Bundle-SymbolicName>org.antlr.runtime</Bundle-SymbolicName><Import-Package>!org.antlr.stringtemplate,*</Import-Package></instructions>
-+            </configuration>
-+        </plugin>
-+        <plugin>
-+            <groupId>org.apache.maven.plugins</groupId><artifactId>maven-jar-plugin</artifactId>
-+            <configuration>
-+                <archive><manifestFile>${project.build.directory}/osgi/MANIFEST.MF</manifestFile></archive>
-+            </configuration>
-+        </plugin>
-+    </plugins>
-+</build>
- </project>